mnemonics for all widgets in the Doc Props dialog

(fixes #1384494-9+B)

(bzr r26)

3 files changed, 21 insertions, 9 deletions

diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index ea0efeb2d..1073fa1d2 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -190,9 +190,11 @@ PageSizer::PageSizer()
 {
     Gtk::HBox *hbox_size = manage (new Gtk::HBox (false, 4));
     pack_start (*hbox_size, false, false, 0);
-    Gtk::Label *label_size = manage (new Gtk::Label (_("Page size:"), 1.0, 0.5)); 
+    Gtk::Label *label_size = manage (new Gtk::Label (_("P_age size:"), 1.0, 0.5)); 
+    label_size->set_use_underline();
     hbox_size->pack_start (*label_size, false, false, 0);
     _omenu_size = manage (new Gtk::OptionMenu);
+    label_size->set_mnemonic_widget (*_omenu_size);
     hbox_size->pack_start (*_omenu_size, true, true, 0);
     Gtk::Menu *menu_size = manage (new Gtk::Menu);
 
@@ -220,10 +222,10 @@ PageSizer::init (Registry& reg)
     pack_start (*hbox_ori, false, false, 0);
     Gtk::Label *label_ori = manage (new Gtk::Label (_("Page orientation:"), 0.0, 0.5)); 
     hbox_ori->pack_start (*label_ori, false, false, 0);
-    _rb_land = manage (new Gtk::RadioButton (_("Landscape")));
+    _rb_land = manage (new Gtk::RadioButton (_("_Landscape"), true));
     Gtk::RadioButton::Group group = _rb_land->get_group();
     hbox_ori->pack_end (*_rb_land, false, false, 5);
-    _rb_port = manage (new Gtk::RadioButton (_("Portrait")));
+    _rb_port = manage (new Gtk::RadioButton (_("_Portrait"), true));
     hbox_ori->pack_end (*_rb_port, false, false, 5);
     _rb_port->set_group (group);
     _rb_port->set_active (true);
@@ -239,9 +241,9 @@ PageSizer::init (Registry& reg)
     
     _wr = ®
 
-    _rum.init (_("Units:"), "units", *_wr);
-    _rusw.init (_("Width:"), _("Width of paper"), "width", _rum, *_wr);
-    _rush.init (_("Height:"), _("Height of paper"), "height", _rum, *_wr);
+    _rum.init (_("U_nits:"), "units", *_wr);
+    _rusw.init (_("_Width:"), _("Width of paper"), "width", _rum, *_wr);
+    _rush.init (_("_Height:"), _("Height of paper"), "height", _rum, *_wr);
 
     table->attach (*_rum._label, 0,1,0,1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0);
     table->attach (*_rum._sel, 1,2,0,1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0);
diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp
index 918742e75..e1f0ee7a4 100644
--- a/src/ui/widget/registered-widget.cpp
+++ b/src/ui/widget/registered-widget.cpp
@@ -62,7 +62,9 @@ RegisteredCheckButton::init (const Glib::ustring& label, const Glib::ustring& ti
 {
     _button = new Gtk::CheckButton;
     _tt.set_tip (*_button, tip);
-    _button->add (*manage (new Gtk::Label (label)));
+    Gtk::Label *l = new Gtk::Label (label);
+    l->set_use_underline (true);
+    _button->add (*manage (l));
     _button->set_alignment (right? 1.0 : 0.0, 0.5);
     _key = key;
     _wr = ≀
@@ -117,7 +119,9 @@ void
 RegisteredUnitMenu::init (const Glib::ustring& label, const Glib::ustring& key, Registry& wr)
 {
     _label = new Gtk::Label (label, 1.0, 0.5);
+    _label->set_use_underline (true);
     _sel = new UnitMenu ();
+    _label->set_mnemonic_widget (*_sel);
     _sel->setUnitType (UNIT_TYPE_LINEAR);
     _wr = ≀
     _key = key;
@@ -240,7 +244,9 @@ void
 RegisteredColorPicker::init (const Glib::ustring& label, const Glib::ustring& title, const Glib::ustring& tip, const Glib::ustring& ckey, const Glib::ustring& akey, Registry& wr)
 {
     _label = new Gtk::Label (label, 1.0, 0.5);
+    _label->set_use_underline (true);
     _cp = new ColorPicker (title,tip,0,true);
+    _label->set_mnemonic_widget (*_cp);
     _ckey = ckey;
     _akey = akey;
     _wr = ≀
@@ -295,7 +301,9 @@ RegisteredSuffixedInteger::init (const Glib::ustring& label, const Glib::ustring
     _key = key;
     _label = new Gtk::Label (label);
     _label->set_alignment (1.0, 0.5);
+    _label->set_use_underline();
     _sb = new Gtk::SpinButton (_adj, 1.0, 0);
+    _label->set_mnemonic_widget (*_sb);
     _suffix = new Gtk::Label (suffix);
     _hbox.pack_start (*_sb, true, true, 0);
     _hbox.pack_start (*_suffix, false, false, 0);
@@ -348,10 +356,10 @@ const Glib::ustring& key, Registry& wr)
 {
     _hbox = new Gtk::HBox;
     _hbox->add (*manage (new Gtk::Label (label)));
-    _rb1 = manage (new Gtk::RadioButton (label1));
+    _rb1 = manage (new Gtk::RadioButton (label1, true));
     _hbox->add (*_rb1);
     Gtk::RadioButtonGroup group = _rb1->get_group();
-    _rb2 = manage (new Gtk::RadioButton (group, label2, false));
+    _rb2 = manage (new Gtk::RadioButton (group, label2, true));
     _hbox->add (*_rb2);
     _rb2->set_active();
     _tt.set_tip (*_rb1, tip1);
diff --git a/src/ui/widget/tolerance-slider.cpp b/src/ui/widget/tolerance-slider.cpp
index dbef74eaf..88e6915ae 100644
--- a/src/ui/widget/tolerance-slider.cpp
+++ b/src/ui/widget/tolerance-slider.cpp
@@ -58,8 +58,10 @@ ToleranceSlider::init (const Glib::ustring& label1, const Glib::ustring& label2,
 {
     _hbox = new Gtk::HBox;
     Gtk::Label *theLabel1 = manage (new Gtk::Label (label1));
+    theLabel1->set_use_underline();
     _hbox->add (*theLabel1);
     _hscale = manage (new Gtk::HScale (0.4, 50.1, 0.1));
+    theLabel1->set_mnemonic_widget (*_hscale);
     _hscale->set_draw_value (true);
     _hscale->set_value_pos (Gtk::POS_RIGHT);
     _hscale->set_size_request (100, -1);