From 63a0b0f94e29ed91fb98b1b841cd698fd3e95cce Mon Sep 17 00:00:00 2001 From: John Smith Date: Tue, 11 Sep 2012 09:14:11 +0900 Subject: Fix for 167181 : Gnome-HIG-2.0 conformant Preferences dialog - accel keys (bzr r11662) --- src/ui/widget/preferences-widget.cpp | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) (limited to 'src/ui/widget/preferences-widget.cpp') diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp index 8ce7c63db..07145f5f3 100644 --- a/src/ui/widget/preferences-widget.cpp +++ b/src/ui/widget/preferences-widget.cpp @@ -54,7 +54,7 @@ DialogPage::DialogPage() this->set_row_spacings(6); } -void DialogPage::add_line(bool indent, Glib::ustring const &label, Gtk::Widget &widget, Glib::ustring const &suffix, const Glib::ustring &tip, bool expand_widget) +void DialogPage::add_line(bool indent, Glib::ustring const &label, Gtk::Widget &widget, Glib::ustring const &suffix, const Glib::ustring &tip, bool expand_widget, Gtk::Widget *other_widget) { int start_col; int row = this->property_n_rows(); @@ -68,6 +68,10 @@ void DialogPage::add_line(bool indent, Glib::ustring const &label, Gtk::Widget & Gtk::HBox* hb = Gtk::manage(new Gtk::HBox()); hb->set_spacing(12); hb->pack_start(widget,false,false); + if (other_widget) { + hb->pack_start(*other_widget,false,false); + } + w = (Gtk::Widget*) hb; } if (label != "") @@ -468,6 +472,12 @@ ZoomCorrRulerSlider::on_unit_changed() { } } +bool ZoomCorrRulerSlider::on_mnemonic_activate ( bool group_cycling ) +{ + return _sb.mnemonic_activate ( group_cycling ); +} + + void ZoomCorrRulerSlider::init(int ruler_width, int ruler_height, double lower, double upper, double step_increment, double page_increment, double default_value) @@ -539,6 +549,11 @@ PrefSlider::on_spinbutton_value_changed() } } +bool PrefSlider::on_mnemonic_activate ( bool group_cycling ) +{ + return _sb.mnemonic_activate ( group_cycling ); +} + void PrefSlider::init(Glib::ustring const &prefs_path, double lower, double upper, double step_increment, double page_increment, double default_value, int digits) @@ -674,6 +689,11 @@ void PrefEntryButtonHBox::onRelatedButtonClickedCallback() } } +bool PrefEntryButtonHBox::on_mnemonic_activate ( bool group_cycling ) +{ + return relatedEntry->mnemonic_activate ( group_cycling ); +} + void PrefEntryFileButtonHBox::init(Glib::ustring const &prefs_path, bool visibility) { @@ -806,6 +826,11 @@ void PrefEntryFileButtonHBox::onRelatedButtonClickedCallback() } } +bool PrefEntryFileButtonHBox::on_mnemonic_activate ( bool group_cycling ) +{ + return relatedEntry->mnemonic_activate ( group_cycling ); +} + void PrefFileButton::init(Glib::ustring const &prefs_path) { _prefs_path = prefs_path; -- cgit v1.2.3