Skip to content

Commit

Permalink
Fix some conflicting mnemonics in the menus
Browse files Browse the repository at this point in the history
  • Loading branch information
@b4n
b4n committed May 5, 2014
1 parent e61bba1 commit 1e50962
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 20 deletions.
32 changes: 16 additions & 16 deletions data/geany.glade
View file
Expand Up @@ -234,7 +234,7 @@
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Insert _Multiline Comment</property>
<property name="label" translatable="yes">Insert Mu_ltiline Comment</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_comments_multiline_activate" swapped="no"/>
</object>
Expand Down Expand Up @@ -350,7 +350,7 @@
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Insert Alternative White Space</property>
<property name="label" translatable="yes">Insert Alternative _White Space</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_insert_alternative_white_space1_activate" swapped="no"/>
</object>
Expand Down Expand Up @@ -8012,7 +8012,7 @@
</child>
<child>
<object class="GtkImageMenuItem" id="menu_save_all1">
<property name="label" translatable="yes">Save A_ll</property>
<property name="label" translatable="yes">Sa_ve All</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
Expand Down Expand Up @@ -8276,7 +8276,7 @@
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Commands</property>
<property name="label" translatable="yes">Co_mmands</property>
<property name="use_underline">True</property>
<child type="submenu">
<object class="GtkMenu" id="commands2_menu">
Expand Down Expand Up @@ -8498,7 +8498,7 @@
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Smart Line Indent</property>
<property name="label" translatable="yes">S_mart Line Indent</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_smart_line_indent1_activate" swapped="no"/>
</object>
Expand Down Expand Up @@ -8578,7 +8578,7 @@
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Insert _Multiline Comment</property>
<property name="label" translatable="yes">Insert Mu_ltiline Comment</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_menu_comments_multiline_activate" swapped="no"/>
</object>
Expand Down Expand Up @@ -8676,7 +8676,7 @@
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Insert Alternative White Space</property>
<property name="label" translatable="yes">Insert Alternative _White Space</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_insert_alternative_white_space1_activate" swapped="no"/>
</object>
Expand Down Expand Up @@ -8796,7 +8796,7 @@
</child>
<child>
<object class="GtkImageMenuItem" id="next_message1">
<property name="label" translatable="yes">Next _Message</property>
<property name="label" translatable="yes">Next Me_ssage</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
Expand Down Expand Up @@ -8829,7 +8829,7 @@
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Go to Next Marker</property>
<property name="label" translatable="yes">Go to Ne_xt Marker</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_go_to_next_marker1_activate" swapped="no"/>
</object>
Expand All @@ -8839,7 +8839,7 @@
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Go to Previous Marker</property>
<property name="label" translatable="yes">Go to Pre_vious Marker</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_go_to_previous_marker1_activate" swapped="no"/>
</object>
Expand Down Expand Up @@ -9036,7 +9036,7 @@
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Show _White Space</property>
<property name="label" translatable="yes">Show White S_pace</property>
<property name="use_underline">True</property>
<signal name="toggled" handler="on_menu_show_white_space1_toggled" swapped="no"/>
</object>
Expand All @@ -9056,7 +9056,7 @@
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Show _Indentation Guides</property>
<property name="label" translatable="yes">Show Indentation _Guides</property>
<property name="use_underline">True</property>
<signal name="toggled" handler="on_menu_show_indentation_guides1_toggled" swapped="no"/>
</object>
Expand All @@ -9082,7 +9082,7 @@
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">To_ggle All Additional Widgets</property>
<property name="label" translatable="yes">Toggle All _Additional Widgets</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_menu_toggle_all_additional_widgets1_activate" swapped="no"/>
</object>
Expand Down Expand Up @@ -9540,7 +9540,7 @@
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Replace Tabs with _Spaces</property>
<property name="label" translatable="yes">Replace Tabs with S_paces</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_replace_tabs_activate" swapped="no"/>
</object>
Expand All @@ -9550,7 +9550,7 @@
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Replace Spaces with _Tabs...</property>
<property name="label" translatable="yes">_Replace Spaces with Tabs...</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_replace_spaces_activate" swapped="no"/>
</object>
Expand Down Expand Up @@ -9816,7 +9816,7 @@
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Keyboard Shortcuts</property>
<property name="label" translatable="yes">Keyboard _Shortcuts</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_help_shortcuts1_activate" swapped="no"/>
</object>
Expand Down
8 changes: 4 additions & 4 deletions src/keybindings.c
View file
Expand Up @@ -390,7 +390,7 @@ static void init_default_kb(void)
add_kb(group, GEANY_KEYS_FORMAT_DECREASEINDENTBYSPACE, NULL,
0, 0, "edit_decreaseindentbyspace", _("Decrease indent by one space"), NULL);
add_kb(group, GEANY_KEYS_FORMAT_AUTOINDENT, NULL,
0, 0, "edit_autoindent", _("_Smart Line Indent"), "smart_line_indent1");
0, 0, "edit_autoindent", _("S_mart Line Indent"), "smart_line_indent1");
add_kb(group, GEANY_KEYS_FORMAT_SENDTOCMD1, NULL,
GDK_1, GDK_CONTROL_MASK, "edit_sendtocmd1", _("Send to Custom Command 1"), NULL);
add_kb(group, GEANY_KEYS_FORMAT_SENDTOCMD2, NULL,
Expand All @@ -412,7 +412,7 @@ static void init_default_kb(void)
GDK_d, GDK_SHIFT_MASK | GDK_MOD1_MASK, "menu_insert_date", _("Insert date"),
"insert_date_custom1");
add_kb(group, GEANY_KEYS_INSERT_ALTWHITESPACE, NULL,
0, 0, "edit_insertwhitespace", _("_Insert Alternative White Space"),
0, 0, "edit_insertwhitespace", _("Insert Alternative _White Space"),
"insert_alternative_white_space1");
add_kb(group, GEANY_KEYS_INSERT_LINEBEFORE, NULL,
0, 0, "edit_insertlinebefore", _("Insert New Line Before Current"), NULL);
Expand Down Expand Up @@ -474,10 +474,10 @@ static void init_default_kb(void)
_("Toggle marker"), NULL);
add_kb(group, GEANY_KEYS_GOTO_NEXTMARKER, NULL,
GDK_period, GDK_CONTROL_MASK, "edit_gotonextmarker",
_("_Go to Next Marker"), "go_to_next_marker1");
_("Go to Ne_xt Marker"), "go_to_next_marker1");
add_kb(group, GEANY_KEYS_GOTO_PREVIOUSMARKER, NULL,
GDK_comma, GDK_CONTROL_MASK, "edit_gotopreviousmarker",
_("_Go to Previous Marker"), "go_to_previous_marker1");
_("Go to Pre_vious Marker"), "go_to_previous_marker1");
add_kb(group, GEANY_KEYS_GOTO_TAGDEFINITION, NULL,
GDK_t, GDK_CONTROL_MASK, "popup_gototagdefinition",
_("Go to Tag Definition"), "goto_tag_definition1");
Expand Down

0 comments on commit 1e50962

Please sign in to comment.