diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-08-10 21:42:30 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-08-10 21:42:30 +0000 |
| commit | 98fb715a90145993422739e71e754c816d34b21b (patch) | |
| tree | 1c4ef44335953ce387368db440fc1ae1dc4f1a59 /src | |
| parent | Add symbolic icons to paint order (diff) | |
| download | inkscape-98fb715a90145993422739e71e754c816d34b21b.tar.gz inkscape-98fb715a90145993422739e71e754c816d34b21b.zip | |
Add a label to apply theme sugested by Christoffer Holmstedt on mailing list
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/control-manager.cpp | 2 | ||||
| -rw-r--r-- | src/ui/dialog/inkscape-preferences.cpp | 2 | ||||
| -rw-r--r-- | src/ui/widget/preferences-widget.cpp | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/ui/control-manager.cpp b/src/ui/control-manager.cpp index 93173aa35..1f33ec63e 100644 --- a/src/ui/control-manager.cpp +++ b/src/ui/control-manager.cpp @@ -210,7 +210,7 @@ void ControlManagerImpl::setControlSize(int size, bool force) } } - _sizeChangedSignal.emit(); + //_sizeChangedSignal.emit(); } } diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index ad5b2186f..f738db984 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -884,7 +884,7 @@ void InkscapePreferences::initPageUI() } _apply_theme.set_label(_("Reload icons")); _apply_theme.set_tooltip_text(_("Apply icon changes (may take a few seconds)")); - _page_theme.add_line(false, "", _apply_theme, "", "", false); + _page_theme.add_line(false, "", _apply_theme, "<span size=\"small\">Reloading icons will cloase all windows and open them again. No data will be lost.</span>", "", false); _apply_theme.signal_clicked().connect(sigc::ptr_fun(sp_ui_reload)); this->AddPage(_page_theme, _("Theme"), iter_ui, PREFS_PAGE_UI_THEME); symbolicThemeCheck(); diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp index 14d9621c6..c96bf88f1 100644 --- a/src/ui/widget/preferences-widget.cpp +++ b/src/ui/widget/preferences-widget.cpp @@ -94,8 +94,9 @@ 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(label, Gtk::ALIGN_START, + Gtk::Label* label_widget = Gtk::manage(new Gtk::Label("", Gtk::ALIGN_START, Gtk::ALIGN_CENTER, true)); + label_widget->set_markup(label); label_widget->set_mnemonic_widget(widget); if (indent) { @@ -133,7 +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(suffix , Gtk::ALIGN_START , Gtk::ALIGN_CENTER, true)); + Gtk::Label* suffix_widget = Gtk::manage(new Gtk::Label("" , Gtk::ALIGN_START , Gtk::ALIGN_CENTER, true)); + suffix_widget->set_markup(suffix); hb->pack_start(*suffix_widget,false,false); } |