From 04dfeb19baf72fbc90edcdaa0c6a0ce1c3b8d614 Mon Sep 17 00:00:00 2001 From: Nick Treleaven Date: Mon, 3 Sep 2007 16:25:41 +0000 Subject: [PATCH] Move 'Insert #include' menu item below other insert menu items. git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@1849 ea778897-0a13-0410-b9d1-a72fbfd435f5 --- ChangeLog | 2 + geany.glade | 174 +++++++++++++------------- src/interface.c | 318 ++++++++++++++++++++++++------------------------ 3 files changed, 248 insertions(+), 246 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1d1ff2a9..49a5f67b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,8 @@ Make File->New create a blank document, rather than using the None filetype template. Add None option for the 'New with Template' menu commands. + * src/interface.c, geany.glade: + Move 'Insert #include' menu item below other insert menu items. 2007-08-31 Nick Treleaven diff --git a/geany.glade b/geany.glade index b4fdc982..bea4ae2f 100644 --- a/geany.glade +++ b/geany.glade @@ -58,7 +58,7 @@ True - + True gtk-new 1 @@ -148,7 +148,7 @@ - + True gtk-save 1 @@ -169,7 +169,7 @@ - + True gtk-revert-to-saved 1 @@ -189,7 +189,7 @@ True - + True gtk-revert-to-saved 1 @@ -285,7 +285,7 @@ - + True gtk-close 1 @@ -493,7 +493,7 @@ - + True gtk-indent 1 @@ -514,7 +514,7 @@ - + True gtk-unindent 1 @@ -563,38 +563,6 @@ - - - True - _Insert "include <...>" - True - - - - True - gtk-add - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - - invisible - True - - - - - - - True @@ -602,7 +570,7 @@ True - + True gtk-add 1 @@ -687,7 +655,7 @@ True - + True gtk-add 1 @@ -712,6 +680,38 @@ + + + True + _Insert "include <...>" + True + + + + True + gtk-add + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + + invisible + True + + + + + + + True @@ -784,7 +784,7 @@ - + True gtk-find-and-replace 1 @@ -850,7 +850,7 @@ - + True gtk-jump-to 1 @@ -885,7 +885,7 @@ - + True gtk-select-font 1 @@ -1245,7 +1245,7 @@ - + True gtk-new 1 @@ -1266,7 +1266,7 @@ - + True gtk-open 1 @@ -1287,7 +1287,7 @@ - + True gtk-close 1 @@ -1345,7 +1345,7 @@ - + True gtk-select-color 1 @@ -1389,7 +1389,7 @@ - + True gtk-help 1 @@ -2660,7 +2660,7 @@ - + True gtk-indent 1 @@ -2681,7 +2681,7 @@ - + True gtk-unindent 1 @@ -2730,38 +2730,6 @@ - - - True - Insert "include <...>" - True - - - - True - gtk-add - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - - invisible - True - - - - - - - True @@ -2769,7 +2737,7 @@ True - + True gtk-add 1 @@ -2854,7 +2822,7 @@ True - + True gtk-add 1 @@ -2879,6 +2847,38 @@ + + + True + Insert "include <...>" + True + + + + True + gtk-add + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + + invisible + True + + + + + + + True @@ -2893,7 +2893,7 @@ - + True gtk-find 1 @@ -2948,7 +2948,7 @@ - + True gtk-jump-to 1 diff --git a/src/interface.c b/src/interface.c index 63ebefeb..73cfc86f 100644 --- a/src/interface.c +++ b/src/interface.c @@ -37,7 +37,7 @@ create_window1 (void) GtkWidget *file1_menu; GtkWidget *menu_new1; GtkWidget *menu_new_with_template1; - GtkWidget *image1920; + GtkWidget *image1951; GtkWidget *menu_new_with_template1_menu; GtkWidget *invisible2; GtkWidget *separator12; @@ -48,11 +48,11 @@ create_window1 (void) GtkWidget *menu_save1; GtkWidget *menu_save_as1; GtkWidget *menu_save_all1; - GtkWidget *image1921; + GtkWidget *image1952; GtkWidget *menu_reload1; - GtkWidget *image1922; + GtkWidget *image1953; GtkWidget *menu_reload_as1; - GtkWidget *image1923; + GtkWidget *image1954; GtkWidget *menu_reload_as1_menu; GtkWidget *invisible7; GtkWidget *separator21; @@ -64,7 +64,7 @@ create_window1 (void) GtkWidget *separator14; GtkWidget *menu_close1; GtkWidget *menu_close_all1; - GtkWidget *image1924; + GtkWidget *image1955; GtkWidget *menu_separatormenuitem1; GtkWidget *menu_quit1; GtkWidget *edit1; @@ -90,20 +90,16 @@ create_window1 (void) GtkWidget *menu_duplicate_line1; GtkWidget *separator29; GtkWidget *menu_increase_indent1; - GtkWidget *image1925; + GtkWidget *image1956; GtkWidget *menu_decrease_indent1; - GtkWidget *image1926; + GtkWidget *image1957; GtkWidget *separator37; GtkWidget *send_selection_to2; GtkWidget *send_selection_to2_menu; GtkWidget *invisible13; GtkWidget *separator18; - GtkWidget *insert_include2; - GtkWidget *image1927; - GtkWidget *insert_include2_menu; - GtkWidget *invisible4; GtkWidget *add_comments1; - GtkWidget *image1928; + GtkWidget *image1958; GtkWidget *add_comments1_menu; GtkWidget *menu_add_changelog_entry1; GtkWidget *insert_file_header1; @@ -112,9 +108,13 @@ create_window1 (void) GtkWidget *insert_gpl_notice2; GtkWidget *insert_bsd_license_notice2; GtkWidget *insert_date1; - GtkWidget *image1929; + GtkWidget *image1959; GtkWidget *insert_date1_menu; GtkWidget *invisible8; + GtkWidget *insert_include2; + GtkWidget *image1960; + GtkWidget *insert_include2_menu; + GtkWidget *invisible4; GtkWidget *separator9; GtkWidget *preferences1; GtkWidget *search1; @@ -124,7 +124,7 @@ create_window1 (void) GtkWidget *find_previous1; GtkWidget *find_in_files1; GtkWidget *replace1; - GtkWidget *image1930; + GtkWidget *image1961; GtkWidget *separator33; GtkWidget *find_nextsel1; GtkWidget *find_prevsel1; @@ -132,11 +132,11 @@ create_window1 (void) GtkWidget *next_message1; GtkWidget *separator32; GtkWidget *go_to_line1; - GtkWidget *image1931; + GtkWidget *image1962; GtkWidget *menu_view1; GtkWidget *menu_view1_menu; GtkWidget *menu_change_font1; - GtkWidget *image1932; + GtkWidget *image1963; GtkWidget *menu_separator4; GtkWidget *menu_toggle_all_additional_widgets1; GtkWidget *menu_fullscreen1; @@ -179,23 +179,23 @@ create_window1 (void) GtkWidget *menu_project1; GtkWidget *menu_project1_menu; GtkWidget *project_new1; - GtkWidget *image1933; + GtkWidget *image1964; GtkWidget *project_open1; - GtkWidget *image1934; + GtkWidget *image1965; GtkWidget *project_close1; - GtkWidget *image1935; + GtkWidget *image1966; GtkWidget *separator34; GtkWidget *project_properties1; GtkWidget *menu_build1; GtkWidget *tools1; GtkWidget *tools1_menu; GtkWidget *menu_choose_color1; - GtkWidget *image1936; + GtkWidget *image1967; GtkWidget *menu_count_words1; GtkWidget *menu_help1; GtkWidget *menu_help1_menu; GtkWidget *help1; - GtkWidget *image1937; + GtkWidget *image1968; GtkWidget *keyboard_shortcuts1; GtkWidget *website1; GtkWidget *separator16; @@ -295,9 +295,9 @@ create_window1 (void) gtk_widget_show (menu_new_with_template1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_new_with_template1); - image1920 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1920); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image1920); + image1951 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1951); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image1951); 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 +340,25 @@ create_window1 (void) gtk_container_add (GTK_CONTAINER (file1_menu), menu_save_all1); gtk_tooltips_set_tip (tooltips, menu_save_all1, _("Saves all open files"), NULL); - image1921 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1921); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image1921); + image1952 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1952); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image1952); menu_reload1 = gtk_image_menu_item_new_with_mnemonic (_("_Reload")); gtk_widget_show (menu_reload1); gtk_container_add (GTK_CONTAINER (file1_menu), menu_reload1); - image1922 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1922); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image1922); + image1953 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1953); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image1953); 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); - image1923 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1923); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image1923); + image1954 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1954); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image1954); menu_reload_as1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_reload_as1), menu_reload_as1_menu); @@ -409,9 +409,9 @@ create_window1 (void) gtk_container_add (GTK_CONTAINER (file1_menu), menu_close_all1); gtk_tooltips_set_tip (tooltips, menu_close_all1, _("Closes all open files"), NULL); - image1924 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1924); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image1924); + image1955 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1955); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image1955); menu_separatormenuitem1 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separatormenuitem1); @@ -519,17 +519,17 @@ create_window1 (void) gtk_widget_show (menu_increase_indent1); gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_increase_indent1); - image1925 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1925); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image1925); + image1956 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1956); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image1956); 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); - image1926 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1926); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image1926); + image1957 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1957); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image1957); separator37 = gtk_separator_menu_item_new (); gtk_widget_show (separator37); @@ -551,27 +551,13 @@ create_window1 (void) gtk_container_add (GTK_CONTAINER (edit1_menu), separator18); gtk_widget_set_sensitive (separator18, FALSE); - insert_include2 = gtk_image_menu_item_new_with_mnemonic (_("_Insert \"include <...>\"")); - gtk_widget_show (insert_include2); - gtk_container_add (GTK_CONTAINER (edit1_menu), insert_include2); - - image1927 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1927); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image1927); - - insert_include2_menu = gtk_menu_new (); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include2), insert_include2_menu); - - invisible4 = gtk_menu_item_new_with_mnemonic (_("invisible")); - gtk_container_add (GTK_CONTAINER (insert_include2_menu), invisible4); - add_comments1 = gtk_image_menu_item_new_with_mnemonic (_("I_nsert Comments")); gtk_widget_show (add_comments1); gtk_container_add (GTK_CONTAINER (edit1_menu), add_comments1); - image1928 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1928); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image1928); + image1958 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1958); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image1958); add_comments1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (add_comments1), add_comments1_menu); @@ -610,9 +596,9 @@ create_window1 (void) gtk_widget_show (insert_date1); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_date1); - image1929 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1929); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image1929); + image1959 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1959); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image1959); insert_date1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_date1), insert_date1_menu); @@ -620,6 +606,20 @@ create_window1 (void) invisible8 = gtk_menu_item_new_with_mnemonic (_("invisible")); gtk_container_add (GTK_CONTAINER (insert_date1_menu), invisible8); + insert_include2 = gtk_image_menu_item_new_with_mnemonic (_("_Insert \"include <...>\"")); + gtk_widget_show (insert_include2); + gtk_container_add (GTK_CONTAINER (edit1_menu), insert_include2); + + image1960 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1960); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image1960); + + insert_include2_menu = gtk_menu_new (); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include2), insert_include2_menu); + + invisible4 = gtk_menu_item_new_with_mnemonic (_("invisible")); + gtk_container_add (GTK_CONTAINER (insert_include2_menu), invisible4); + separator9 = gtk_separator_menu_item_new (); gtk_widget_show (separator9); gtk_container_add (GTK_CONTAINER (edit1_menu), separator9); @@ -656,9 +656,9 @@ create_window1 (void) gtk_widget_show (replace1); gtk_container_add (GTK_CONTAINER (search1_menu), replace1); - image1930 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1930); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image1930); + image1961 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1961); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image1961); separator33 = gtk_separator_menu_item_new (); gtk_widget_show (separator33); @@ -691,9 +691,9 @@ create_window1 (void) gtk_widget_show (go_to_line1); gtk_container_add (GTK_CONTAINER (search1_menu), go_to_line1); - image1931 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1931); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image1931); + image1962 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1962); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image1962); menu_view1 = gtk_menu_item_new_with_mnemonic (_("_View")); gtk_widget_show (menu_view1); @@ -707,9 +707,9 @@ create_window1 (void) gtk_container_add (GTK_CONTAINER (menu_view1_menu), menu_change_font1); gtk_tooltips_set_tip (tooltips, menu_change_font1, _("Change the default font"), NULL); - image1932 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1932); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image1932); + image1963 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1963); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image1963); menu_separator4 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separator4); @@ -897,25 +897,25 @@ create_window1 (void) gtk_widget_show (project_new1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_new1); - image1933 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1933); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image1933); + image1964 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1964); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image1964); 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); - image1934 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1934); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image1934); + image1965 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1965); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image1965); 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); - image1935 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1935); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image1935); + image1966 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1966); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image1966); separator34 = gtk_separator_menu_item_new (); gtk_widget_show (separator34); @@ -942,9 +942,9 @@ create_window1 (void) 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); - image1936 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1936); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image1936); + image1967 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1967); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image1967); menu_count_words1 = gtk_menu_item_new_with_mnemonic (_("_Word Count")); gtk_widget_show (menu_count_words1); @@ -962,9 +962,9 @@ create_window1 (void) gtk_widget_show (help1); gtk_container_add (GTK_CONTAINER (menu_help1_menu), help1); - image1937 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1937); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image1937); + image1968 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1968); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image1968); keyboard_shortcuts1 = gtk_menu_item_new_with_mnemonic (_("_Keyboard Shortcuts")); gtk_widget_show (keyboard_shortcuts1); @@ -1608,7 +1608,7 @@ create_window1 (void) 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, image1920, "image1920"); + GLADE_HOOKUP_OBJECT (window1, image1951, "image1951"); 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"); @@ -1619,11 +1619,11 @@ create_window1 (void) 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, image1921, "image1921"); + GLADE_HOOKUP_OBJECT (window1, image1952, "image1952"); GLADE_HOOKUP_OBJECT (window1, menu_reload1, "menu_reload1"); - GLADE_HOOKUP_OBJECT (window1, image1922, "image1922"); + GLADE_HOOKUP_OBJECT (window1, image1953, "image1953"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1, "menu_reload_as1"); - GLADE_HOOKUP_OBJECT (window1, image1923, "image1923"); + GLADE_HOOKUP_OBJECT (window1, image1954, "image1954"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1_menu, "menu_reload_as1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible7, "invisible7"); GLADE_HOOKUP_OBJECT (window1, separator21, "separator21"); @@ -1635,7 +1635,7 @@ create_window1 (void) 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, image1924, "image1924"); + GLADE_HOOKUP_OBJECT (window1, image1955, "image1955"); GLADE_HOOKUP_OBJECT (window1, menu_separatormenuitem1, "menu_separatormenuitem1"); GLADE_HOOKUP_OBJECT (window1, menu_quit1, "menu_quit1"); GLADE_HOOKUP_OBJECT (window1, edit1, "edit1"); @@ -1661,20 +1661,16 @@ create_window1 (void) 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, image1925, "image1925"); + GLADE_HOOKUP_OBJECT (window1, image1956, "image1956"); GLADE_HOOKUP_OBJECT (window1, menu_decrease_indent1, "menu_decrease_indent1"); - GLADE_HOOKUP_OBJECT (window1, image1926, "image1926"); + GLADE_HOOKUP_OBJECT (window1, image1957, "image1957"); 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, image1927, "image1927"); - 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, image1928, "image1928"); + GLADE_HOOKUP_OBJECT (window1, image1958, "image1958"); 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"); @@ -1683,9 +1679,13 @@ create_window1 (void) 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, image1929, "image1929"); + GLADE_HOOKUP_OBJECT (window1, image1959, "image1959"); GLADE_HOOKUP_OBJECT (window1, insert_date1_menu, "insert_date1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible8, "invisible8"); + GLADE_HOOKUP_OBJECT (window1, insert_include2, "insert_include2"); + GLADE_HOOKUP_OBJECT (window1, image1960, "image1960"); + GLADE_HOOKUP_OBJECT (window1, insert_include2_menu, "insert_include2_menu"); + GLADE_HOOKUP_OBJECT (window1, invisible4, "invisible4"); GLADE_HOOKUP_OBJECT (window1, separator9, "separator9"); GLADE_HOOKUP_OBJECT (window1, preferences1, "preferences1"); GLADE_HOOKUP_OBJECT (window1, search1, "search1"); @@ -1695,7 +1695,7 @@ create_window1 (void) 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, image1930, "image1930"); + GLADE_HOOKUP_OBJECT (window1, image1961, "image1961"); GLADE_HOOKUP_OBJECT (window1, separator33, "separator33"); GLADE_HOOKUP_OBJECT (window1, find_nextsel1, "find_nextsel1"); GLADE_HOOKUP_OBJECT (window1, find_prevsel1, "find_prevsel1"); @@ -1703,11 +1703,11 @@ create_window1 (void) 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, image1931, "image1931"); + GLADE_HOOKUP_OBJECT (window1, image1962, "image1962"); 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, image1932, "image1932"); + GLADE_HOOKUP_OBJECT (window1, image1963, "image1963"); 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"); @@ -1749,23 +1749,23 @@ create_window1 (void) 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, image1933, "image1933"); + GLADE_HOOKUP_OBJECT (window1, image1964, "image1964"); GLADE_HOOKUP_OBJECT (window1, project_open1, "project_open1"); - GLADE_HOOKUP_OBJECT (window1, image1934, "image1934"); + GLADE_HOOKUP_OBJECT (window1, image1965, "image1965"); GLADE_HOOKUP_OBJECT (window1, project_close1, "project_close1"); - GLADE_HOOKUP_OBJECT (window1, image1935, "image1935"); + GLADE_HOOKUP_OBJECT (window1, image1966, "image1966"); 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, image1936, "image1936"); + GLADE_HOOKUP_OBJECT (window1, image1967, "image1967"); GLADE_HOOKUP_OBJECT (window1, menu_count_words1, "menu_count_words1"); 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, image1937, "image1937"); + GLADE_HOOKUP_OBJECT (window1, image1968, "image1968"); GLADE_HOOKUP_OBJECT (window1, keyboard_shortcuts1, "keyboard_shortcuts1"); GLADE_HOOKUP_OBJECT (window1, website1, "website1"); GLADE_HOOKUP_OBJECT (window1, separator16, "separator16"); @@ -1962,20 +1962,16 @@ create_edit_menu1 (void) GtkWidget *menu_duplicate_line2; GtkWidget *separator31; GtkWidget *menu_increase_indent2; - GtkWidget *image1938; + GtkWidget *image1944; GtkWidget *menu_decrease_indent2; - GtkWidget *image1939; + GtkWidget *image1945; GtkWidget *separator38; GtkWidget *send_selection_to1; GtkWidget *send_selection_to1_menu; GtkWidget *invisible12; GtkWidget *separator17; - GtkWidget *insert_include1; - GtkWidget *image1940; - GtkWidget *insert_include1_menu; - GtkWidget *invisible3; GtkWidget *comments; - GtkWidget *image1941; + GtkWidget *image1946; GtkWidget *comments_menu; GtkWidget *add_changelog_entry2; GtkWidget *insert_file_header2; @@ -1984,18 +1980,22 @@ create_edit_menu1 (void) GtkWidget *insert_gpl_notice1; GtkWidget *insert_bsd_license_notice1; GtkWidget *insert_date2; - GtkWidget *image1942; + GtkWidget *image1947; GtkWidget *insert_date2_menu; GtkWidget *invisible10; + GtkWidget *insert_include1; + GtkWidget *image1948; + GtkWidget *insert_include1_menu; + GtkWidget *invisible3; GtkWidget *separator7; GtkWidget *find_usage1; - GtkWidget *image1943; + GtkWidget *image1949; GtkWidget *goto_tag_definition1; GtkWidget *goto_tag_declaration1; GtkWidget *context_action1; GtkWidget *separator15; GtkWidget *go_to_line; - GtkWidget *image1944; + GtkWidget *image1950; GtkAccelGroup *accel_group; GtkTooltips *tooltips; @@ -2102,17 +2102,17 @@ create_edit_menu1 (void) gtk_widget_show (menu_increase_indent2); gtk_container_add (GTK_CONTAINER (menu_format2_menu), menu_increase_indent2); - image1938 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1938); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent2), image1938); + image1944 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1944); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent2), image1944); menu_decrease_indent2 = gtk_image_menu_item_new_with_mnemonic (_("_Decrease Indent")); gtk_widget_show (menu_decrease_indent2); gtk_container_add (GTK_CONTAINER (menu_format2_menu), menu_decrease_indent2); - image1939 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1939); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent2), image1939); + image1945 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1945); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent2), image1945); separator38 = gtk_separator_menu_item_new (); gtk_widget_show (separator38); @@ -2134,27 +2134,13 @@ create_edit_menu1 (void) gtk_container_add (GTK_CONTAINER (edit_menu1), separator17); gtk_widget_set_sensitive (separator17, FALSE); - insert_include1 = gtk_image_menu_item_new_with_mnemonic (_("Insert \"include <...>\"")); - gtk_widget_show (insert_include1); - gtk_container_add (GTK_CONTAINER (edit_menu1), insert_include1); - - image1940 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1940); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include1), image1940); - - insert_include1_menu = gtk_menu_new (); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include1), insert_include1_menu); - - invisible3 = gtk_menu_item_new_with_mnemonic (_("invisible")); - gtk_container_add (GTK_CONTAINER (insert_include1_menu), invisible3); - comments = gtk_image_menu_item_new_with_mnemonic (_("Insert Comments")); gtk_widget_show (comments); gtk_container_add (GTK_CONTAINER (edit_menu1), comments); - image1941 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1941); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (comments), image1941); + image1946 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1946); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (comments), image1946); comments_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (comments), comments_menu); @@ -2193,9 +2179,9 @@ create_edit_menu1 (void) gtk_widget_show (insert_date2); gtk_container_add (GTK_CONTAINER (edit_menu1), insert_date2); - image1942 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1942); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date2), image1942); + image1947 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1947); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date2), image1947); insert_date2_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_date2), insert_date2_menu); @@ -2203,6 +2189,20 @@ create_edit_menu1 (void) invisible10 = gtk_menu_item_new_with_mnemonic (_("invisible")); gtk_container_add (GTK_CONTAINER (insert_date2_menu), invisible10); + insert_include1 = gtk_image_menu_item_new_with_mnemonic (_("Insert \"include <...>\"")); + gtk_widget_show (insert_include1); + gtk_container_add (GTK_CONTAINER (edit_menu1), insert_include1); + + image1948 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1948); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include1), image1948); + + insert_include1_menu = gtk_menu_new (); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include1), insert_include1_menu); + + invisible3 = gtk_menu_item_new_with_mnemonic (_("invisible")); + gtk_container_add (GTK_CONTAINER (insert_include1_menu), invisible3); + separator7 = gtk_separator_menu_item_new (); gtk_widget_show (separator7); gtk_container_add (GTK_CONTAINER (edit_menu1), separator7); @@ -2212,9 +2212,9 @@ create_edit_menu1 (void) gtk_widget_show (find_usage1); gtk_container_add (GTK_CONTAINER (edit_menu1), find_usage1); - image1943 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1943); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_usage1), image1943); + image1949 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1949); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_usage1), image1949); goto_tag_definition1 = gtk_menu_item_new_with_mnemonic (_("Go to Tag Definition")); gtk_widget_show (goto_tag_definition1); @@ -2238,9 +2238,9 @@ create_edit_menu1 (void) gtk_container_add (GTK_CONTAINER (edit_menu1), go_to_line); gtk_tooltips_set_tip (tooltips, go_to_line, _("Go to the entered line"), NULL); - image1944 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1944); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line), image1944); + image1950 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1950); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line), image1950); g_signal_connect ((gpointer) undo1, "activate", G_CALLBACK (on_undo1_activate), @@ -2349,20 +2349,16 @@ create_edit_menu1 (void) GLADE_HOOKUP_OBJECT (edit_menu1, menu_duplicate_line2, "menu_duplicate_line2"); GLADE_HOOKUP_OBJECT (edit_menu1, separator31, "separator31"); GLADE_HOOKUP_OBJECT (edit_menu1, menu_increase_indent2, "menu_increase_indent2"); - GLADE_HOOKUP_OBJECT (edit_menu1, image1938, "image1938"); + GLADE_HOOKUP_OBJECT (edit_menu1, image1944, "image1944"); GLADE_HOOKUP_OBJECT (edit_menu1, menu_decrease_indent2, "menu_decrease_indent2"); - GLADE_HOOKUP_OBJECT (edit_menu1, image1939, "image1939"); + GLADE_HOOKUP_OBJECT (edit_menu1, image1945, "image1945"); GLADE_HOOKUP_OBJECT (edit_menu1, separator38, "separator38"); GLADE_HOOKUP_OBJECT (edit_menu1, send_selection_to1, "send_selection_to1"); GLADE_HOOKUP_OBJECT (edit_menu1, send_selection_to1_menu, "send_selection_to1_menu"); GLADE_HOOKUP_OBJECT (edit_menu1, invisible12, "invisible12"); GLADE_HOOKUP_OBJECT (edit_menu1, separator17, "separator17"); - GLADE_HOOKUP_OBJECT (edit_menu1, insert_include1, "insert_include1"); - GLADE_HOOKUP_OBJECT (edit_menu1, image1940, "image1940"); - GLADE_HOOKUP_OBJECT (edit_menu1, insert_include1_menu, "insert_include1_menu"); - GLADE_HOOKUP_OBJECT (edit_menu1, invisible3, "invisible3"); GLADE_HOOKUP_OBJECT (edit_menu1, comments, "comments"); - GLADE_HOOKUP_OBJECT (edit_menu1, image1941, "image1941"); + GLADE_HOOKUP_OBJECT (edit_menu1, image1946, "image1946"); GLADE_HOOKUP_OBJECT (edit_menu1, comments_menu, "comments_menu"); GLADE_HOOKUP_OBJECT (edit_menu1, add_changelog_entry2, "add_changelog_entry2"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_file_header2, "insert_file_header2"); @@ -2371,18 +2367,22 @@ create_edit_menu1 (void) GLADE_HOOKUP_OBJECT (edit_menu1, insert_gpl_notice1, "insert_gpl_notice1"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_bsd_license_notice1, "insert_bsd_license_notice1"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_date2, "insert_date2"); - GLADE_HOOKUP_OBJECT (edit_menu1, image1942, "image1942"); + GLADE_HOOKUP_OBJECT (edit_menu1, image1947, "image1947"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_date2_menu, "insert_date2_menu"); GLADE_HOOKUP_OBJECT (edit_menu1, invisible10, "invisible10"); + GLADE_HOOKUP_OBJECT (edit_menu1, insert_include1, "insert_include1"); + GLADE_HOOKUP_OBJECT (edit_menu1, image1948, "image1948"); + GLADE_HOOKUP_OBJECT (edit_menu1, insert_include1_menu, "insert_include1_menu"); + GLADE_HOOKUP_OBJECT (edit_menu1, invisible3, "invisible3"); GLADE_HOOKUP_OBJECT (edit_menu1, separator7, "separator7"); GLADE_HOOKUP_OBJECT (edit_menu1, find_usage1, "find_usage1"); - GLADE_HOOKUP_OBJECT (edit_menu1, image1943, "image1943"); + GLADE_HOOKUP_OBJECT (edit_menu1, image1949, "image1949"); GLADE_HOOKUP_OBJECT (edit_menu1, goto_tag_definition1, "goto_tag_definition1"); GLADE_HOOKUP_OBJECT (edit_menu1, goto_tag_declaration1, "goto_tag_declaration1"); GLADE_HOOKUP_OBJECT (edit_menu1, context_action1, "context_action1"); GLADE_HOOKUP_OBJECT (edit_menu1, separator15, "separator15"); GLADE_HOOKUP_OBJECT (edit_menu1, go_to_line, "go_to_line"); - GLADE_HOOKUP_OBJECT (edit_menu1, image1944, "image1944"); + GLADE_HOOKUP_OBJECT (edit_menu1, image1950, "image1950"); GLADE_HOOKUP_OBJECT_NO_REF (edit_menu1, tooltips, "tooltips"); gtk_menu_set_accel_group (GTK_MENU (edit_menu1), accel_group);