diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2017-07-28 22:05:28 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marc@jeanmougin.fr> | 2017-07-28 22:05:28 +0000 |
| commit | 3eb67b103fe69a3b42ec16d085a2cb3a58a596b7 (patch) | |
| tree | 986b33696b0a7f229589b85bd13e6fdb2cbd022a /src/ui/widget/page-sizer.cpp | |
| parent | fix typo, update CI (diff) | |
| parent | Show a control point for the center of a spiral (diff) | |
| download | inkscape-3eb67b103fe69a3b42ec16d085a2cb3a58a596b7.tar.gz inkscape-3eb67b103fe69a3b42ec16d085a2cb3a58a596b7.zip | |
Merge gitlab.com:inkscape/inkscape
Diffstat (limited to 'src/ui/widget/page-sizer.cpp')
| -rw-r--r-- | src/ui/widget/page-sizer.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp index bb88536d5..3ec6a2b9f 100644 --- a/src/ui/widget/page-sizer.cpp +++ b/src/ui/widget/page-sizer.cpp @@ -225,7 +225,7 @@ PageSizer::PageSizer(Registry & _wr) _marginBottom( _("Botto_m:"), _("Bottom margin"), "fit-margin-bottom", _wr), _lockMarginUpdate(false), _scaleX(_("Scale _x:"), _("Scale X"), "scale-x", _wr), - _scaleY(_("Scale _y:"), _("Scale Y"), "scale-y", _wr), + _scaleY(_("Scale _y:"), _("While SVG allows non-uniform scaling it is recommended to use only uniform scaling in Inkscape. To set a non-uniform scaling, set the 'viewBox' directly."), "scale-y", _wr), _lockScaleUpdate(false), _viewboxX(_("X:"), _("X"), "viewbox-x", _wr), _viewboxY(_("Y:"), _("Y"), "viewbox-y", _wr), @@ -416,13 +416,9 @@ PageSizer::PageSizer(Registry & _wr) _scaleTable.attach(_scaleY, 1, 0, 1, 1); _scaleTable.attach(_scaleLabel, 2, 0, 1, 1); - _scaleTable.attach(_scaleWarning, 0, 1, 2, 1); _viewboxExpander.set_hexpand(); _viewboxExpander.set_vexpand(); _scaleTable.attach(_viewboxExpander, 0, 2, 2, 1); - - _scaleWarning.set_label(_("While SVG allows non-uniform scaling it is recommended to use only uniform scaling in Inkscape. To set a non-uniform scaling, set the 'viewBox' directly.")); - _scaleWarning.set_line_wrap( true ); _viewboxExpander.set_use_underline(); _viewboxExpander.set_label(_("_Viewbox...")); |