diff options
| author | kamalpreetgrewal <grewalkamal005@gmail.com> | 2016-08-16 15:26:20 +0000 |
|---|---|---|
| committer | kamalpreetgrewal <grewalkamal005@gmail.com> | 2016-08-16 15:26:20 +0000 |
| commit | d242b8e3362e0a87c40177309a1141031d8d01f9 (patch) | |
| tree | 60795f1e5fdb8799fe57b9e189259dd2992e366a /src/ui/widget | |
| parent | Add changes for compilation with trunk (diff) | |
| parent | Add Shift+drag to arc start and end knots, holding shift will now move both k... (diff) | |
| download | inkscape-d242b8e3362e0a87c40177309a1141031d8d01f9.tar.gz inkscape-d242b8e3362e0a87c40177309a1141031d8d01f9.zip | |
Merge changes from trunk
(bzr r14949.1.66)
Diffstat (limited to 'src/ui/widget')
| -rw-r--r-- | src/ui/widget/font-variants.cpp | 2 | ||||
| -rw-r--r-- | src/ui/widget/page-sizer.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ui/widget/font-variants.cpp b/src/ui/widget/font-variants.cpp index aca85f246..b386051a6 100644 --- a/src/ui/widget/font-variants.cpp +++ b/src/ui/widget/font-variants.cpp @@ -629,7 +629,7 @@ namespace Widget { } else if( _caps_all_small.get_active() ) { css_string = "all-small-caps"; caps_new = SP_CSS_FONT_VARIANT_CAPS_ALL_SMALL; - } else if( _caps_all_petite.get_active() ) { + } else if( _caps_petite.get_active() ) { css_string = "petite"; caps_new = SP_CSS_FONT_VARIANT_CAPS_PETITE; } else if( _caps_all_petite.get_active() ) { diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp index 578b6855a..081300b9e 100644 --- a/src/ui/widget/page-sizer.cpp +++ b/src/ui/widget/page-sizer.cpp @@ -406,7 +406,7 @@ PageSizer::PageSizer(Registry & _wr) _fitPageButtonAlign.set(0.5, 0.5, 0.0, 1.0); _fitPageButtonAlign.add(_fitPageButton); _fitPageButton.set_use_underline(); - _fitPageButton.set_label(_("_Resize page to drawing or selection")); + _fitPageButton.set_label(_("_Resize page to drawing or selection (Ctrl+Shift+R)")); _fitPageButton.set_tooltip_text(_("Resize the page to fit the current selection, or the entire drawing if there is no selection")); _scaleFrame.set_label(_("Scale")); |