Mnemonics in "Export bitmap", and "Rows and Columns" dialogs (Bug 170765)

diff --git a/src/dialogs/export.cpp b/src/dialogs/export.cpp
index 7e99c2496efb96fb12b2de617fe2ca73db65cc7f..b05f6589a5f1a8d7c15870d073130e8b76d1d544 100644 (file)
--- a/src/dialogs/export.cpp
+++ b/src/dialogs/export.cpp
@@ -620,7 +620,7 @@ sp_export_dialog (void)
 
         {
             Gtk::HBox* batch_box = new Gtk::HBox(FALSE, 5);
-            GtkWidget *be = gtk_check_button_new_with_label(_("Batch export all selected objects"));
+            GtkWidget *be = gtk_check_button_new_with_mnemonic(_("B_atch export all selected objects"));
             gtk_widget_set_sensitive(GTK_WIDGET(be), TRUE);
             gtk_object_set_data(GTK_OBJECT(dlg), "batch_checkbox", be);
             batch_box->pack_start(*Glib::wrap(be), false, false);
@@ -632,7 +632,7 @@ sp_export_dialog (void)
 
         {
             Gtk::HBox* hide_box = new Gtk::HBox(FALSE, 5);
-            GtkWidget *he = gtk_check_button_new_with_label(_("Hide all except selected"));
+            GtkWidget *he = gtk_check_button_new_with_mnemonic(_("Hide a_ll except selected"));
             gtk_widget_set_sensitive(GTK_WIDGET(he), TRUE);
             gtk_object_set_data(GTK_OBJECT(dlg), "hide_checkbox", he);
             hide_box->pack_start(*Glib::wrap(he), false, false);
@@ -683,7 +683,7 @@ sp_export_update_checkbuttons (GtkObject *base)
     GtkWidget *he = (GtkWidget *)gtk_object_get_data(base, "hide_checkbox");
     if (num >= 2) {
         gtk_widget_set_sensitive (be, true);
-        gtk_button_set_label (GTK_BUTTON(be), g_strdup_printf (ngettext("Batch export %d selected object","Batch export %d selected objects",num), num));
+        gtk_button_set_label (GTK_BUTTON(be), g_strdup_printf (ngettext("B_atch export %d selected object","B_atch export %d selected objects",num), num));
     } else {
         gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(be), FALSE);
         gtk_widget_set_sensitive (be, FALSE);

diff --git a/src/ui/dialog/tile.cpp b/src/ui/dialog/tile.cpp
index fccf5c105bbcb01c1210e6fc147c169f857ad7f6..4b994335e31fdb56a788a65d6f8c34130640a07a 100644 (file)
--- a/src/ui/dialog/tile.cpp
+++ b/src/ui/dialog/tile.cpp
@@ -656,7 +656,8 @@ TileDialog::TileDialog()
         g_print("/n PerRox = %f PerCol = %f selcount = %d",PerRow,PerCol,selcount);
     #endif
 
-    NoOfRowsLabel.set_label(_("Rows:"));
+    NoOfRowsLabel.set_text_with_mnemonic(_("_Rows:"));
+    NoOfRowsLabel.set_mnemonic_widget(NoOfRowsSpinner);
     NoOfRowsBox.pack_start(NoOfRowsLabel, false, false, MARGIN);
 
     NoOfRowsSpinner.set_digits(0);
@@ -668,7 +669,8 @@ TileDialog::TileDialog()
     NoOfRowsBox.pack_start(NoOfRowsSpinner, false, false, MARGIN);
     gtk_size_group_add_widget(_col1, (GtkWidget *) NoOfRowsBox.gobj());
 
-    RowHeightButton.set_label(_("Equal height"));
+    RowHeightButton.set_label(_("Equal _height"));
+    RowHeightButton.set_use_underline(true);
     double AutoRow = prefs->getDouble("/dialogs/gridtiler/AutoRowSize", 15);
     if (AutoRow>0)
          AutoRowSize=true;
@@ -726,7 +728,8 @@ TileDialog::TileDialog()
 
     /*#### Number of columns ####*/
 
-    NoOfColsLabel.set_label(_("Columns:"));
+    NoOfColsLabel.set_text_with_mnemonic(_("_Columns:"));
+    NoOfColsLabel.set_mnemonic_widget(NoOfColsSpinner);
     NoOfColsBox.pack_start(NoOfColsLabel, false, false, MARGIN);
 
     NoOfColsSpinner.set_digits(0);
@@ -738,7 +741,8 @@ TileDialog::TileDialog()
     NoOfColsBox.pack_start(NoOfColsSpinner, false, false, MARGIN);
     gtk_size_group_add_widget(_col3, (GtkWidget *) NoOfColsBox.gobj());
 
-    ColumnWidthButton.set_label(_("Equal width"));
+    ColumnWidthButton.set_label(_("Equal _width"));
+    ColumnWidthButton.set_use_underline(true);
     double AutoCol = prefs->getDouble("/dialogs/gridtiler/AutoColSize", 15);
     if (AutoCol>0)
          AutoColSize=true;
@@ -793,13 +797,15 @@ TileDialog::TileDialog()
 
     {
         /*#### Radio buttons to control spacing manually or to fit selection bbox ####*/
-        SpaceByBBoxRadioButton.set_label(_("Fit into selection box"));
+        SpaceByBBoxRadioButton.set_label(_("_Fit into selection box"));
+        SpaceByBBoxRadioButton.set_use_underline (true);
         SpaceByBBoxRadioButton.signal_toggled().connect(sigc::mem_fun(*this, &TileDialog::Spacing_button_changed));
         SpacingGroup = SpaceByBBoxRadioButton.get_group();
 
         SpacingVBox.pack_start(SpaceByBBoxRadioButton, false, false, MARGIN);
 
-        SpaceManualRadioButton.set_label(_("Set spacing:"));
+        SpaceManualRadioButton.set_label(_("_Set spacing:"));
+        SpaceManualRadioButton.set_use_underline (true);
         SpaceManualRadioButton.set_group(SpacingGroup);
         SpaceManualRadioButton.signal_toggled().connect(sigc::mem_fun(*this, &TileDialog::Spacing_button_changed));
         SpacingVBox.pack_start(SpaceManualRadioButton, false, false, MARGIN);
@@ -867,7 +873,8 @@ TileDialog::TileDialog()
     SizesHBox.set_sensitive (ManualSpacing);
 
     //## The OK button
-    TileOkButton = addResponseButton(Q_("tileClonesDialog|Arrange"), GTK_RESPONSE_APPLY);
+    TileOkButton = addResponseButton(C_("Rows and columns dialog","_Arrange"), GTK_RESPONSE_APPLY);
+    TileOkButton->set_use_underline(true);
     tips.set_tip((*TileOkButton), _("Arrange selected objects"));
 
     show_all_children();

diff --git a/src/verbs.cpp b/src/verbs.cpp
index 4cdad7d36cc8aa5692de64d1b294e5979529e397..1695a427e6abdc40857f2c7bb4f39e06eb6fce74 100644 (file)
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -2414,7 +2414,7 @@ Verb *Verb::_base_verbs[] = {
     // Advanced tutorial for more info
     new SelectionVerb(SP_VERB_SELECTION_BREAK_APART, "SelectionBreakApart", N_("Break _Apart"),
                       N_("Break selected paths into subpaths"), INKSCAPE_ICON_PATH_BREAK_APART),
-    new SelectionVerb(SP_VERB_SELECTION_GRIDTILE, "DialogGridArrange", N_("Rows and Columns..."),
+    new SelectionVerb(SP_VERB_SELECTION_GRIDTILE, "DialogGridArrange", N_("Ro_ws and Columns..."),
                       N_("Arrange selected objects in a table"), INKSCAPE_ICON_DIALOG_ROWS_AND_COLUMNS),
     /* Layer */
     new LayerVerb(SP_VERB_LAYER_NEW, "LayerNew", N_("_Add Layer..."),