Revision: 4490 http://geany.svn.sourceforge.net/geany/?rev=4490&view=rev Author: ntrel Date: 2009-12-09 17:16:54 +0000 (Wed, 09 Dec 2009)
Log Message: ----------- Capitalize, add mnemonics, sync with kb.c the Edit->Commands menu item labels.
Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/interface.c trunk/src/keybindings.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-12-09 16:57:05 UTC (rev 4489) +++ trunk/ChangeLog 2009-12-09 17:16:54 UTC (rev 4490) @@ -10,6 +10,9 @@ messages). * src/msgwindow.c: Refactor msgwin_goto_compiler_file_line(). + * src/interface.c, src/keybindings.c, geany.glade: + Capitalize, add mnemonics, sync with kb.c the Edit->Commands menu item + labels.
2009-12-08 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2009-12-09 16:57:05 UTC (rev 4489) +++ trunk/geany.glade 2009-12-09 17:16:54 UTC (rev 4490) @@ -584,7 +584,7 @@ <child> <widget class="GtkImageMenuItem" id="cut_current_line(s)1"> <property name="visible">True</property> - <property name="label" translatable="yes">Cut current line(s)</property> + <property name="label" translatable="yes">_Cut Current Line(s)</property> <property name="use_underline">True</property> <signal name="activate" handler="on_cut_current_line(s)1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/>
@@ -605,7 +605,7 @@ <child> <widget class="GtkImageMenuItem" id="copy_current_line(s)1"> <property name="visible">True</property> - <property name="label" translatable="yes">Copy current line(s)</property> + <property name="label" translatable="yes">_Copy Current Line(s)</property> <property name="use_underline">True</property> <signal name="activate" handler="on_copy_current_line(s)1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/>
@@ -626,7 +626,7 @@ <child> <widget class="GtkMenuItem" id="delete_current_line(s)1"> <property name="visible">True</property> - <property name="label" translatable="yes">Delete current line(s)</property> + <property name="label" translatable="yes">_Delete Current Line(s)</property> <property name="use_underline">True</property> <signal name="activate" handler="on_delete_current_line(s)1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/> </widget> @@ -635,7 +635,7 @@ <child> <widget class="GtkMenuItem" id="duplicate_line_or_selection1"> <property name="visible">True</property> - <property name="label" translatable="yes">Duplicate line or selection</property> + <property name="label" translatable="yes">_Duplicate Line or Selection</property> <property name="use_underline">True</property> <signal name="activate" handler="on_duplicate_line_or_selection1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/> </widget> @@ -650,7 +650,7 @@ <child> <widget class="GtkMenuItem" id="select_current_line(s)1"> <property name="visible">True</property> - <property name="label" translatable="yes">Select current line(s)</property> + <property name="label" translatable="yes">_Select Current Line(s)</property> <property name="use_underline">True</property> <signal name="activate" handler="on_select_current_line(s)1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/> </widget> @@ -659,7 +659,7 @@ <child> <widget class="GtkMenuItem" id="select_current_paragraph1"> <property name="visible">True</property> - <property name="label" translatable="yes">Select current paragraph</property> + <property name="label" translatable="yes">_Select Current Paragraph</property> <property name="use_underline">True</property> <signal name="activate" handler="on_select_current_paragraph1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/> </widget> @@ -674,7 +674,7 @@ <child> <widget class="GtkMenuItem" id="insert_alternative_white_space1"> <property name="visible">True</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" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/> </widget> @@ -689,7 +689,7 @@ <child> <widget class="GtkMenuItem" id="go_to_next_marker1"> <property name="visible">True</property> - <property name="label" translatable="yes">Go to next marker</property> + <property name="label" translatable="yes">_Go to Next Marker</property> <property name="use_underline">True</property> <signal name="activate" handler="on_go_to_next_marker1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/> </widget> @@ -698,7 +698,7 @@ <child> <widget class="GtkMenuItem" id="go_to_previous_marker1"> <property name="visible">True</property> - <property name="label" translatable="yes">Go to previous marker</property> + <property name="label" translatable="yes">_Go to Previous Marker</property> <property name="use_underline">True</property> <signal name="activate" handler="on_go_to_previous_marker1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/> </widget>
Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2009-12-09 16:57:05 UTC (rev 4489) +++ trunk/src/interface.c 2009-12-09 17:16:54 UTC (rev 4490) @@ -560,7 +560,7 @@ commands2_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (commands2), commands2_menu);
- cut_current_line_s_1 = gtk_image_menu_item_new_with_mnemonic (_("Cut current line(s)")); + cut_current_line_s_1 = gtk_image_menu_item_new_with_mnemonic (_("_Cut Current Line(s)")); gtk_widget_show (cut_current_line_s_1); gtk_container_add (GTK_CONTAINER (commands2_menu), cut_current_line_s_1);
@@ -568,7 +568,7 @@ gtk_widget_show (image3173); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (cut_current_line_s_1), image3173);
- copy_current_line_s_1 = gtk_image_menu_item_new_with_mnemonic (_("Copy current line(s)")); + copy_current_line_s_1 = gtk_image_menu_item_new_with_mnemonic (_("_Copy Current Line(s)")); gtk_widget_show (copy_current_line_s_1); gtk_container_add (GTK_CONTAINER (commands2_menu), copy_current_line_s_1);
@@ -576,11 +576,11 @@ gtk_widget_show (image3174); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (copy_current_line_s_1), image3174);
- delete_current_line_s_1 = gtk_menu_item_new_with_mnemonic (_("Delete current line(s)")); + delete_current_line_s_1 = gtk_menu_item_new_with_mnemonic (_("_Delete Current Line(s)")); gtk_widget_show (delete_current_line_s_1); gtk_container_add (GTK_CONTAINER (commands2_menu), delete_current_line_s_1);
- duplicate_line_or_selection1 = gtk_menu_item_new_with_mnemonic (_("Duplicate line or selection")); + duplicate_line_or_selection1 = gtk_menu_item_new_with_mnemonic (_("_Duplicate Line or Selection")); gtk_widget_show (duplicate_line_or_selection1); gtk_container_add (GTK_CONTAINER (commands2_menu), duplicate_line_or_selection1);
@@ -589,11 +589,11 @@ gtk_container_add (GTK_CONTAINER (commands2_menu), separator49); gtk_widget_set_sensitive (separator49, FALSE);
- select_current_line_s_1 = gtk_menu_item_new_with_mnemonic (_("Select current line(s)")); + select_current_line_s_1 = gtk_menu_item_new_with_mnemonic (_("_Select Current Line(s)")); gtk_widget_show (select_current_line_s_1); gtk_container_add (GTK_CONTAINER (commands2_menu), select_current_line_s_1);
- select_current_paragraph1 = gtk_menu_item_new_with_mnemonic (_("Select current paragraph")); + select_current_paragraph1 = gtk_menu_item_new_with_mnemonic (_("_Select Current Paragraph")); gtk_widget_show (select_current_paragraph1); gtk_container_add (GTK_CONTAINER (commands2_menu), select_current_paragraph1);
@@ -602,7 +602,7 @@ gtk_container_add (GTK_CONTAINER (commands2_menu), separator50); gtk_widget_set_sensitive (separator50, FALSE);
- insert_alternative_white_space1 = gtk_menu_item_new_with_mnemonic (_("Insert alternative white space")); + insert_alternative_white_space1 = gtk_menu_item_new_with_mnemonic (_("_Insert Alternative White Space")); gtk_widget_show (insert_alternative_white_space1); gtk_container_add (GTK_CONTAINER (commands2_menu), insert_alternative_white_space1);
@@ -611,11 +611,11 @@ gtk_container_add (GTK_CONTAINER (commands2_menu), separator51); gtk_widget_set_sensitive (separator51, FALSE);
- go_to_next_marker1 = gtk_menu_item_new_with_mnemonic (_("Go to next marker")); + go_to_next_marker1 = gtk_menu_item_new_with_mnemonic (_("_Go to Next Marker")); gtk_widget_show (go_to_next_marker1); gtk_container_add (GTK_CONTAINER (commands2_menu), go_to_next_marker1);
- go_to_previous_marker1 = gtk_menu_item_new_with_mnemonic (_("Go to previous marker")); + go_to_previous_marker1 = gtk_menu_item_new_with_mnemonic (_("_Go to Previous Marker")); gtk_widget_show (go_to_previous_marker1); gtk_container_add (GTK_CONTAINER (commands2_menu), go_to_previous_marker1);
Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2009-12-09 16:57:05 UTC (rev 4489) +++ trunk/src/keybindings.c 2009-12-09 17:16:54 UTC (rev 4490) @@ -257,10 +257,10 @@ keybindings_set_item(group, GEANY_KEYS_EDITOR_REDO, NULL, GDK_y, GDK_CONTROL_MASK, "menu_redo", _("Redo"), LW(menu_redo2)); keybindings_set_item(group, GEANY_KEYS_EDITOR_DUPLICATELINE, NULL, - GDK_d, GDK_CONTROL_MASK, "edit_duplicateline", _("Duplicate line or selection"), + GDK_d, GDK_CONTROL_MASK, "edit_duplicateline", _("_Duplicate Line or Selection"), LW(duplicate_line_or_selection1)); keybindings_set_item(group, GEANY_KEYS_EDITOR_DELETELINE, NULL, - GDK_k, GDK_CONTROL_MASK, "edit_deleteline", _("Delete current line(s)"), + GDK_k, GDK_CONTROL_MASK, "edit_deleteline", _("_Delete Current Line(s)"), LW(delete_current_line_s_1)); keybindings_set_item(group, GEANY_KEYS_EDITOR_DELETELINETOEND, NULL, GDK_Delete, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "edit_deletelinetoend", @@ -305,10 +305,10 @@ keybindings_set_item(group, GEANY_KEYS_CLIPBOARD_PASTE, NULL, GDK_v, GDK_CONTROL_MASK, "menu_paste", _("Paste"), NULL); keybindings_set_item(group, GEANY_KEYS_CLIPBOARD_COPYLINE, NULL, - GDK_c, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "edit_copyline", _("Copy current line(s)"), + GDK_c, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "edit_copyline", _("_Copy Current Line(s)"), LW(cut_current_line_s_1)); keybindings_set_item(group, GEANY_KEYS_CLIPBOARD_CUTLINE, NULL, - GDK_x, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "edit_cutline", _("Cut current line(s)"), + GDK_x, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "edit_cutline", _("_Cut Current Line(s)"), LW(copy_current_line_s_1));
group = ADD_KB_GROUP(SELECT, _("Select"), cb_func_select_action); @@ -318,10 +318,10 @@ keybindings_set_item(group, GEANY_KEYS_SELECT_WORD, NULL, GDK_w, GDK_SHIFT_MASK | GDK_MOD1_MASK, "edit_selectword", _("Select current word"), NULL); keybindings_set_item(group, GEANY_KEYS_SELECT_LINE, NULL, - GDK_l, GDK_SHIFT_MASK | GDK_MOD1_MASK, "edit_selectline", _("Select current line(s)"), + GDK_l, GDK_SHIFT_MASK | GDK_MOD1_MASK, "edit_selectline", _("_Select Current Line(s)"), LW(select_current_line_s_1)); keybindings_set_item(group, GEANY_KEYS_SELECT_PARAGRAPH, NULL, - GDK_p, GDK_SHIFT_MASK | GDK_MOD1_MASK, "edit_selectparagraph", _("Select current paragraph"), + GDK_p, GDK_SHIFT_MASK | GDK_MOD1_MASK, "edit_selectparagraph", _("_Select Current Paragraph"), LW(select_current_paragraph1)); keybindings_set_item(group, GEANY_KEYS_SELECT_WORDPARTLEFT, NULL, 0, 0, "edit_selectwordpartleft", _("Select to previous word part"), NULL); @@ -358,8 +358,9 @@ GDK_2, GDK_CONTROL_MASK, "edit_sendtocmd2", _("Send to Custom Command 2"), NULL); keybindings_set_item(group, GEANY_KEYS_FORMAT_SENDTOCMD3, NULL, GDK_3, GDK_CONTROL_MASK, "edit_sendtocmd3", _("Send to Custom Command 3"), NULL); + /* may fit better in editor group */ keybindings_set_item(group, GEANY_KEYS_FORMAT_SENDTOVTE, NULL, - 0, 0, "edit_sendtovte", _("Send Selection to Terminal"), LW(send_selection_to_vte1)); + 0, 0, "edit_sendtovte", _("_Send Selection to Terminal"), LW(send_selection_to_vte1)); keybindings_set_item(group, GEANY_KEYS_FORMAT_REFLOWPARAGRAPH, NULL, GDK_j, GDK_CONTROL_MASK, "format_reflowparagraph", _("_Reflow Lines/Block"), LW(reflow_lines_block1)); @@ -370,7 +371,7 @@ GDK_d, GDK_SHIFT_MASK | GDK_MOD1_MASK, "menu_insert_date", _("Insert date"), LW(insert_date_custom1)); keybindings_set_item(group, GEANY_KEYS_INSERT_ALTWHITESPACE, NULL, - 0, 0, "edit_insertwhitespace", _("Insert alternative white space"), + 0, 0, "edit_insertwhitespace", _("_Insert Alternative White Space"), LW(insert_alternative_white_space1));
group = ADD_KB_GROUP(SETTINGS, _("Settings"), NULL); @@ -426,10 +427,10 @@ _("Toggle marker"), NULL); keybindings_set_item(group, GEANY_KEYS_GOTO_NEXTMARKER, NULL, GDK_period, GDK_CONTROL_MASK, "edit_gotonextmarker", - _("Go to next marker"), LW(go_to_next_marker1)); + _("_Go to Next Marker"), LW(go_to_next_marker1)); keybindings_set_item(group, GEANY_KEYS_GOTO_PREVIOUSMARKER, NULL, GDK_comma, GDK_CONTROL_MASK, "edit_gotopreviousmarker", - _("Go to previous marker"), LW(go_to_previous_marker1)); + _("_Go to Previous Marker"), LW(go_to_previous_marker1)); keybindings_set_item(group, GEANY_KEYS_GOTO_TAGDEFINITION, NULL, 0, 0, "popup_gototagdefinition", _("Go to Tag Definition"), NULL); keybindings_set_item(group, GEANY_KEYS_GOTO_TAGDECLARATION, NULL,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.