SF.net SVN: geany: [2432] trunk - Commits

1 Apr 2008

Revision: 2432
          http://geany.svn.sourceforge.net/geany/?rev=2432&view=rev
Author:   ntrel
Date:     2008-04-01 05:01:49 -0700 (Tue, 01 Apr 2008)
Log Message:
-----------
Move Load Tags item from File to Tools menu.
Capitalize Page Setup item.
Add separator before Plugin Manager item.
Modified Paths:
--------------
    trunk/ChangeLog
    trunk/geany.glade
    trunk/src/interface.c
    trunk/src/plugins.c
Modified: trunk/ChangeLog
===================================================================

--- trunk/ChangeLog	2008-03-31 16:07:06 UTC (rev 2431)
+++ trunk/ChangeLog	2008-04-01 12:01:49 UTC (rev 2432)
@@ -1,3 +1,11 @@
+2008-04-01  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/interface.c, src/plugins.c, geany.glade:
+   Move Load Tags item from File to Tools menu.
+   Capitalize Page Setup item.
+   Add separator before Plugin Manager item.
+
+
 2008-03-31  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
* src/build.c, src/interface.c, src/vte.c, plugins/export.c,
Modified: trunk/geany.glade
===================================================================
--- trunk/geany.glade	2008-03-31 16:07:06 UTC (rev 2431)
+++ trunk/geany.glade	2008-04-01 12:01:49 UTC (rev 2432)
@@ -58,7 +58,7 @@
    	      <property name="use_underline">True</property>
<child internal-child="image">
-			<widget class="GtkImage" id="image2316">
+			<widget class="GtkImage" id="image2333">
    		  <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="image2317">
+			<widget class="GtkImage" id="image2334">
    		  <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="image2318">
+			<widget class="GtkImage" id="image2335">
    		  <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="image2319">
+			<widget class="GtkImage" id="image2336">
    		  <property name="visible">True</property>
    		  <property name="stock">gtk-revert-to-saved</property>
    		  <property name="icon_size">1</property>
@@ -221,22 +221,6 @@
    	  </child>
<child>
-		    <widget class="GtkMenuItem" id="load_tags1">
-		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes">Load global tags file</property>
-		      <property name="label" translatable="yes">Load Ta_gs</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_load_tags1_activate" last_modification_time="Sun, 15 Apr 2007 15:24:55 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkSeparatorMenuItem" id="separator39">
-		      <property name="visible">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
    	    <widget class="GtkImageMenuItem" id="preferences2">
    	      <property name="visible">True</property>
    	      <property name="label">gtk-properties</property>
@@ -254,7 +238,7 @@
    	  <child>
    	    <widget class="GtkMenuItem" id="page_setup1">
    	      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Page set_up</property>
+		      <property name="label" translatable="yes">Page Set_up</property>
    	      <property name="use_underline">True</property>
    	      <signal name="activate" handler="on_page_setup1_activate" last_modification_time="Thu, 15 Nov 2007 21:11:31 GMT"/>
    	    </widget>
@@ -294,7 +278,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="image2320">
+			<widget class="GtkImage" id="image2337">
    		  <property name="visible">True</property>
    		  <property name="stock">gtk-close</property>
    		  <property name="icon_size">1</property>
@@ -493,7 +477,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="image2321">
+				<widget class="GtkImage" id="image2338">
    			  <property name="visible">True</property>
    			  <property name="stock">gtk-indent</property>
    			  <property name="icon_size">1</property>
@@ -514,7 +498,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="image2322">
+				<widget class="GtkImage" id="image2339">
    			  <property name="visible">True</property>
    			  <property name="stock">gtk-unindent</property>
    			  <property name="icon_size">1</property>
@@ -570,7 +554,7 @@
    	      <property name="use_underline">True</property>
<child internal-child="image">
-			<widget class="GtkImage" id="image2323">
+			<widget class="GtkImage" id="image2340">
    		  <property name="visible">True</property>
    		  <property name="stock">gtk-add</property>
    		  <property name="icon_size">1</property>
@@ -655,7 +639,7 @@
    	      <property name="use_underline">True</property>
<child internal-child="image">
-			<widget class="GtkImage" id="image2324">
+			<widget class="GtkImage" id="image2341">
    		  <property name="visible">True</property>
    		  <property name="stock">gtk-add</property>
    		  <property name="icon_size">1</property>
@@ -687,7 +671,7 @@
    	      <property name="use_underline">True</property>
<child internal-child="image">
-			<widget class="GtkImage" id="image2325">
+			<widget class="GtkImage" id="image2342">
    		  <property name="visible">True</property>
    		  <property name="stock">gtk-add</property>
    		  <property name="icon_size">1</property>
@@ -784,7 +768,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="image2326">
+			<widget class="GtkImage" id="image2343">
    		  <property name="visible">True</property>
    		  <property name="stock">gtk-find-and-replace</property>
    		  <property name="icon_size">1</property>
@@ -850,7 +834,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="image2327">
+			<widget class="GtkImage" id="image2344">
    		  <property name="visible">True</property>
    		  <property name="stock">gtk-jump-to</property>
    		  <property name="icon_size">1</property>
@@ -885,7 +869,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="image2328">
+			<widget class="GtkImage" id="image2345">
    		  <property name="visible">True</property>
    		  <property name="stock">gtk-select-font</property>
    		  <property name="icon_size">1</property>
@@ -1294,7 +1278,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="image2329">
+			<widget class="GtkImage" id="image2346">
    		  <property name="visible">True</property>
    		  <property name="stock">gtk-new</property>
    		  <property name="icon_size">1</property>
@@ -1315,7 +1299,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="image2330">
+			<widget class="GtkImage" id="image2347">
    		  <property name="visible">True</property>
    		  <property name="stock">gtk-open</property>
    		  <property name="icon_size">1</property>
@@ -1336,7 +1320,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="image2331">
+			<widget class="GtkImage" id="image2348">
    		  <property name="visible">True</property>
    		  <property name="stock">gtk-close</property>
    		  <property name="icon_size">1</property>
@@ -1395,7 +1379,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="image2332">
+			<widget class="GtkImage" id="image2349">
    		  <property name="visible">True</property>
    		  <property name="stock">gtk-select-color</property>
    		  <property name="icon_size">1</property>
@@ -1417,6 +1401,16 @@
    	      <signal name="activate" handler="on_count_words1_activate" last_modification_time="Mon, 06 Jun 2005 11:49:24 GMT"/>
    	    </widget>
    	  </child>
+
+		  <child>
+		    <widget class="GtkMenuItem" id="load_tags1">
+		      <property name="visible">True</property>
+		      <property name="tooltip" translatable="yes">Load global tags file</property>
+		      <property name="label" translatable="yes">Load Ta_gs</property>
+		      <property name="use_underline">True</property>
+		      <signal name="activate" handler="on_load_tags1_activate" last_modification_time="Sun, 15 Apr 2007 15:24:55 GMT"/>
+		    </widget>
+		  </child>
    	</widget>
          </child>
        </widget>
@@ -1439,7 +1433,7 @@
    	      <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="image2333">
+			<widget class="GtkImage" id="image2350">
    		  <property name="visible">True</property>
    		  <property name="stock">gtk-help</property>
    		  <property name="icon_size">1</property>
Modified: trunk/src/interface.c
===================================================================
--- trunk/src/interface.c	2008-03-31 16:07:06 UTC (rev 2431)
+++ trunk/src/interface.c	2008-04-01 12:01:49 UTC (rev 2432)
@@ -37,7 +37,7 @@
   GtkWidget *file1_menu;
   GtkWidget *menu_new1;
   GtkWidget *menu_new_with_template1;
-  GtkWidget *image2316;
+  GtkWidget *image2333;
   GtkWidget *menu_new_with_template1_menu;
   GtkWidget *invisible2;
   GtkWidget *separator12;
@@ -48,16 +48,14 @@
   GtkWidget *menu_save1;
   GtkWidget *menu_save_as1;
   GtkWidget *menu_save_all1;
-  GtkWidget *image2317;
+  GtkWidget *image2334;
   GtkWidget *menu_reload1;
-  GtkWidget *image2318;
+  GtkWidget *image2335;
   GtkWidget *menu_reload_as1;
-  GtkWidget *image2319;
+  GtkWidget *image2336;
   GtkWidget *menu_reload_as1_menu;
   GtkWidget *invisible7;
   GtkWidget *separator21;
-  GtkWidget *load_tags1;
-  GtkWidget *separator39;
   GtkWidget *preferences2;
   GtkWidget *separator24;
   GtkWidget *page_setup1;
@@ -65,7 +63,7 @@
   GtkWidget *separator14;
   GtkWidget *menu_close1;
   GtkWidget *menu_close_all1;
-  GtkWidget *image2320;
+  GtkWidget *image2337;
   GtkWidget *menu_separatormenuitem1;
   GtkWidget *menu_quit1;
   GtkWidget *edit1;
@@ -90,16 +88,16 @@
   GtkWidget *menu_duplicate_line1;
   GtkWidget *separator29;
   GtkWidget *menu_increase_indent1;
-  GtkWidget *image2321;
+  GtkWidget *image2338;
   GtkWidget *menu_decrease_indent1;
-  GtkWidget *image2322;
+  GtkWidget *image2339;
   GtkWidget *separator37;
   GtkWidget *send_selection_to2;
   GtkWidget *send_selection_to2_menu;
   GtkWidget *invisible13;
   GtkWidget *separator18;
   GtkWidget *add_comments1;
-  GtkWidget *image2323;
+  GtkWidget *image2340;
   GtkWidget *add_comments1_menu;
   GtkWidget *menu_add_changelog_entry1;
   GtkWidget *insert_file_header1;
@@ -108,11 +106,11 @@
   GtkWidget *insert_gpl_notice2;
   GtkWidget *insert_bsd_license_notice2;
   GtkWidget *insert_date1;
-  GtkWidget *image2324;
+  GtkWidget *image2341;
   GtkWidget *insert_date1_menu;
   GtkWidget *invisible8;
   GtkWidget *insert_include2;
-  GtkWidget *image2325;
+  GtkWidget *image2342;
   GtkWidget *insert_include2_menu;
   GtkWidget *invisible4;
   GtkWidget *separator9;
@@ -124,7 +122,7 @@
   GtkWidget *find_previous1;
   GtkWidget *find_in_files1;
   GtkWidget *replace1;
-  GtkWidget *image2326;
+  GtkWidget *image2343;
   GtkWidget *separator33;
   GtkWidget *find_nextsel1;
   GtkWidget *find_prevsel1;
@@ -132,11 +130,11 @@
   GtkWidget *next_message1;
   GtkWidget *separator32;
   GtkWidget *go_to_line1;
-  GtkWidget *image2327;
+  GtkWidget *image2344;
   GtkWidget *menu_view1;
   GtkWidget *menu_view1_menu;
   GtkWidget *menu_change_font1;
-  GtkWidget *image2328;
+  GtkWidget *image2345;
   GtkWidget *menu_separator4;
   GtkWidget *menu_toggle_all_additional_widgets1;
   GtkWidget *menu_fullscreen1;
@@ -186,23 +184,24 @@
   GtkWidget *menu_project1;
   GtkWidget *menu_project1_menu;
   GtkWidget *project_new1;
-  GtkWidget *image2329;
+  GtkWidget *image2346;
   GtkWidget *project_open1;
-  GtkWidget *image2330;
+  GtkWidget *image2347;
   GtkWidget *project_close1;
-  GtkWidget *image2331;
+  GtkWidget *image2348;
   GtkWidget *separator34;
   GtkWidget *project_properties1;
   GtkWidget *menu_build1;
   GtkWidget *tools1;
   GtkWidget *tools1_menu;
   GtkWidget *menu_choose_color1;
-  GtkWidget *image2332;
+  GtkWidget *image2349;
   GtkWidget *menu_count_words1;
+  GtkWidget *load_tags1;
   GtkWidget *menu_help1;
   GtkWidget *menu_help1_menu;
   GtkWidget *help1;
-  GtkWidget *image2333;
+  GtkWidget *image2350;
   GtkWidget *keyboard_shortcuts1;
   GtkWidget *website1;
   GtkWidget *separator16;
@@ -305,9 +304,9 @@
   gtk_widget_show (menu_new_with_template1);
   gtk_container_add (GTK_CONTAINER (file1_menu), menu_new_with_template1);
-  image2316 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2316);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image2316);
+  image2333 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2333);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image2333);
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);
@@ -350,25 +349,25 @@
   gtk_container_add (GTK_CONTAINER (file1_menu), menu_save_all1);
   gtk_tooltips_set_tip (tooltips, menu_save_all1, _("Saves all open files"), NULL);
-  image2317 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2317);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image2317);
+  image2334 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2334);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image2334);
menu_reload1 = gtk_image_menu_item_new_with_mnemonic (_("_Reload"));
   gtk_widget_show (menu_reload1);
   gtk_container_add (GTK_CONTAINER (file1_menu), menu_reload1);
-  image2318 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2318);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image2318);
+  image2335 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2335);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image2335);
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);
-  image2319 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2319);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image2319);
+  image2336 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2336);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image2336);
menu_reload_as1_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_reload_as1), menu_reload_as1_menu);
@@ -381,16 +380,6 @@
   gtk_container_add (GTK_CONTAINER (file1_menu), separator21);
   gtk_widget_set_sensitive (separator21, FALSE);
-  load_tags1 = gtk_menu_item_new_with_mnemonic (_("Load Ta_gs"));
-  gtk_widget_show (load_tags1);
-  gtk_container_add (GTK_CONTAINER (file1_menu), load_tags1);
-  gtk_tooltips_set_tip (tooltips, load_tags1, _("Load global tags file"), NULL);
-
-  separator39 = gtk_separator_menu_item_new ();
-  gtk_widget_show (separator39);
-  gtk_container_add (GTK_CONTAINER (file1_menu), separator39);
-  gtk_widget_set_sensitive (separator39, FALSE);
-
   preferences2 = gtk_image_menu_item_new_from_stock ("gtk-properties", accel_group);
   gtk_widget_show (preferences2);
   gtk_container_add (GTK_CONTAINER (file1_menu), preferences2);
@@ -400,7 +389,7 @@
   gtk_container_add (GTK_CONTAINER (file1_menu), separator24);
   gtk_widget_set_sensitive (separator24, FALSE);
-  page_setup1 = gtk_menu_item_new_with_mnemonic (_("Page set_up"));
+  page_setup1 = gtk_menu_item_new_with_mnemonic (_("Page Set_up"));
   gtk_widget_show (page_setup1);
   gtk_container_add (GTK_CONTAINER (file1_menu), page_setup1);
@@ -423,9 +412,9 @@
   gtk_container_add (GTK_CONTAINER (file1_menu), menu_close_all1);
   gtk_tooltips_set_tip (tooltips, menu_close_all1, _("Closes all open files"), NULL);
-  image2320 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2320);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image2320);
+  image2337 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2337);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image2337);
menu_separatormenuitem1 = gtk_separator_menu_item_new ();
   gtk_widget_show (menu_separatormenuitem1);
@@ -529,17 +518,17 @@
   gtk_widget_show (menu_increase_indent1);
   gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_increase_indent1);
-  image2321 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2321);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image2321);
+  image2338 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2338);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image2338);
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);
-  image2322 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2322);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image2322);
+  image2339 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2339);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image2339);
separator37 = gtk_separator_menu_item_new ();
   gtk_widget_show (separator37);
@@ -565,9 +554,9 @@
   gtk_widget_show (add_comments1);
   gtk_container_add (GTK_CONTAINER (edit1_menu), add_comments1);
-  image2323 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2323);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image2323);
+  image2340 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2340);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image2340);
add_comments1_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (add_comments1), add_comments1_menu);
@@ -606,9 +595,9 @@
   gtk_widget_show (insert_date1);
   gtk_container_add (GTK_CONTAINER (edit1_menu), insert_date1);
-  image2324 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2324);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image2324);
+  image2341 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2341);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image2341);
insert_date1_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_date1), insert_date1_menu);
@@ -620,9 +609,9 @@
   gtk_widget_show (insert_include2);
   gtk_container_add (GTK_CONTAINER (edit1_menu), insert_include2);
-  image2325 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2325);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image2325);
+  image2342 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2342);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image2342);
insert_include2_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include2), insert_include2_menu);
@@ -666,9 +655,9 @@
   gtk_widget_show (replace1);
   gtk_container_add (GTK_CONTAINER (search1_menu), replace1);
-  image2326 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2326);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image2326);
+  image2343 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2343);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image2343);
separator33 = gtk_separator_menu_item_new ();
   gtk_widget_show (separator33);
@@ -701,9 +690,9 @@
   gtk_widget_show (go_to_line1);
   gtk_container_add (GTK_CONTAINER (search1_menu), go_to_line1);
-  image2327 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2327);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image2327);
+  image2344 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2344);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image2344);
menu_view1 = gtk_menu_item_new_with_mnemonic (_("_View"));
   gtk_widget_show (menu_view1);
@@ -717,9 +706,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);
-  image2328 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2328);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image2328);
+  image2345 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2345);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image2345);
menu_separator4 = gtk_separator_menu_item_new ();
   gtk_widget_show (menu_separator4);
@@ -935,25 +924,25 @@
   gtk_widget_show (project_new1);
   gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_new1);
-  image2329 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2329);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image2329);
+  image2346 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2346);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image2346);
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);
-  image2330 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2330);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image2330);
+  image2347 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2347);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image2347);
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);
-  image2331 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2331);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image2331);
+  image2348 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2348);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image2348);
separator34 = gtk_separator_menu_item_new ();
   gtk_widget_show (separator34);
@@ -980,15 +969,20 @@
   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);
-  image2332 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2332);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image2332);
+  image2349 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2349);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image2349);
menu_count_words1 = gtk_menu_item_new_with_mnemonic (_("_Word Count"));
   gtk_widget_show (menu_count_words1);
   gtk_container_add (GTK_CONTAINER (tools1_menu), menu_count_words1);
   gtk_tooltips_set_tip (tooltips, menu_count_words1, _("Counts the words and characters in the current selection or the whole document"), NULL);
+  load_tags1 = gtk_menu_item_new_with_mnemonic (_("Load Ta_gs"));
+  gtk_widget_show (load_tags1);
+  gtk_container_add (GTK_CONTAINER (tools1_menu), load_tags1);
+  gtk_tooltips_set_tip (tooltips, load_tags1, _("Load global tags file"), NULL);
+
   menu_help1 = gtk_menu_item_new_with_mnemonic (_("_Help"));
   gtk_widget_show (menu_help1);
   gtk_container_add (GTK_CONTAINER (menubar1), menu_help1);
@@ -1000,9 +994,9 @@
   gtk_widget_show (help1);
   gtk_container_add (GTK_CONTAINER (menu_help1_menu), help1);
-  image2333 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2333);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image2333);
+  image2350 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2350);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image2350);
keyboard_shortcuts1 = gtk_menu_item_new_with_mnemonic (_("_Keyboard Shortcuts"));
   gtk_widget_show (keyboard_shortcuts1);
@@ -1356,9 +1350,6 @@
   g_signal_connect ((gpointer) menu_reload1, "activate",
                     G_CALLBACK (on_toolbutton23_clicked),
                     NULL);
-  g_signal_connect ((gpointer) load_tags1, "activate",
-                    G_CALLBACK (on_load_tags1_activate),
-                    NULL);
   g_signal_connect ((gpointer) preferences2, "activate",
                     G_CALLBACK (on_file_properties_activate),
                     NULL);
@@ -1572,6 +1563,9 @@
   g_signal_connect ((gpointer) menu_count_words1, "activate",
                     G_CALLBACK (on_count_words1_activate),
                     NULL);
+  g_signal_connect ((gpointer) load_tags1, "activate",
+                    G_CALLBACK (on_load_tags1_activate),
+                    NULL);
   g_signal_connect ((gpointer) help1, "activate",
                     G_CALLBACK (on_help1_activate),
                     NULL);
@@ -1684,7 +1678,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, image2316, "image2316");
+  GLADE_HOOKUP_OBJECT (window1, image2333, "image2333");
   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");
@@ -1695,16 +1689,14 @@
   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, image2317, "image2317");
+  GLADE_HOOKUP_OBJECT (window1, image2334, "image2334");
   GLADE_HOOKUP_OBJECT (window1, menu_reload1, "menu_reload1");
-  GLADE_HOOKUP_OBJECT (window1, image2318, "image2318");
+  GLADE_HOOKUP_OBJECT (window1, image2335, "image2335");
   GLADE_HOOKUP_OBJECT (window1, menu_reload_as1, "menu_reload_as1");
-  GLADE_HOOKUP_OBJECT (window1, image2319, "image2319");
+  GLADE_HOOKUP_OBJECT (window1, image2336, "image2336");
   GLADE_HOOKUP_OBJECT (window1, menu_reload_as1_menu, "menu_reload_as1_menu");
   GLADE_HOOKUP_OBJECT (window1, invisible7, "invisible7");
   GLADE_HOOKUP_OBJECT (window1, separator21, "separator21");
-  GLADE_HOOKUP_OBJECT (window1, load_tags1, "load_tags1");
-  GLADE_HOOKUP_OBJECT (window1, separator39, "separator39");
   GLADE_HOOKUP_OBJECT (window1, preferences2, "preferences2");
   GLADE_HOOKUP_OBJECT (window1, separator24, "separator24");
   GLADE_HOOKUP_OBJECT (window1, page_setup1, "page_setup1");
@@ -1712,7 +1704,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, image2320, "image2320");
+  GLADE_HOOKUP_OBJECT (window1, image2337, "image2337");
   GLADE_HOOKUP_OBJECT (window1, menu_separatormenuitem1, "menu_separatormenuitem1");
   GLADE_HOOKUP_OBJECT (window1, menu_quit1, "menu_quit1");
   GLADE_HOOKUP_OBJECT (window1, edit1, "edit1");
@@ -1737,16 +1729,16 @@
   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, image2321, "image2321");
+  GLADE_HOOKUP_OBJECT (window1, image2338, "image2338");
   GLADE_HOOKUP_OBJECT (window1, menu_decrease_indent1, "menu_decrease_indent1");
-  GLADE_HOOKUP_OBJECT (window1, image2322, "image2322");
+  GLADE_HOOKUP_OBJECT (window1, image2339, "image2339");
   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, add_comments1, "add_comments1");
-  GLADE_HOOKUP_OBJECT (window1, image2323, "image2323");
+  GLADE_HOOKUP_OBJECT (window1, image2340, "image2340");
   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");
@@ -1755,11 +1747,11 @@
   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, image2324, "image2324");
+  GLADE_HOOKUP_OBJECT (window1, image2341, "image2341");
   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, image2325, "image2325");
+  GLADE_HOOKUP_OBJECT (window1, image2342, "image2342");
   GLADE_HOOKUP_OBJECT (window1, insert_include2_menu, "insert_include2_menu");
   GLADE_HOOKUP_OBJECT (window1, invisible4, "invisible4");
   GLADE_HOOKUP_OBJECT (window1, separator9, "separator9");
@@ -1771,7 +1763,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, image2326, "image2326");
+  GLADE_HOOKUP_OBJECT (window1, image2343, "image2343");
   GLADE_HOOKUP_OBJECT (window1, separator33, "separator33");
   GLADE_HOOKUP_OBJECT (window1, find_nextsel1, "find_nextsel1");
   GLADE_HOOKUP_OBJECT (window1, find_prevsel1, "find_prevsel1");
@@ -1779,11 +1771,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, image2327, "image2327");
+  GLADE_HOOKUP_OBJECT (window1, image2344, "image2344");
   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, image2328, "image2328");
+  GLADE_HOOKUP_OBJECT (window1, image2345, "image2345");
   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");
@@ -1831,23 +1823,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, image2329, "image2329");
+  GLADE_HOOKUP_OBJECT (window1, image2346, "image2346");
   GLADE_HOOKUP_OBJECT (window1, project_open1, "project_open1");
-  GLADE_HOOKUP_OBJECT (window1, image2330, "image2330");
+  GLADE_HOOKUP_OBJECT (window1, image2347, "image2347");
   GLADE_HOOKUP_OBJECT (window1, project_close1, "project_close1");
-  GLADE_HOOKUP_OBJECT (window1, image2331, "image2331");
+  GLADE_HOOKUP_OBJECT (window1, image2348, "image2348");
   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, image2332, "image2332");
+  GLADE_HOOKUP_OBJECT (window1, image2349, "image2349");
   GLADE_HOOKUP_OBJECT (window1, menu_count_words1, "menu_count_words1");
+  GLADE_HOOKUP_OBJECT (window1, load_tags1, "load_tags1");
   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, image2333, "image2333");
+  GLADE_HOOKUP_OBJECT (window1, image2350, "image2350");
   GLADE_HOOKUP_OBJECT (window1, keyboard_shortcuts1, "keyboard_shortcuts1");
   GLADE_HOOKUP_OBJECT (window1, website1, "website1");
   GLADE_HOOKUP_OBJECT (window1, separator16, "separator16");
Modified: trunk/src/plugins.c
===================================================================
--- trunk/src/plugins.c	2008-03-31 16:07:06 UTC (rev 2431)
+++ trunk/src/plugins.c	2008-04-01 12:01:49 UTC (rev 2432)
@@ -670,6 +670,10 @@
    geany_data_init();
    geany_object = geany_object_new();
+	widget = gtk_separator_menu_item_new();
+	gtk_widget_show(widget);
+	gtk_container_add(GTK_CONTAINER(geany_data.tools_menu), widget);
+
    widget = gtk_menu_item_new_with_mnemonic(_("_Plugin Manager"));
    gtk_container_add(GTK_CONTAINER (geany_data.tools_menu), widget);
    gtk_widget_show(widget);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

    