mnemonics for all widgets in the Doc Props dialog

(fixes #1384494-9+B)

diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index 875e7d9f75d3e1d27c7516e569591fa8da28b7ef..3d241d6714b6e8cba849cf5364be9710dabd4ff4 100644 (file)
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -181,15 +181,15 @@ DocumentProperties::build_page()
 {
     _page_page.show();
 
-    _rcp_bg.init (_("Background:"), _("Background color"), _("Color and transparency of the page background (also used for bitmap export)"),
+    _rcp_bg.init (_("Back_ground:"), _("Background color"), _("Color and transparency of the page background (also used for bitmap export)"),
                    "pagecolor", "inkscape:pageopacity", _wr);
-    _rcb_canb.init (_("Show page border"), _("If set, rectangular page border is shown"), "showborder", _wr, false);
-    _rcb_bord.init (_("Border on top of drawing"), _("If set, border is always on top of the drawing"), "borderlayer", _wr, false);
-    _rcp_bord.init (_("Border color:"), _("Page border color"),
+    _rcb_canb.init (_("Show page _border"), _("If set, rectangular page border is shown"), "showborder", _wr, false);
+    _rcb_bord.init (_("Border on _top of drawing"), _("If set, border is always on top of the drawing"), "borderlayer", _wr, false);
+    _rcp_bord.init (_("Border _color:"), _("Page border color"),
                     _("Color of the page border"),
                     "bordercolor", "borderopacity", _wr);
-    _rcb_shad.init (_("Show border shadow"), "If set, page border shows a shadow on its right and lower side", "inkscape:showpageshadow", _wr, false);
-    _rum_deflt.init (_("Default units:"), "inkscape:document-units", _wr);
+    _rcb_shad.init (_("_Show border shadow"), "If set, page border shows a shadow on its right and lower side", "inkscape:showpageshadow", _wr, false);
+    _rum_deflt.init (_("Default _units:"), "inkscape:document-units", _wr);
     Gtk::Label* label_gen = manage (new Gtk::Label);
     label_gen->set_markup (_("<b>General</b>"));
     Gtk::Label* label_bor = manage (new Gtk::Label);
@@ -225,26 +225,26 @@ DocumentProperties::build_grid()
     /// \todo FIXME: gray out snapping when grid is off.
     /// Dissenting view: you want snapping without grid.
     
-    _rcbgrid.init (_("Show grid"), _("Show or hide grid"), "showgrid", _wr);
-    _rumg.init (_("Grid units:"), "grid_units", _wr);
-    _rsu_ox.init (_("Origin X:"), _("X coordinate of grid origin"), 
+    _rcbgrid.init (_("_Show grid"), _("Show or hide grid"), "showgrid", _wr);
+    _rumg.init (_("Grid _units:"), "grid_units", _wr);
+    _rsu_ox.init (_("_Origin X:"), _("X coordinate of grid origin"), 
                   "gridoriginx", _rumg, _wr);
-    _rsu_oy.init (_("Origin Y:"), _("Y coordinate of grid origin"), 
+    _rsu_oy.init (_("O_rigin Y:"), _("Y coordinate of grid origin"), 
                   "gridoriginy", _rumg, _wr);
-    _rsu_sx.init (_("Spacing X:"), _("Distance of vertical grid lines"), 
+    _rsu_sx.init (_("Spacing _X:"), _("Distance of vertical grid lines"), 
                   "gridspacingx", _rumg, _wr);
-    _rsu_sy.init (_("Spacing Y:"), _("Distance of horizontal grid lines"), 
+    _rsu_sy.init (_("Spacing _Y:"), _("Distance of horizontal grid lines"), 
                   "gridspacingy", _rumg, _wr);
-    _rcp_gcol.init (_("Grid line color:"), _("Grid line color"), 
+    _rcp_gcol.init (_("Grid line _color:"), _("Grid line color"), 
                     _("Color of grid lines"), "gridcolor", "gridopacity", _wr);
-    _rcp_gmcol.init (_("Major grid line color:"), _("Major grid line color"), 
+    _rcp_gmcol.init (_("Ma_jor grid line color:"), _("Major grid line color"), 
                      _("Color of the major (highlighted) grid lines"), 
                      "gridempcolor", "gridempopacity", _wr);
-    _rsi.init (_("Major grid line every:"), _("lines"), "gridempspacing", _wr);
-    _rcb_sgui.init (_("Show guides"), _("Show or hide guides"), "showguides", _wr);
-    _rcp_gui.init (_("Guide color:"), _("Guideline color"), 
+    _rsi.init (_("_Major grid line every:"), _("lines"), "gridempspacing", _wr);
+    _rcb_sgui.init (_("Show _guides"), _("Show or hide guides"), "showguides", _wr);
+    _rcp_gui.init (_("Guide co_lor:"), _("Guideline color"), 
                    _("Color of guidelines"), "guidecolor", "guideopacity", _wr);
-    _rcp_hgui.init (_("Highlight color:"), _("Highlighted guideline color"), 
+    _rcp_hgui.init (_("_Highlight color:"), _("Highlighted guideline color"), 
                     _("Color of a guideline when it is under mouse"),
                     "guidehicolor", "guidehiopacity", _wr);
     Gtk::Label *label_grid = manage (new Gtk::Label);
@@ -280,39 +280,39 @@ DocumentProperties::build_snap()
 {
     _page_snap.show();
 
-    _rcbsnbo.init (_("Snap bounding boxes to objects"), 
+    _rcbsnbo.init (_("_Snap bounding boxes to objects"), 
                 _("Snap the edges of the object bounding boxes to other objects"), 
                 "inkscape:object-bbox", _wr);
-    _rcbsnnob.init (_("Snap nodes to objects"), 
+    _rcbsnnob.init (_("Snap nodes _to objects"), 
                 _("Snap the nodes of objects to other objects"), 
                 "inkscape:object-points", _wr);
-    _rcbsnop.init (_("Snap to object paths"), 
+    _rcbsnop.init (_("Snap to object _paths"), 
                 _("Snap to other object paths"), 
                 "inkscape:object-paths", _wr);
-    _rcbsnon.init (_("Snap to object nodes"), 
+    _rcbsnon.init (_("Snap to object _nodes"), 
                 _("Snap to other object nodes"), 
                 "inkscape:object-nodes", _wr);
-    _rsu_sno.init (_("Snap sensitivity:"), _(""),
+    _rsu_sno.init (_("Snap s_ensitivity:"), _(""),
                   _("Controls max. snapping distance from object"),
                   "objecttolerance", _wr);
-    _rcbsnbb.init (_("Snap bounding boxes to grid"), 
+    _rcbsnbb.init (_("Snap _bounding boxes to grid"), 
                 _("Snap the edges of the object bounding boxes"), 
                 "inkscape:grid-bbox", _wr);
-    _rcbsnnod.init (_("Snap nodes to grid"), 
+    _rcbsnnod.init (_("Snap nodes to _grid"), 
                 _("Snap path nodes, text baselines, ellipse centers, etc."), 
                 "inkscape:grid-points", _wr);
-    _rsu_sn.init (_("Snap sensitivity:"),  _(""),
+    _rsu_sn.init (_("Snap sens_itivity:"),  _(""),
                   _("Controls max. snapping distance from grid"),
                   "gridtolerance", _wr);
-    _rcb_snpgui.init (_("Snap bounding boxes to guides"),  
+    _rcb_snpgui.init (_("Snap bounding boxes to g_uides"),  
                      _("Snap the edges of the object bounding boxes"), 
                      "inkscape:guide-bbox", _wr);
-    _rcb_snbgui.init (_("Snap points to guides"), 
+    _rcb_snbgui.init (_("Snap p_oints to guides"), 
                 _("Snap path nodes, text baselines, ellipse centers, etc."), 
                 "inkscape:guide-points", _wr);
-    _rsu_gusn.init (_("Snap sensitivity:"), _(""), 
+    _rsu_gusn.init (_("Snap sensiti_vity:"), _(""), 
                 _("Controls max. snapping distance from guides"), "guidetolerance", _wr);
-    _rrb_pix.init (_("Sensitivity:"), _("Screen pixels"), _("px units"),
+    _rrb_pix.init (_("Sensitivity:"), _("S_creen pixels"), _("p_x units"),
                 _("Sensitivity is always the same, regardless of zoom."),
                 _("Sensitivity changes with zoom; zooming in will enlarge max. snapping distance."),
                 _("inkscape:has_abs_tolerance"), _wr);

diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index ea0efeb2d48c12b4deb0d338939fc7a277df3d39..1073fa1d202645dbaba4dcc69679a16c486b1602 100644 (file)
--- 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 918742e751f4e2d953e103cce70d28db93576c56..e1f0ee7a43d3753d71f3e43785ead67856a8ff7b 100644 (file)
--- 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 dbef74eaf6b7729ef0be6c82bcff6bf4d9cd847c..88e6915ae817f8b172aaa98fd04f031981247423 100644 (file)
--- 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);