summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJabier Arraiza <jabier.arraiza@marker.es>2018-08-12 19:37:16 +0000
committerJabier Arraiza <jabier.arraiza@marker.es>2018-08-12 19:37:16 +0000
commitba125873651ea05199c7c7b357569482d12d3379 (patch)
treeab3aebf2c508245c1b0e682d4f80f62586f44d95 /src
parentAdd a label to apply theme sugested by Christoffer Holmstedt on mailing list (diff)
downloadinkscape-ba125873651ea05199c7c7b357569482d12d3379.tar.gz
inkscape-ba125873651ea05199c7c7b357569482d12d3379.zip
fix for bug 1786605
Diffstat (limited to 'src')
-rw-r--r--src/ui/dialog/inkscape-preferences.cpp2
-rw-r--r--src/ui/widget/preferences-widget.cpp8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index f738db984..1d675b7f5 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -1521,7 +1521,7 @@ void InkscapePreferences::initPageBehavior()
_("Pressing an arrow key moves selected object(s) or node(s) by this distance"), false);
_steps_scale.init ( "/options/defaultscale/value", 0.0, 1000.0, 0.01, 2.0, UNIT_TYPE_LINEAR, "px");
//defaultscale is limited to 1000 in select-context.cpp: use the same limit here
- _page_steps.add_line( false, _("> and < _scale by:"), _steps_scale, "",
+ _page_steps.add_line( false, _("&gt; and &lt; _scale by:"), _steps_scale, "",
_("Pressing > or < scales selection up or down by this increment"), false);
_steps_inset.init ( "/options/defaultoffsetwidth/value", 0.0, 3000.0, 0.01, 2.0, UNIT_TYPE_LINEAR, "px");
_page_steps.add_line( false, _("_Inset/Outset by:"), _steps_inset, "",
diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp
index c96bf88f1..4ec771490 100644
--- a/src/ui/widget/preferences-widget.cpp
+++ b/src/ui/widget/preferences-widget.cpp
@@ -94,10 +94,10 @@ void DialogPage::add_line(bool indent,
// Add a label in the first column if provided
if (label != "")
{
- Gtk::Label* label_widget = Gtk::manage(new Gtk::Label("", Gtk::ALIGN_START,
+ Gtk::Label* label_widget = Gtk::manage(new Gtk::Label(label, Gtk::ALIGN_START,
Gtk::ALIGN_CENTER, true));
- label_widget->set_markup(label);
label_widget->set_mnemonic_widget(widget);
+ label_widget->set_markup(label_widget->get_text());
if (indent) {
#if GTKMM_CHECK_VERSION(3,12,0)
@@ -134,8 +134,8 @@ void DialogPage::add_line(bool indent,
// Add a label on the right of the widget if desired
if (suffix != "")
{
- Gtk::Label* suffix_widget = Gtk::manage(new Gtk::Label("" , Gtk::ALIGN_START , Gtk::ALIGN_CENTER, true));
- suffix_widget->set_markup(suffix);
+ Gtk::Label* suffix_widget = Gtk::manage(new Gtk::Label(suffix , Gtk::ALIGN_START , Gtk::ALIGN_CENTER, true));
+ suffix_widget->set_markup(suffix_widget->get_text());
hb->pack_start(*suffix_widget,false,false);
}