SF.net SVN: geany: [1662] trunk

Revision: 1662 http://svn.sourceforge.net/geany/?rev=1662&view=rev Author: eht16 Date: 2007-07-04 07:41:58 -0700 (Wed, 04 Jul 2007)

Log Message: ----------- Change Help shortcut to F1, use Ctrl-H for Replace.

Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/interface.c trunk/src/keybindings.c trunk/src/keybindings.h

Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-07-04 12:07:57 UTC (rev 1661) +++ trunk/ChangeLog 2007-07-04 14:41:58 UTC (rev 1662) @@ -1,3 +1,9 @@ +2007-07-04 Enrico Tröger enrico.troeger@uvena.de + + * geany.glade, src/interface.c, src/keybindings.c, src/keybindings.h: + Change Help shortcut to F1, use Ctrl-H for Replace. + + 2007-07-04 Nick Treleaven nick.treleaven@btinternet.com

* src/utils.c, src/utils.h:

Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2007-07-04 12:07:57 UTC (rev 1661) +++ trunk/geany.glade 2007-07-04 14:41:58 UTC (rev 1662) @@ -58,7 +58,7 @@ <property name="use_underline">True</property>

<child internal-child="image"> - <widget class="GtkImage" id="image1877"> + <widget class="GtkImage" id="image1901"> <property name="visible">True</property> <property name="stock">gtk-new</property> <property name="icon_size">1</property> @@ -148,7 +148,7 @@ <signal name="activate" handler="on_save_all1_activate" last_modification_time="Thu, 02 Jun 2005 14:15:30 GMT"/>

<child internal-child="image"> - <widget class="GtkImage" id="image1878"> + <widget class="GtkImage" id="image1902"> <property name="visible">True</property> <property name="stock">gtk-save</property> <property name="icon_size">1</property> @@ -169,7 +169,7 @@ <signal name="activate" handler="on_toolbutton23_clicked" last_modification_time="Mon, 24 Jul 2006 19:26:04 GMT"/>

<child internal-child="image"> - <widget class="GtkImage" id="image1879"> + <widget class="GtkImage" id="image1903"> <property name="visible">True</property> <property name="stock">gtk-revert-to-saved</property> <property name="icon_size">1</property> @@ -189,7 +189,7 @@ <property name="use_underline">True</property>

<child internal-child="image"> - <widget class="GtkImage" id="image1880"> + <widget class="GtkImage" id="image1904"> <property name="visible">True</property> <property name="stock">gtk-revert-to-saved</property> <property name="icon_size">1</property> @@ -285,7 +285,7 @@ <signal name="activate" handler="on_close_all1_activate" last_modification_time="Thu, 02 Jun 2005 14:15:30 GMT"/>

<child internal-child="image"> - <widget class="GtkImage" id="image1881"> + <widget class="GtkImage" id="image1905"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -493,7 +493,7 @@ <signal name="activate" handler="on_menu_increase_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:28:54 GMT"/>

<child internal-child="image"> - <widget class="GtkImage" id="image1882"> + <widget class="GtkImage" id="image1906"> <property name="visible">True</property> <property name="stock">gtk-indent</property> <property name="icon_size">1</property> @@ -514,7 +514,7 @@ <signal name="activate" handler="on_menu_decrease_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:28:54 GMT"/>

<child internal-child="image"> - <widget class="GtkImage" id="image1883"> + <widget class="GtkImage" id="image1907"> <property name="visible">True</property> <property name="stock">gtk-unindent</property> <property name="icon_size">1</property> @@ -570,7 +570,7 @@ <property name="use_underline">True</property>

<child internal-child="image"> - <widget class="GtkImage" id="image1884"> + <widget class="GtkImage" id="image1908"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -602,7 +602,7 @@ <property name="use_underline">True</property>

<child internal-child="image"> - <widget class="GtkImage" id="image1885"> + <widget class="GtkImage" id="image1909"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -687,7 +687,7 @@ <property name="use_underline">True</property>

<child internal-child="image"> - <widget class="GtkImage" id="image1886"> + <widget class="GtkImage" id="image1910"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -784,7 +784,7 @@ <signal name="activate" handler="on_replace1_activate" last_modification_time="Sun, 23 Oct 2005 13:22:36 GMT"/>

<child internal-child="image"> - <widget class="GtkImage" id="image1887"> + <widget class="GtkImage" id="image1911"> <property name="visible">True</property> <property name="stock">gtk-find-and-replace</property> <property name="icon_size">1</property> @@ -850,7 +850,7 @@ <signal name="activate" handler="on_go_to_line1_activate" last_modification_time="Tue, 23 May 2006 17:10:49 GMT"/>

<child internal-child="image"> - <widget class="GtkImage" id="image1888"> + <widget class="GtkImage" id="image1912"> <property name="visible">True</property> <property name="stock">gtk-jump-to</property> <property name="icon_size">1</property> @@ -885,7 +885,7 @@ <signal name="activate" handler="on_change_font1_activate" last_modification_time="Fri, 22 Apr 2005 18:58:45 GMT"/>

<child internal-child="image"> - <widget class="GtkImage" id="image1889"> + <widget class="GtkImage" id="image1913"> <property name="visible">True</property> <property name="stock">gtk-select-font</property> <property name="icon_size">1</property> @@ -1245,7 +1245,7 @@ <signal name="activate" handler="on_project_new1_activate" last_modification_time="Thu, 18 Jan 2007 22:16:24 GMT"/>

<child internal-child="image"> - <widget class="GtkImage" id="image1890"> + <widget class="GtkImage" id="image1914"> <property name="visible">True</property> <property name="stock">gtk-new</property> <property name="icon_size">1</property> @@ -1266,7 +1266,7 @@ <signal name="activate" handler="on_project_open1_activate" last_modification_time="Mon, 15 Jan 2007 17:34:17 GMT"/>

<child internal-child="image"> - <widget class="GtkImage" id="image1891"> + <widget class="GtkImage" id="image1915"> <property name="visible">True</property> <property name="stock">gtk-open</property> <property name="icon_size">1</property> @@ -1287,7 +1287,7 @@ <signal name="activate" handler="on_project_close1_activate" last_modification_time="Mon, 15 Jan 2007 17:34:17 GMT"/>

<child internal-child="image"> - <widget class="GtkImage" id="image1892"> + <widget class="GtkImage" id="image1916"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -1345,7 +1345,7 @@ <signal name="activate" handler="on_show_color_chooser1_activate" last_modification_time="Wed, 22 Jun 2005 18:10:21 GMT"/>

<child internal-child="image"> - <widget class="GtkImage" id="image1893"> + <widget class="GtkImage" id="image1917"> <property name="visible">True</property> <property name="stock">gtk-select-color</property> <property name="icon_size">1</property> @@ -1393,9 +1393,21 @@ <child> <widget class="GtkImageMenuItem" id="help1"> <property name="visible">True</property> - <property name="label">gtk-help</property> - <property name="use_stock">True</property> + <property name="label" translatable="yes">_Help</property> + <property name="use_underline">True</property> <signal name="activate" handler="on_help1_activate" last_modification_time="Sun, 24 Jul 2005 15:23:11 GMT"/> + + <child internal-child="image"> + <widget class="GtkImage" id="image1918"> + <property name="visible">True</property> + <property name="stock">gtk-help</property> + <property name="icon_size">1</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + </child> </widget> </child>

Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2007-07-04 12:07:57 UTC (rev 1661) +++ trunk/src/interface.c 2007-07-04 14:41:58 UTC (rev 1662) @@ -37,7 +37,7 @@ GtkWidget *file1_menu; GtkWidget *menu_new1; GtkWidget *menu_new_with_template1; - GtkWidget *image1877; + GtkWidget *image1901; GtkWidget *menu_new_with_template1_menu; GtkWidget *invisible2; GtkWidget *separator12; @@ -48,11 +48,11 @@ GtkWidget *menu_save1; GtkWidget *menu_save_as1; GtkWidget *menu_save_all1; - GtkWidget *image1878; + GtkWidget *image1902; GtkWidget *menu_reload1; - GtkWidget *image1879; + GtkWidget *image1903; GtkWidget *menu_reload_as1; - GtkWidget *image1880; + GtkWidget *image1904; GtkWidget *menu_reload_as1_menu; GtkWidget *invisible7; GtkWidget *separator21; @@ -64,7 +64,7 @@ GtkWidget *separator14; GtkWidget *menu_close1; GtkWidget *menu_close_all1; - GtkWidget *image1881; + GtkWidget *image1905; GtkWidget *menu_separatormenuitem1; GtkWidget *menu_quit1; GtkWidget *edit1; @@ -90,20 +90,20 @@ GtkWidget *menu_duplicate_line1; GtkWidget *separator29; GtkWidget *menu_increase_indent1; - GtkWidget *image1882; + GtkWidget *image1906; GtkWidget *menu_decrease_indent1; - GtkWidget *image1883; + GtkWidget *image1907; GtkWidget *separator37; GtkWidget *send_selection_to2; GtkWidget *send_selection_to2_menu; GtkWidget *invisible13; GtkWidget *separator18; GtkWidget *insert_include2; - GtkWidget *image1884; + GtkWidget *image1908; GtkWidget *insert_include2_menu; GtkWidget *invisible4; GtkWidget *add_comments1; - GtkWidget *image1885; + GtkWidget *image1909; GtkWidget *add_comments1_menu; GtkWidget *menu_add_changelog_entry1; GtkWidget *insert_file_header1; @@ -112,7 +112,7 @@ GtkWidget *insert_gpl_notice2; GtkWidget *insert_bsd_license_notice2; GtkWidget *insert_date1; - GtkWidget *image1886; + GtkWidget *image1910; GtkWidget *insert_date1_menu; GtkWidget *invisible8; GtkWidget *separator9; @@ -124,7 +124,7 @@ GtkWidget *find_previous1; GtkWidget *find_in_files1; GtkWidget *replace1; - GtkWidget *image1887; + GtkWidget *image1911; GtkWidget *separator33; GtkWidget *find_nextsel1; GtkWidget *find_prevsel1; @@ -132,11 +132,11 @@ GtkWidget *next_message1; GtkWidget *separator32; GtkWidget *go_to_line1; - GtkWidget *image1888; + GtkWidget *image1912; GtkWidget *menu_view1; GtkWidget *menu_view1_menu; GtkWidget *menu_change_font1; - GtkWidget *image1889; + GtkWidget *image1913; GtkWidget *menu_separator4; GtkWidget *menu_toggle_all_additional_widgets1; GtkWidget *menu_fullscreen1; @@ -179,23 +179,24 @@ GtkWidget *menu_project1; GtkWidget *menu_project1_menu; GtkWidget *project_new1; - GtkWidget *image1890; + GtkWidget *image1914; GtkWidget *project_open1; - GtkWidget *image1891; + GtkWidget *image1915; GtkWidget *project_close1; - GtkWidget *image1892; + GtkWidget *image1916; GtkWidget *separator34; GtkWidget *project_properties1; GtkWidget *menu_build1; GtkWidget *tools1; GtkWidget *tools1_menu; GtkWidget *menu_choose_color1; - GtkWidget *image1893; + GtkWidget *image1917; GtkWidget *menu_count_words1; GtkWidget *menu_insert_special_chars1; GtkWidget *menu_help1; GtkWidget *menu_help1_menu; GtkWidget *help1; + GtkWidget *image1918; GtkWidget *keyboard_shortcuts1; GtkWidget *website1; GtkWidget *separator16; @@ -295,9 +296,9 @@ gtk_widget_show (menu_new_with_template1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_new_with_template1);

- image1877 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1877); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image1877); + image1901 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1901); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image1901);

menu_new_with_template1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_new_with_template1), menu_new_with_template1_menu); @@ -340,25 +341,25 @@ gtk_container_add (GTK_CONTAINER (file1_menu), menu_save_all1); gtk_tooltips_set_tip (tooltips, menu_save_all1, _("Saves all open files"), NULL);

- image1878 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1878); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image1878); + image1902 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1902); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image1902);

menu_reload1 = gtk_image_menu_item_new_with_mnemonic (_("_Reload")); gtk_widget_show (menu_reload1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_reload1);

- image1879 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1879); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image1879); + image1903 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1903); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image1903);

menu_reload_as1 = gtk_image_menu_item_new_with_mnemonic (_("R_eload As")); gtk_widget_show (menu_reload_as1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_reload_as1);

- image1880 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1880); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image1880); + image1904 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1904); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image1904);

menu_reload_as1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_reload_as1), menu_reload_as1_menu); @@ -409,9 +410,9 @@ gtk_container_add (GTK_CONTAINER (file1_menu), menu_close_all1); gtk_tooltips_set_tip (tooltips, menu_close_all1, _("Closes all open files"), NULL);

- image1881 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1881); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image1881); + image1905 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1905); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image1905);

menu_separatormenuitem1 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separatormenuitem1); @@ -519,17 +520,17 @@ gtk_widget_show (menu_increase_indent1); gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_increase_indent1);

- image1882 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1882); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image1882); + image1906 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1906); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image1906);

menu_decrease_indent1 = gtk_image_menu_item_new_with_mnemonic (_("_Decrease Indent")); gtk_widget_show (menu_decrease_indent1); gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_decrease_indent1);

- image1883 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1883); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image1883); + image1907 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1907); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image1907);

separator37 = gtk_separator_menu_item_new (); gtk_widget_show (separator37); @@ -555,9 +556,9 @@ gtk_widget_show (insert_include2); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_include2);

- image1884 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1884); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image1884); + image1908 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1908); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image1908);

insert_include2_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include2), insert_include2_menu); @@ -569,9 +570,9 @@ gtk_widget_show (add_comments1); gtk_container_add (GTK_CONTAINER (edit1_menu), add_comments1);

- image1885 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1885); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image1885); + image1909 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1909); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image1909);

add_comments1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (add_comments1), add_comments1_menu); @@ -610,9 +611,9 @@ gtk_widget_show (insert_date1); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_date1);

- image1886 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1886); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image1886); + image1910 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1910); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image1910);

insert_date1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_date1), insert_date1_menu); @@ -656,9 +657,9 @@ gtk_widget_show (replace1); gtk_container_add (GTK_CONTAINER (search1_menu), replace1);

- image1887 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1887); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image1887); + image1911 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1911); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image1911);

separator33 = gtk_separator_menu_item_new (); gtk_widget_show (separator33); @@ -691,9 +692,9 @@ gtk_widget_show (go_to_line1); gtk_container_add (GTK_CONTAINER (search1_menu), go_to_line1);

- image1888 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1888); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image1888); + image1912 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1912); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image1912);

menu_view1 = gtk_menu_item_new_with_mnemonic (_("_View")); gtk_widget_show (menu_view1); @@ -707,9 +708,9 @@ gtk_container_add (GTK_CONTAINER (menu_view1_menu), menu_change_font1); gtk_tooltips_set_tip (tooltips, menu_change_font1, _("Change the default font"), NULL);

- image1889 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1889); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image1889); + image1913 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1913); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image1913);

menu_separator4 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separator4); @@ -897,25 +898,25 @@ gtk_widget_show (project_new1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_new1);

- image1890 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1890); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image1890); + image1914 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1914); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image1914);

project_open1 = gtk_image_menu_item_new_with_mnemonic (_("_Open")); gtk_widget_show (project_open1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_open1);

- image1891 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1891); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image1891); + image1915 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1915); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image1915);

project_close1 = gtk_image_menu_item_new_with_mnemonic (_("_Close")); gtk_widget_show (project_close1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_close1);

- image1892 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1892); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image1892); + image1916 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1916); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image1916);

separator34 = gtk_separator_menu_item_new (); gtk_widget_show (separator34); @@ -942,9 +943,9 @@ gtk_container_add (GTK_CONTAINER (tools1_menu), menu_choose_color1); gtk_tooltips_set_tip (tooltips, menu_choose_color1, _("Open a color chooser dialog, to interactively pick colors from a palette."), NULL);

- image1893 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1893); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image1893); + image1917 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1917); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image1917);

menu_count_words1 = gtk_menu_item_new_with_mnemonic (_("_Word Count")); gtk_widget_show (menu_count_words1); @@ -962,10 +963,14 @@ menu_help1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_help1), menu_help1_menu);

- help1 = gtk_image_menu_item_new_from_stock ("gtk-help", accel_group); + help1 = gtk_image_menu_item_new_with_mnemonic (_("_Help")); gtk_widget_show (help1); gtk_container_add (GTK_CONTAINER (menu_help1_menu), help1);

+ image1918 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1918); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image1918); + keyboard_shortcuts1 = gtk_menu_item_new_with_mnemonic (_("_Keyboard Shortcuts")); gtk_widget_show (keyboard_shortcuts1); gtk_container_add (GTK_CONTAINER (menu_help1_menu), keyboard_shortcuts1); @@ -1605,7 +1610,7 @@ GLADE_HOOKUP_OBJECT (window1, file1_menu, "file1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_new1, "menu_new1"); GLADE_HOOKUP_OBJECT (window1, menu_new_with_template1, "menu_new_with_template1"); - GLADE_HOOKUP_OBJECT (window1, image1877, "image1877"); + GLADE_HOOKUP_OBJECT (window1, image1901, "image1901"); GLADE_HOOKUP_OBJECT (window1, menu_new_with_template1_menu, "menu_new_with_template1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible2, "invisible2"); GLADE_HOOKUP_OBJECT (window1, separator12, "separator12"); @@ -1616,11 +1621,11 @@ GLADE_HOOKUP_OBJECT (window1, menu_save1, "menu_save1"); GLADE_HOOKUP_OBJECT (window1, menu_save_as1, "menu_save_as1"); GLADE_HOOKUP_OBJECT (window1, menu_save_all1, "menu_save_all1"); - GLADE_HOOKUP_OBJECT (window1, image1878, "image1878"); + GLADE_HOOKUP_OBJECT (window1, image1902, "image1902"); GLADE_HOOKUP_OBJECT (window1, menu_reload1, "menu_reload1"); - GLADE_HOOKUP_OBJECT (window1, image1879, "image1879"); + GLADE_HOOKUP_OBJECT (window1, image1903, "image1903"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1, "menu_reload_as1"); - GLADE_HOOKUP_OBJECT (window1, image1880, "image1880"); + GLADE_HOOKUP_OBJECT (window1, image1904, "image1904"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1_menu, "menu_reload_as1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible7, "invisible7"); GLADE_HOOKUP_OBJECT (window1, separator21, "separator21"); @@ -1632,7 +1637,7 @@ GLADE_HOOKUP_OBJECT (window1, separator14, "separator14"); GLADE_HOOKUP_OBJECT (window1, menu_close1, "menu_close1"); GLADE_HOOKUP_OBJECT (window1, menu_close_all1, "menu_close_all1"); - GLADE_HOOKUP_OBJECT (window1, image1881, "image1881"); + GLADE_HOOKUP_OBJECT (window1, image1905, "image1905"); GLADE_HOOKUP_OBJECT (window1, menu_separatormenuitem1, "menu_separatormenuitem1"); GLADE_HOOKUP_OBJECT (window1, menu_quit1, "menu_quit1"); GLADE_HOOKUP_OBJECT (window1, edit1, "edit1"); @@ -1658,20 +1663,20 @@ GLADE_HOOKUP_OBJECT (window1, menu_duplicate_line1, "menu_duplicate_line1"); GLADE_HOOKUP_OBJECT (window1, separator29, "separator29"); GLADE_HOOKUP_OBJECT (window1, menu_increase_indent1, "menu_increase_indent1"); - GLADE_HOOKUP_OBJECT (window1, image1882, "image1882"); + GLADE_HOOKUP_OBJECT (window1, image1906, "image1906"); GLADE_HOOKUP_OBJECT (window1, menu_decrease_indent1, "menu_decrease_indent1"); - GLADE_HOOKUP_OBJECT (window1, image1883, "image1883"); + GLADE_HOOKUP_OBJECT (window1, image1907, "image1907"); GLADE_HOOKUP_OBJECT (window1, separator37, "separator37"); GLADE_HOOKUP_OBJECT (window1, send_selection_to2, "send_selection_to2"); GLADE_HOOKUP_OBJECT (window1, send_selection_to2_menu, "send_selection_to2_menu"); GLADE_HOOKUP_OBJECT (window1, invisible13, "invisible13"); GLADE_HOOKUP_OBJECT (window1, separator18, "separator18"); GLADE_HOOKUP_OBJECT (window1, insert_include2, "insert_include2"); - GLADE_HOOKUP_OBJECT (window1, image1884, "image1884"); + GLADE_HOOKUP_OBJECT (window1, image1908, "image1908"); GLADE_HOOKUP_OBJECT (window1, insert_include2_menu, "insert_include2_menu"); GLADE_HOOKUP_OBJECT (window1, invisible4, "invisible4"); GLADE_HOOKUP_OBJECT (window1, add_comments1, "add_comments1"); - GLADE_HOOKUP_OBJECT (window1, image1885, "image1885"); + GLADE_HOOKUP_OBJECT (window1, image1909, "image1909"); GLADE_HOOKUP_OBJECT (window1, add_comments1_menu, "add_comments1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_add_changelog_entry1, "menu_add_changelog_entry1"); GLADE_HOOKUP_OBJECT (window1, insert_file_header1, "insert_file_header1"); @@ -1680,7 +1685,7 @@ GLADE_HOOKUP_OBJECT (window1, insert_gpl_notice2, "insert_gpl_notice2"); GLADE_HOOKUP_OBJECT (window1, insert_bsd_license_notice2, "insert_bsd_license_notice2"); GLADE_HOOKUP_OBJECT (window1, insert_date1, "insert_date1"); - GLADE_HOOKUP_OBJECT (window1, image1886, "image1886"); + GLADE_HOOKUP_OBJECT (window1, image1910, "image1910"); GLADE_HOOKUP_OBJECT (window1, insert_date1_menu, "insert_date1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible8, "invisible8"); GLADE_HOOKUP_OBJECT (window1, separator9, "separator9"); @@ -1692,7 +1697,7 @@ GLADE_HOOKUP_OBJECT (window1, find_previous1, "find_previous1"); GLADE_HOOKUP_OBJECT (window1, find_in_files1, "find_in_files1"); GLADE_HOOKUP_OBJECT (window1, replace1, "replace1"); - GLADE_HOOKUP_OBJECT (window1, image1887, "image1887"); + GLADE_HOOKUP_OBJECT (window1, image1911, "image1911"); GLADE_HOOKUP_OBJECT (window1, separator33, "separator33"); GLADE_HOOKUP_OBJECT (window1, find_nextsel1, "find_nextsel1"); GLADE_HOOKUP_OBJECT (window1, find_prevsel1, "find_prevsel1"); @@ -1700,11 +1705,11 @@ GLADE_HOOKUP_OBJECT (window1, next_message1, "next_message1"); GLADE_HOOKUP_OBJECT (window1, separator32, "separator32"); GLADE_HOOKUP_OBJECT (window1, go_to_line1, "go_to_line1"); - GLADE_HOOKUP_OBJECT (window1, image1888, "image1888"); + GLADE_HOOKUP_OBJECT (window1, image1912, "image1912"); GLADE_HOOKUP_OBJECT (window1, menu_view1, "menu_view1"); GLADE_HOOKUP_OBJECT (window1, menu_view1_menu, "menu_view1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_change_font1, "menu_change_font1"); - GLADE_HOOKUP_OBJECT (window1, image1889, "image1889"); + GLADE_HOOKUP_OBJECT (window1, image1913, "image1913"); GLADE_HOOKUP_OBJECT (window1, menu_separator4, "menu_separator4"); GLADE_HOOKUP_OBJECT (window1, menu_toggle_all_additional_widgets1, "menu_toggle_all_additional_widgets1"); GLADE_HOOKUP_OBJECT (window1, menu_fullscreen1, "menu_fullscreen1"); @@ -1746,23 +1751,24 @@ GLADE_HOOKUP_OBJECT (window1, menu_project1, "menu_project1"); GLADE_HOOKUP_OBJECT (window1, menu_project1_menu, "menu_project1_menu"); GLADE_HOOKUP_OBJECT (window1, project_new1, "project_new1"); - GLADE_HOOKUP_OBJECT (window1, image1890, "image1890"); + GLADE_HOOKUP_OBJECT (window1, image1914, "image1914"); GLADE_HOOKUP_OBJECT (window1, project_open1, "project_open1"); - GLADE_HOOKUP_OBJECT (window1, image1891, "image1891"); + GLADE_HOOKUP_OBJECT (window1, image1915, "image1915"); GLADE_HOOKUP_OBJECT (window1, project_close1, "project_close1"); - GLADE_HOOKUP_OBJECT (window1, image1892, "image1892"); + GLADE_HOOKUP_OBJECT (window1, image1916, "image1916"); GLADE_HOOKUP_OBJECT (window1, separator34, "separator34"); GLADE_HOOKUP_OBJECT (window1, project_properties1, "project_properties1"); GLADE_HOOKUP_OBJECT (window1, menu_build1, "menu_build1"); GLADE_HOOKUP_OBJECT (window1, tools1, "tools1"); GLADE_HOOKUP_OBJECT (window1, tools1_menu, "tools1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_choose_color1, "menu_choose_color1"); - GLADE_HOOKUP_OBJECT (window1, image1893, "image1893"); + GLADE_HOOKUP_OBJECT (window1, image1917, "image1917"); GLADE_HOOKUP_OBJECT (window1, menu_count_words1, "menu_count_words1"); GLADE_HOOKUP_OBJECT (window1, menu_insert_special_chars1, "menu_insert_special_chars1"); GLADE_HOOKUP_OBJECT (window1, menu_help1, "menu_help1"); GLADE_HOOKUP_OBJECT (window1, menu_help1_menu, "menu_help1_menu"); GLADE_HOOKUP_OBJECT (window1, help1, "help1"); + GLADE_HOOKUP_OBJECT (window1, image1918, "image1918"); GLADE_HOOKUP_OBJECT (window1, keyboard_shortcuts1, "keyboard_shortcuts1"); GLADE_HOOKUP_OBJECT (window1, website1, "website1"); GLADE_HOOKUP_OBJECT (window1, separator16, "separator16");

Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2007-07-04 12:07:57 UTC (rev 1661) +++ trunk/src/keybindings.c 2007-07-04 14:41:58 UTC (rev 1662) @@ -60,6 +60,7 @@ static void cb_func_menu_undo(guint key_id); static void cb_func_menu_redo(guint key_id); static void cb_func_menu_selectall(guint key_id); +static void cb_func_menu_help(guint key_id); static void cb_func_menu_preferences(guint key_id); static void cb_func_menu_insert_date(guint key_id);

@@ -164,7 +165,7 @@ keys[GEANY_KEYS_MENU_FINDPREVSEL] = fill(cb_func_menu_findprevsel, 0, 0, "menu_findprevsel", _("Find Previous Selection")); keys[GEANY_KEYS_MENU_REPLACE] = fill(cb_func_menu_replace, - GDK_e, GDK_CONTROL_MASK, "menu_replace", _("Replace")); + GDK_h, GDK_CONTROL_MASK, "menu_replace", _("Replace")); keys[GEANY_KEYS_MENU_FINDINFILES] = fill(cb_func_menu_findinfiles, GDK_f, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "menu_findinfiles", _("Find in files")); keys[GEANY_KEYS_MENU_NEXTMESSAGE] = fill(cb_func_menu_nextmessage, @@ -219,6 +220,9 @@ keys[GEANY_KEYS_BUILD_OPTIONS] = fill(cb_func_build_action, 0, 0, "build_options", _("Build options"));

+ keys[GEANY_KEYS_MENU_HELP] = fill(cb_func_menu_help, + GDK_F1, 0, "menu_help", _("Help")); + keys[GEANY_KEYS_SWITCH_EDITOR] = fill(cb_func_switch_editor, GDK_F2, 0, "switch_editor", _("Switch to Editor")); keys[GEANY_KEYS_SWITCH_SCRIBBLE] = fill(cb_func_switch_scribble, @@ -353,6 +357,7 @@ GEANY_ADD_ACCEL(GEANY_KEYS_MENU_SELECTALL, menu_select_all1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_INSERTDATE, insert_date_custom1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_PREFERENCES, preferences1); + GEANY_ADD_ACCEL(GEANY_KEYS_MENU_HELP, help1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_FINDNEXT, find_next1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_FINDPREVIOUS, find_previous1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_FINDNEXTSEL, find_nextsel1); @@ -491,6 +496,10 @@ g_string_append(text_names, _("\n<b>Tools menu</b>\n")); g_string_append(text_keys, "\n\n"); break; + case GEANY_KEYS_MENU_HELP: + g_string_append(text_names, _("\n<b>Help menu</b>\n")); + g_string_append(text_keys, "\n\n"); + break; case GEANY_KEYS_SWITCH_EDITOR: g_string_append(text_names, _("\n<b>Focus commands</b>\n")); g_string_append(text_keys, "\n\n"); @@ -758,6 +767,11 @@ on_preferences1_activate(NULL, NULL); }

+static void cb_func_menu_help(G_GNUC_UNUSED guint key_id) +{ + on_help1_activate(NULL, NULL); +} + static void cb_func_menu_findnext(G_GNUC_UNUSED guint key_id) { on_find_next1_activate(NULL, NULL);

Modified: trunk/src/keybindings.h =================================================================== --- trunk/src/keybindings.h 2007-07-04 12:07:57 UTC (rev 1661) +++ trunk/src/keybindings.h 2007-07-04 14:41:58 UTC (rev 1662) @@ -100,6 +100,8 @@ GEANY_KEYS_MENU_OPENCOLORCHOOSER, GEANY_KEYS_MENU_INSERTSPECIALCHARS,

+ GEANY_KEYS_MENU_HELP, + GEANY_KEYS_SWITCH_EDITOR, GEANY_KEYS_SWITCH_SCRIBBLE, GEANY_KEYS_SWITCH_VTE,

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.