diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-07-24 20:00:14 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-07-24 20:00:14 +0000 |
| commit | 67a8312ad1a5b8ef5f60e63ca464013e5a3adeaf (patch) | |
| tree | ac01534adb78b5e055c57c3ee27e9e7bb14b293f /src | |
| parent | Remove pointer (diff) | |
| download | inkscape-67a8312ad1a5b8ef5f60e63ca464013e5a3adeaf.tar.gz inkscape-67a8312ad1a5b8ef5f60e63ca464013e5a3adeaf.zip | |
Fix a wrongy commit
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/dialog/inkscape-preferences.cpp | 3 | ||||
| -rw-r--r-- | src/ui/dialog/inkscape-preferences.h | 2 | ||||
| -rw-r--r-- | src/ui/widget/preferences-widget.cpp | 5 | ||||
| -rw-r--r-- | src/ui/widget/preferences-widget.h | 6 |
4 files changed, 3 insertions, 13 deletions
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index d106e7355..8107b3c30 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -885,7 +885,8 @@ void InkscapePreferences::initPageUI() _page_theme.add_line(false, _("Secondary toolbar icon size:"), _misc_small_secondary, "", _("Set the size for the icons in secondary toolbars to use (requires restart)"), false); } - _apply_theme.init(_("Now (slow)")); + _apply_theme.set_label(_("Now")); + _apply_theme.set_tooltip_text (_("It apply slow")); _page_theme.add_line(false, _("Apply theme"), _apply_theme, "", _("Apply theme"), false); _apply_theme.signal_clicked().connect(sigc::ptr_fun(sp_ui_reload)); this->AddPage(_page_theme, _("Theme"), iter_ui, PREFS_PAGE_UI_THEME); diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h index 759684905..becd1f5b5 100644 --- a/src/ui/dialog/inkscape-preferences.h +++ b/src/ui/dialog/inkscape-preferences.h @@ -248,7 +248,7 @@ protected: UI::Widget::PrefCombo _misc_small_toolbar; UI::Widget::PrefCombo _misc_small_secondary; UI::Widget::PrefCombo _misc_small_tools; - UI::Widget::PrefButton _apply_theme; + Gtk::Button _apply_theme; UI::Widget::PrefRadioButton _win_dockable; UI::Widget::PrefRadioButton _win_floating; diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp index 108d621c7..7e9335a8a 100644 --- a/src/ui/widget/preferences-widget.cpp +++ b/src/ui/widget/preferences-widget.cpp @@ -176,11 +176,6 @@ void PrefCheckButton::on_toggled() } } -void PrefButton::init(Glib::ustring const &label) -{ - this->set_label(label); -} - void PrefRadioButton::init(Glib::ustring const &label, Glib::ustring const &prefs_path, Glib::ustring const &string_value, bool default_value, PrefRadioButton* group_member) { diff --git a/src/ui/widget/preferences-widget.h b/src/ui/widget/preferences-widget.h index 3c3c81020..5036a1c50 100644 --- a/src/ui/widget/preferences-widget.h +++ b/src/ui/widget/preferences-widget.h @@ -58,12 +58,6 @@ protected: void on_toggled() override; }; -class PrefButton : public Gtk::Button -{ -public: - void init(Glib::ustring const &label); -}; - class PrefRadioButton : public Gtk::RadioButton { public: |
