SF.net SVN: geany:[5250] trunk

ntrel at users.sourceforge.net ntrel at xxxxx
Tue Sep 21 17:48:42 UTC 2010


Revision: 5250
          http://geany.svn.sourceforge.net/geany/?rev=5250&view=rev
Author:   ntrel
Date:     2010-09-21 17:48:42 +0000 (Tue, 21 Sep 2010)

Log Message:
-----------
Group editor popup Insert commands in a submenu, with extra items
for the most commonly used Insert Comments commands.
Show Edit->Commands before Format in menubar Edit menu (to match
keybindings order).
Show Open Selected F_ile popup item below submenus.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-09-21 16:40:29 UTC (rev 5249)
+++ trunk/ChangeLog	2010-09-21 17:48:42 UTC (rev 5250)
@@ -12,6 +12,12 @@
    Add docs for Find Selection keybindings.
  * src/interface.c, src/keybindings.c, geany.glade:
    Unify Find Selection strings.
+ * src/interface.c, src/ui_utils.c, geany.glade:
+   Group editor popup Insert commands in a submenu, with extra items
+   for the most commonly used Insert Comments commands.
+   Show Edit->Commands before Format in menubar Edit menu (to match
+   keybindings order).
+   Show Open Selected F_ile popup item below submenus.
 
 
 2010-09-20  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/geany.glade
===================================================================
--- trunk/geany.glade	2010-09-21 16:40:29 UTC (rev 5249)
+++ trunk/geany.glade	2010-09-21 17:48:42 UTC (rev 5250)
@@ -67,7 +67,7 @@
 			  <property name="use_underline">True</property>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image3650">
+			    <widget class="GtkImage" id="image3704">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-new</property>
 			      <property name="icon_size">1</property>
@@ -144,7 +144,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="image3651">
+			    <widget class="GtkImage" id="image3705">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-save</property>
 			      <property name="icon_size">1</property>
@@ -165,7 +165,7 @@
 			  <signal name="activate" handler="on_toolbutton_reload_clicked" last_modification_time="Mon, 01 Sep 2008 16:57:06 GMT"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image3652">
+			    <widget class="GtkImage" id="image3706">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-revert-to-saved</property>
 			      <property name="icon_size">1</property>
@@ -185,7 +185,7 @@
 			  <property name="use_underline">True</property>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image3653">
+			    <widget class="GtkImage" id="image3707">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-revert-to-saved</property>
 			      <property name="icon_size">1</property>
@@ -272,7 +272,7 @@
 			  <signal name="activate" handler="on_close_other_documents1_activate" last_modification_time="Fri, 27 Jun 2008 15:19:28 GMT"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image3654">
+			    <widget class="GtkImage" id="image3708">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-close</property>
 			      <property name="icon_size">1</property>
@@ -293,7 +293,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="image3655">
+			    <widget class="GtkImage" id="image3709">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-close</property>
 			      <property name="icon_size">1</property>
@@ -417,6 +417,133 @@
 		      </child>
 
 		      <child>
+			<widget class="GtkMenuItem" id="commands2">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">_Commands</property>
+			  <property name="use_underline">True</property>
+
+			  <child>
+			    <widget class="GtkMenu" id="commands2_menu">
+
+			      <child>
+				<widget class="GtkImageMenuItem" id="cut_current_line(s)1">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">_Cut Current Line(s)</property>
+				  <property name="use_underline">True</property>
+				  <signal name="activate" handler="on_cut_current_line(s)1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/>
+
+				  <child internal-child="image">
+				    <widget class="GtkImage" id="image3710">
+				      <property name="visible">True</property>
+				      <property name="stock">gtk-cut</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>
+
+			      <child>
+				<widget class="GtkImageMenuItem" id="copy_current_line(s)1">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">_Copy Current Line(s)</property>
+				  <property name="use_underline">True</property>
+				  <signal name="activate" handler="on_copy_current_line(s)1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/>
+
+				  <child internal-child="image">
+				    <widget class="GtkImage" id="image3711">
+				      <property name="visible">True</property>
+				      <property name="stock">gtk-copy</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>
+
+			      <child>
+				<widget class="GtkMenuItem" id="delete_current_line(s)1">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">_Delete Current Line(s)</property>
+				  <property name="use_underline">True</property>
+				  <signal name="activate" handler="on_delete_current_line(s)1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/>
+				</widget>
+			      </child>
+
+			      <child>
+				<widget class="GtkMenuItem" id="duplicate_line_or_selection1">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">_Duplicate Line or Selection</property>
+				  <property name="use_underline">True</property>
+				  <signal name="activate" handler="on_duplicate_line_or_selection1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/>
+				</widget>
+			      </child>
+
+			      <child>
+				<widget class="GtkSeparatorMenuItem" id="separator49">
+				  <property name="visible">True</property>
+				</widget>
+			      </child>
+
+			      <child>
+				<widget class="GtkMenuItem" id="select_current_line(s)1">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">_Select Current Line(s)</property>
+				  <property name="use_underline">True</property>
+				  <signal name="activate" handler="on_select_current_line(s)1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/>
+				</widget>
+			      </child>
+
+			      <child>
+				<widget class="GtkMenuItem" id="select_current_paragraph1">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">_Select Current Paragraph</property>
+				  <property name="use_underline">True</property>
+				  <signal name="activate" handler="on_select_current_paragraph1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/>
+				</widget>
+			      </child>
+
+			      <child>
+				<widget class="GtkSeparatorMenuItem" id="separator50">
+				  <property name="visible">True</property>
+				</widget>
+			      </child>
+
+			      <child>
+				<widget class="GtkMenuItem" id="insert_alternative_white_space1">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">_Insert Alternative White Space</property>
+				  <property name="use_underline">True</property>
+				  <signal name="activate" handler="on_insert_alternative_white_space1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/>
+				</widget>
+			      </child>
+
+			      <child>
+				<widget class="GtkSeparatorMenuItem" id="separator52">
+				  <property name="visible">True</property>
+				</widget>
+			      </child>
+
+			      <child>
+				<widget class="GtkMenuItem" id="send_selection_to_vte1">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">_Send Selection to Terminal</property>
+				  <property name="use_underline">True</property>
+				  <signal name="activate" handler="on_send_selection_to_vte1_activate" last_modification_time="Wed, 25 Feb 2009 17:51:35 GMT"/>
+				</widget>
+			      </child>
+			    </widget>
+			  </child>
+			</widget>
+		      </child>
+
+		      <child>
 			<widget class="GtkMenuItem" id="menu_format1">
 			  <property name="visible">True</property>
 			  <property name="label" translatable="yes">_Format</property>
@@ -499,7 +626,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="image3656">
+				    <widget class="GtkImage" id="image3712">
 				      <property name="visible">True</property>
 				      <property name="stock">gtk-indent</property>
 				      <property name="icon_size">1</property>
@@ -520,7 +647,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="image3657">
+				    <widget class="GtkImage" id="image3713">
 				      <property name="visible">True</property>
 				      <property name="stock">gtk-unindent</property>
 				      <property name="icon_size">1</property>
@@ -573,133 +700,6 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkMenuItem" id="commands2">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Commands</property>
-			  <property name="use_underline">True</property>
-
-			  <child>
-			    <widget class="GtkMenu" id="commands2_menu">
-
-			      <child>
-				<widget class="GtkImageMenuItem" id="cut_current_line(s)1">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">_Cut Current Line(s)</property>
-				  <property name="use_underline">True</property>
-				  <signal name="activate" handler="on_cut_current_line(s)1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/>
-
-				  <child internal-child="image">
-				    <widget class="GtkImage" id="image3658">
-				      <property name="visible">True</property>
-				      <property name="stock">gtk-cut</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>
-
-			      <child>
-				<widget class="GtkImageMenuItem" id="copy_current_line(s)1">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">_Copy Current Line(s)</property>
-				  <property name="use_underline">True</property>
-				  <signal name="activate" handler="on_copy_current_line(s)1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/>
-
-				  <child internal-child="image">
-				    <widget class="GtkImage" id="image3659">
-				      <property name="visible">True</property>
-				      <property name="stock">gtk-copy</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>
-
-			      <child>
-				<widget class="GtkMenuItem" id="delete_current_line(s)1">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">_Delete Current Line(s)</property>
-				  <property name="use_underline">True</property>
-				  <signal name="activate" handler="on_delete_current_line(s)1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkMenuItem" id="duplicate_line_or_selection1">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">_Duplicate Line or Selection</property>
-				  <property name="use_underline">True</property>
-				  <signal name="activate" handler="on_duplicate_line_or_selection1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkSeparatorMenuItem" id="separator49">
-				  <property name="visible">True</property>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkMenuItem" id="select_current_line(s)1">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">_Select Current Line(s)</property>
-				  <property name="use_underline">True</property>
-				  <signal name="activate" handler="on_select_current_line(s)1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkMenuItem" id="select_current_paragraph1">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">_Select Current Paragraph</property>
-				  <property name="use_underline">True</property>
-				  <signal name="activate" handler="on_select_current_paragraph1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkSeparatorMenuItem" id="separator50">
-				  <property name="visible">True</property>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkMenuItem" id="insert_alternative_white_space1">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">_Insert Alternative White Space</property>
-				  <property name="use_underline">True</property>
-				  <signal name="activate" handler="on_insert_alternative_white_space1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkSeparatorMenuItem" id="separator52">
-				  <property name="visible">True</property>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkMenuItem" id="send_selection_to_vte1">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">_Send Selection to Terminal</property>
-				  <property name="use_underline">True</property>
-				  <signal name="activate" handler="on_send_selection_to_vte1_activate" last_modification_time="Wed, 25 Feb 2009 17:51:35 GMT"/>
-				</widget>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-
-		      <child>
 			<widget class="GtkSeparatorMenuItem" id="separator18">
 			  <property name="visible">True</property>
 			</widget>
@@ -712,7 +712,7 @@
 			  <property name="use_underline">True</property>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image3660">
+			    <widget class="GtkImage" id="image3714">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-add</property>
 			      <property name="icon_size">1</property>
@@ -791,7 +791,7 @@
 			  <property name="use_underline">True</property>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image3661">
+			    <widget class="GtkImage" id="image3715">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-add</property>
 			      <property name="icon_size">1</property>
@@ -823,7 +823,7 @@
 			  <property name="use_underline">True</property>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image3662">
+			    <widget class="GtkImage" id="image3716">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-add</property>
 			      <property name="icon_size">1</property>
@@ -862,7 +862,7 @@
 			  <signal name="activate" handler="on_preferences1_activate" last_modification_time="Wed, 08 Jun 2005 11:35:19 GMT"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image3663">
+			    <widget class="GtkImage" id="image3717">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-preferences</property>
 			      <property name="icon_size">1</property>
@@ -883,7 +883,7 @@
 			  <signal name="activate" handler="on_plugin_preferences1_activate" last_modification_time="Wed, 28 Oct 2009 17:17:31 GMT"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image3664">
+			    <widget class="GtkImage" id="image3718">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-preferences</property>
 			      <property name="icon_size">1</property>
@@ -951,7 +951,7 @@
 			  <signal name="activate" handler="on_find_in_files1_activate" last_modification_time="Thu, 06 Jul 2006 11:31:09 GMT"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image3665">
+			    <widget class="GtkImage" id="image3719">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-find</property>
 			      <property name="icon_size">1</property>
@@ -972,7 +972,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="image3666">
+			    <widget class="GtkImage" id="image3720">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-find-and-replace</property>
 			      <property name="icon_size">1</property>
@@ -999,7 +999,7 @@
 			  <signal name="activate" handler="on_next_message1_activate" last_modification_time="Tue, 05 Dec 2006 11:15:02 GMT"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image3667">
+			    <widget class="GtkImage" id="image3721">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-go-down</property>
 			      <property name="icon_size">1</property>
@@ -1020,7 +1020,7 @@
 			  <signal name="activate" handler="on_previous_message1_activate" last_modification_time="Wed, 25 Jun 2008 12:10:04 GMT"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image3668">
+			    <widget class="GtkImage" id="image3722">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-go-up</property>
 			      <property name="icon_size">1</property>
@@ -1071,7 +1071,7 @@
 			  <signal name="activate" handler="on_go_to_line_activate" last_modification_time="Sat, 06 Dec 2008 17:41:21 GMT"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image3669">
+			    <widget class="GtkImage" id="image3723">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-jump-to</property>
 			      <property name="icon_size">1</property>
@@ -1184,7 +1184,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="image3670">
+			    <widget class="GtkImage" id="image3724">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-select-font</property>
 			      <property name="icon_size">1</property>
@@ -1756,7 +1756,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="image3671">
+			    <widget class="GtkImage" id="image3725">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-new</property>
 			      <property name="icon_size">1</property>
@@ -1777,7 +1777,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="image3672">
+			    <widget class="GtkImage" id="image3726">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-open</property>
 			      <property name="icon_size">1</property>
@@ -1806,7 +1806,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="image3673">
+			    <widget class="GtkImage" id="image3727">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-close</property>
 			      <property name="icon_size">1</property>
@@ -1863,7 +1863,7 @@
 			  <signal name="activate" handler="on_menu_reload_configuration1_activate" last_modification_time="Mon, 30 Jun 2008 16:19:40 GMT"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image3674">
+			    <widget class="GtkImage" id="image3728">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-refresh</property>
 			      <property name="icon_size">1</property>
@@ -1883,7 +1883,7 @@
 			  <property name="use_underline">True</property>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image3675">
+			    <widget class="GtkImage" id="image3729">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-file</property>
 			      <property name="icon_size">1</property>
@@ -1910,7 +1910,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="image3676">
+			    <widget class="GtkImage" id="image3730">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-select-color</property>
 			      <property name="icon_size">1</property>
@@ -1962,7 +1962,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="image3677">
+			    <widget class="GtkImage" id="image3731">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-help</property>
 			      <property name="icon_size">1</property>
@@ -2616,33 +2616,6 @@
   </child>
 
   <child>
-    <widget class="GtkImageMenuItem" id="menu_open_selected_file2">
-      <property name="visible">True</property>
-      <property name="label" translatable="yes">Open Selected F_ile</property>
-      <property name="use_underline">True</property>
-      <signal name="activate" handler="on_menu_open_selected_file1_activate" last_modification_time="Wed, 24 Jan 2007 18:48:44 GMT"/>
-
-      <child internal-child="image">
-	<widget class="GtkImage" id="image3617">
-	  <property name="visible">True</property>
-	  <property name="stock">gtk-open</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>
-
-  <child>
-    <widget class="GtkSeparatorMenuItem" id="separator36">
-      <property name="visible">True</property>
-    </widget>
-  </child>
-
-  <child>
     <widget class="GtkMenuItem" id="commands1">
       <property name="visible">True</property>
       <property name="label" translatable="yes">_Edit</property>
@@ -2659,39 +2632,13 @@
   </child>
 
   <child>
-    <widget class="GtkMenuItem" id="search2">
+    <widget class="GtkMenuItem" id="insert1">
       <property name="visible">True</property>
-      <property name="label" translatable="yes">_Search</property>
+      <property name="label" translatable="yes">I_nsert</property>
       <property name="use_underline">True</property>
-    </widget>
-  </child>
 
-  <child>
-    <widget class="GtkSeparatorMenuItem" id="separator17">
-      <property name="visible">True</property>
-    </widget>
-  </child>
-
-  <child>
-    <widget class="GtkImageMenuItem" id="comments">
-      <property name="visible">True</property>
-      <property name="label" translatable="yes">I_nsert Comments</property>
-      <property name="use_underline">True</property>
-
-      <child internal-child="image">
-	<widget class="GtkImage" id="image3618">
-	  <property name="visible">True</property>
-	  <property name="stock">gtk-add</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>
-
       <child>
-	<widget class="GtkMenu" id="comments_menu">
+	<widget class="GtkMenu" id="insert1_menu">
 
 	  <child>
 	    <widget class="GtkMenuItem" id="add_changelog_entry2">
@@ -2703,15 +2650,6 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkMenuItem" id="insert_file_header2">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Insert File _Header</property>
-	      <property name="use_underline">True</property>
-	      <signal name="activate" handler="on_comments_fileheader_activate" last_modification_time="Mon, 03 Oct 2005 17:33:08 GMT"/>
-	    </widget>
-	  </child>
-
-	  <child>
 	    <widget class="GtkMenuItem" id="insert_function_description1">
 	      <property name="visible">True</property>
 	      <property name="label" translatable="yes">Insert _Function Description</property>
@@ -2730,52 +2668,92 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkMenuItem" id="insert_gpl_notice1">
+	    <widget class="GtkImageMenuItem" id="comments">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Insert _GPL Notice</property>
+	      <property name="label" translatable="yes">I_nsert Comments</property>
 	      <property name="use_underline">True</property>
-	      <signal name="activate" handler="on_comments_gpl_activate" last_modification_time="Sun, 02 Oct 2005 17:37:31 GMT"/>
+
+	      <child internal-child="image">
+		<widget class="GtkImage" id="image3732">
+		  <property name="visible">True</property>
+		  <property name="stock">gtk-add</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>
 
 	  <child>
-	    <widget class="GtkMenuItem" id="insert_bsd_license_notice1">
+	    <widget class="GtkSeparatorMenuItem" id="separator57">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Insert _BSD License Notice</property>
-	      <property name="use_underline">True</property>
-	      <signal name="activate" handler="on_comments_bsd_activate" last_modification_time="Fri, 05 Jan 2007 13:32:16 GMT"/>
 	    </widget>
 	  </child>
-	</widget>
-      </child>
-    </widget>
-  </child>
 
-  <child>
-    <widget class="GtkImageMenuItem" id="insert_date2">
-      <property name="visible">True</property>
-      <property name="label" translatable="yes">Insert Dat_e</property>
-      <property name="use_underline">True</property>
+	  <child>
+	    <widget class="GtkImageMenuItem" id="insert_date2">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Insert Dat_e</property>
+	      <property name="use_underline">True</property>
 
-      <child internal-child="image">
-	<widget class="GtkImage" id="image3619">
-	  <property name="visible">True</property>
-	  <property name="stock">gtk-add</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>
+	      <child internal-child="image">
+		<widget class="GtkImage" id="image3733">
+		  <property name="visible">True</property>
+		  <property name="stock">gtk-add</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>
 
-      <child>
-	<widget class="GtkMenu" id="insert_date2_menu">
+	      <child>
+		<widget class="GtkMenu" id="insert_date2_menu">
 
+		  <child>
+		    <widget class="GtkMenuItem" id="invisible10">
+		      <property name="label" translatable="yes">invisible</property>
+		      <property name="use_underline">True</property>
+		    </widget>
+		  </child>
+		</widget>
+	      </child>
+	    </widget>
+	  </child>
+
 	  <child>
-	    <widget class="GtkMenuItem" id="invisible10">
-	      <property name="label" translatable="yes">invisible</property>
+	    <widget class="GtkImageMenuItem" id="insert_include1">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">_Insert "include <...>"</property>
 	      <property name="use_underline">True</property>
+
+	      <child internal-child="image">
+		<widget class="GtkImage" id="image3734">
+		  <property name="visible">True</property>
+		  <property name="stock">gtk-add</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>
+
+	      <child>
+		<widget class="GtkMenu" id="insert_include1_menu">
+
+		  <child>
+		    <widget class="GtkMenuItem" id="invisible3">
+		      <property name="label" translatable="yes">invisible</property>
+		      <property name="use_underline">True</property>
+		    </widget>
+		  </child>
+		</widget>
+	      </child>
 	    </widget>
 	  </child>
 	</widget>
@@ -2784,15 +2762,30 @@
   </child>
 
   <child>
-    <widget class="GtkImageMenuItem" id="insert_include1">
+    <widget class="GtkMenuItem" id="search2">
       <property name="visible">True</property>
-      <property name="label" translatable="yes">_Insert "include <...>"</property>
+      <property name="label" translatable="yes">_Search</property>
       <property name="use_underline">True</property>
+    </widget>
+  </child>
 
+  <child>
+    <widget class="GtkSeparatorMenuItem" id="separator7">
+      <property name="visible">True</property>
+    </widget>
+  </child>
+
+  <child>
+    <widget class="GtkImageMenuItem" id="menu_open_selected_file2">
+      <property name="visible">True</property>
+      <property name="label" translatable="yes">Open Selected F_ile</property>
+      <property name="use_underline">True</property>
+      <signal name="activate" handler="on_menu_open_selected_file1_activate" last_modification_time="Wed, 24 Jan 2007 18:48:44 GMT"/>
+
       <child internal-child="image">
-	<widget class="GtkImage" id="image3620">
+	<widget class="GtkImage" id="image3735">
 	  <property name="visible">True</property>
-	  <property name="stock">gtk-add</property>
+	  <property name="stock">gtk-open</property>
 	  <property name="icon_size">1</property>
 	  <property name="xalign">0.5</property>
 	  <property name="yalign">0.5</property>
@@ -2800,28 +2793,10 @@
 	  <property name="ypad">0</property>
 	</widget>
       </child>
-
-      <child>
-	<widget class="GtkMenu" id="insert_include1_menu">
-
-	  <child>
-	    <widget class="GtkMenuItem" id="invisible3">
-	      <property name="label" translatable="yes">invisible</property>
-	      <property name="use_underline">True</property>
-	    </widget>
-	  </child>
-	</widget>
-      </child>
     </widget>
   </child>
 
   <child>
-    <widget class="GtkSeparatorMenuItem" id="separator7">
-      <property name="visible">True</property>
-    </widget>
-  </child>
-
-  <child>
     <widget class="GtkImageMenuItem" id="find_usage1">
       <property name="visible">True</property>
       <property name="label" translatable="yes">Find _Usage</property>
@@ -2829,7 +2804,7 @@
       <signal name="activate" handler="on_find_usage1_activate" last_modification_time="Fri, 27 May 2005 21:55:12 GMT"/>
 
       <child internal-child="image">
-	<widget class="GtkImage" id="image3621">
+	<widget class="GtkImage" id="image3736">
 	  <property name="visible">True</property>
 	  <property name="stock">gtk-find</property>
 	  <property name="icon_size">1</property>
@@ -2850,7 +2825,7 @@
       <signal name="activate" handler="on_goto_tag_definition1" last_modification_time="Thu, 09 Sep 2010 11:30:52 GMT"/>
 
       <child internal-child="image">
-	<widget class="GtkImage" id="image3622">
+	<widget class="GtkImage" id="image3737">
 	  <property name="visible">True</property>
 	  <property name="stock">gtk-jump-to</property>
 	  <property name="icon_size">1</property>

Modified: trunk/src/interface.c
===================================================================
--- trunk/src/interface.c	2010-09-21 16:40:29 UTC (rev 5249)
+++ trunk/src/interface.c	2010-09-21 17:48:42 UTC (rev 5250)
@@ -38,7 +38,7 @@
   GtkWidget *file1_menu;
   GtkWidget *menu_new1;
   GtkWidget *menu_new_with_template1;
-  GtkWidget *image3650;
+  GtkWidget *image3704;
   GtkWidget *separator12;
   GtkWidget *menu_open1;
   GtkWidget *menu_open_selected_file1;
@@ -47,11 +47,11 @@
   GtkWidget *menu_save1;
   GtkWidget *menu_save_as1;
   GtkWidget *menu_save_all1;
-  GtkWidget *image3651;
+  GtkWidget *image3705;
   GtkWidget *menu_reload1;
-  GtkWidget *image3652;
+  GtkWidget *image3706;
   GtkWidget *menu_reload_as1;
-  GtkWidget *image3653;
+  GtkWidget *image3707;
   GtkWidget *menu_reload_as1_menu;
   GtkWidget *invisible7;
   GtkWidget *separator21;
@@ -62,9 +62,9 @@
   GtkWidget *separator14;
   GtkWidget *menu_close1;
   GtkWidget *close_other_documents1;
-  GtkWidget *image3654;
+  GtkWidget *image3708;
   GtkWidget *menu_close_all1;
-  GtkWidget *image3655;
+  GtkWidget *image3709;
   GtkWidget *menu_separatormenuitem1;
   GtkWidget *menu_quit1;
   GtkWidget *edit1;
@@ -79,6 +79,21 @@
   GtkWidget *menu_seperator2;
   GtkWidget *menu_select_all1;
   GtkWidget *separator25;
+  GtkWidget *commands2;
+  GtkWidget *commands2_menu;
+  GtkWidget *cut_current_line_s_1;
+  GtkWidget *image3710;
+  GtkWidget *copy_current_line_s_1;
+  GtkWidget *image3711;
+  GtkWidget *delete_current_line_s_1;
+  GtkWidget *duplicate_line_or_selection1;
+  GtkWidget *separator49;
+  GtkWidget *select_current_line_s_1;
+  GtkWidget *select_current_paragraph1;
+  GtkWidget *separator50;
+  GtkWidget *insert_alternative_white_space1;
+  GtkWidget *separator52;
+  GtkWidget *send_selection_to_vte1;
   GtkWidget *menu_format1;
   GtkWidget *menu_format1_menu;
   GtkWidget *reflow_lines_block1;
@@ -90,32 +105,17 @@
   GtkWidget *menu_toggle_line_commentation1;
   GtkWidget *separator29;
   GtkWidget *menu_increase_indent1;
-  GtkWidget *image3656;
+  GtkWidget *image3712;
   GtkWidget *menu_decrease_indent1;
-  GtkWidget *image3657;
+  GtkWidget *image3713;
   GtkWidget *smart_line_indent1;
   GtkWidget *separator37;
   GtkWidget *send_selection_to2;
   GtkWidget *send_selection_to2_menu;
   GtkWidget *invisible13;
-  GtkWidget *commands2;
-  GtkWidget *commands2_menu;
-  GtkWidget *cut_current_line_s_1;
-  GtkWidget *image3658;
-  GtkWidget *copy_current_line_s_1;
-  GtkWidget *image3659;
-  GtkWidget *delete_current_line_s_1;
-  GtkWidget *duplicate_line_or_selection1;
-  GtkWidget *separator49;
-  GtkWidget *select_current_line_s_1;
-  GtkWidget *select_current_paragraph1;
-  GtkWidget *separator50;
-  GtkWidget *insert_alternative_white_space1;
-  GtkWidget *separator52;
-  GtkWidget *send_selection_to_vte1;
   GtkWidget *separator18;
   GtkWidget *add_comments1;
-  GtkWidget *image3660;
+  GtkWidget *image3714;
   GtkWidget *add_comments1_menu;
   GtkWidget *menu_add_changelog_entry1;
   GtkWidget *insert_file_header1;
@@ -124,18 +124,18 @@
   GtkWidget *insert_gpl_notice2;
   GtkWidget *insert_bsd_license_notice2;
   GtkWidget *insert_date1;
-  GtkWidget *image3661;
+  GtkWidget *image3715;
   GtkWidget *insert_date1_menu;
   GtkWidget *invisible8;
   GtkWidget *insert_include2;
-  GtkWidget *image3662;
+  GtkWidget *image3716;
   GtkWidget *insert_include2_menu;
   GtkWidget *invisible4;
   GtkWidget *separator9;
   GtkWidget *preferences1;
-  GtkWidget *image3663;
+  GtkWidget *image3717;
   GtkWidget *plugin_preferences1;
-  GtkWidget *image3664;
+  GtkWidget *image3718;
   GtkWidget *search1;
   GtkWidget *search1_menu;
   GtkWidget *find1;
@@ -143,20 +143,20 @@
   GtkWidget *find_previous1;
   GtkWidget *separator54;
   GtkWidget *find_in_files1;
-  GtkWidget *image3665;
+  GtkWidget *image3719;
   GtkWidget *replace1;
-  GtkWidget *image3666;
+  GtkWidget *image3720;
   GtkWidget *separator35;
   GtkWidget *next_message1;
-  GtkWidget *image3667;
+  GtkWidget *image3721;
   GtkWidget *previous_message1;
-  GtkWidget *image3668;
+  GtkWidget *image3722;
   GtkWidget *separator51;
   GtkWidget *go_to_next_marker1;
   GtkWidget *go_to_previous_marker1;
   GtkWidget *separator32;
   GtkWidget *go_to_line1;
-  GtkWidget *image3669;
+  GtkWidget *image3723;
   GtkWidget *more1;
   GtkWidget *more1_menu;
   GtkWidget *find_nextsel1;
@@ -170,7 +170,7 @@
   GtkWidget *menu_view1;
   GtkWidget *menu_view1_menu;
   GtkWidget *menu_change_font1;
-  GtkWidget *image3670;
+  GtkWidget *image3724;
   GtkWidget *menu_separator4;
   GtkWidget *menu_toggle_all_additional_widgets1;
   GtkWidget *menu_fullscreen1;
@@ -239,30 +239,30 @@
   GtkWidget *menu_project1;
   GtkWidget *menu_project1_menu;
   GtkWidget *project_new1;
-  GtkWidget *image3671;
+  GtkWidget *image3725;
   GtkWidget *project_open1;
-  GtkWidget *image3672;
+  GtkWidget *image3726;
   GtkWidget *recent_projects1;
   GtkWidget *project_close1;
-  GtkWidget *image3673;
+  GtkWidget *image3727;
   GtkWidget *separator34;
   GtkWidget *project_properties1;
   GtkWidget *menu_build1;
   GtkWidget *tools1;
   GtkWidget *tools1_menu;
   GtkWidget *menu_reload_configuration1;
-  GtkWidget *image3674;
+  GtkWidget *image3728;
   GtkWidget *configuration_files1;
-  GtkWidget *image3675;
+  GtkWidget *image3729;
   GtkWidget *separator47;
   GtkWidget *menu_choose_color1;
-  GtkWidget *image3676;
+  GtkWidget *image3730;
   GtkWidget *menu_count_words1;
   GtkWidget *load_tags1;
   GtkWidget *menu_help1;
   GtkWidget *menu_help1_menu;
   GtkWidget *help1;
-  GtkWidget *image3677;
+  GtkWidget *image3731;
   GtkWidget *website1;
   GtkWidget *keyboard_shortcuts1;
   GtkWidget *debug_messages1;
@@ -329,9 +329,9 @@
   gtk_widget_show (menu_new_with_template1);
   gtk_container_add (GTK_CONTAINER (file1_menu), menu_new_with_template1);
 
-  image3650 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image3650);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image3650);
+  image3704 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3704);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image3704);
 
   separator12 = gtk_separator_menu_item_new ();
   gtk_widget_show (separator12);
@@ -367,25 +367,25 @@
   gtk_widget_show (menu_save_all1);
   gtk_container_add (GTK_CONTAINER (file1_menu), menu_save_all1);
 
-  image3651 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image3651);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image3651);
+  image3705 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3705);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image3705);
 
   menu_reload1 = gtk_image_menu_item_new_with_mnemonic (_("_Reload"));
   gtk_widget_show (menu_reload1);
   gtk_container_add (GTK_CONTAINER (file1_menu), menu_reload1);
 
-  image3652 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image3652);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image3652);
+  image3706 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3706);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image3706);
 
   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);
 
-  image3653 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image3653);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image3653);
+  image3707 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3707);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image3707);
 
   menu_reload_as1_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_reload_as1), menu_reload_as1_menu);
@@ -428,17 +428,17 @@
   gtk_widget_show (close_other_documents1);
   gtk_container_add (GTK_CONTAINER (file1_menu), close_other_documents1);
 
-  image3654 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image3654);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (close_other_documents1), image3654);
+  image3708 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3708);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (close_other_documents1), image3708);
 
   menu_close_all1 = gtk_image_menu_item_new_with_mnemonic (_("C_lose All"));
   gtk_widget_show (menu_close_all1);
   gtk_container_add (GTK_CONTAINER (file1_menu), menu_close_all1);
 
-  image3655 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image3655);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image3655);
+  image3709 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3709);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image3709);
 
   menu_separatormenuitem1 = gtk_separator_menu_item_new ();
   gtk_widget_show (menu_separatormenuitem1);
@@ -499,6 +499,68 @@
   gtk_container_add (GTK_CONTAINER (edit1_menu), separator25);
   gtk_widget_set_sensitive (separator25, FALSE);
 
+  commands2 = gtk_menu_item_new_with_mnemonic (_("_Commands"));
+  gtk_widget_show (commands2);
+  gtk_container_add (GTK_CONTAINER (edit1_menu), commands2);
+
+  commands2_menu = gtk_menu_new ();
+  gtk_menu_item_set_submenu (GTK_MENU_ITEM (commands2), commands2_menu);
+
+  cut_current_line_s_1 = gtk_image_menu_item_new_with_mnemonic (_("_Cut Current Line(s)"));
+  gtk_widget_show (cut_current_line_s_1);
+  gtk_container_add (GTK_CONTAINER (commands2_menu), cut_current_line_s_1);
+
+  image3710 = gtk_image_new_from_stock ("gtk-cut", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3710);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (cut_current_line_s_1), image3710);
+
+  copy_current_line_s_1 = gtk_image_menu_item_new_with_mnemonic (_("_Copy Current Line(s)"));
+  gtk_widget_show (copy_current_line_s_1);
+  gtk_container_add (GTK_CONTAINER (commands2_menu), copy_current_line_s_1);
+
+  image3711 = gtk_image_new_from_stock ("gtk-copy", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3711);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (copy_current_line_s_1), image3711);
+
+  delete_current_line_s_1 = gtk_menu_item_new_with_mnemonic (_("_Delete Current Line(s)"));
+  gtk_widget_show (delete_current_line_s_1);
+  gtk_container_add (GTK_CONTAINER (commands2_menu), delete_current_line_s_1);
+
+  duplicate_line_or_selection1 = gtk_menu_item_new_with_mnemonic (_("_Duplicate Line or Selection"));
+  gtk_widget_show (duplicate_line_or_selection1);
+  gtk_container_add (GTK_CONTAINER (commands2_menu), duplicate_line_or_selection1);
+
+  separator49 = gtk_separator_menu_item_new ();
+  gtk_widget_show (separator49);
+  gtk_container_add (GTK_CONTAINER (commands2_menu), separator49);
+  gtk_widget_set_sensitive (separator49, FALSE);
+
+  select_current_line_s_1 = gtk_menu_item_new_with_mnemonic (_("_Select Current Line(s)"));
+  gtk_widget_show (select_current_line_s_1);
+  gtk_container_add (GTK_CONTAINER (commands2_menu), select_current_line_s_1);
+
+  select_current_paragraph1 = gtk_menu_item_new_with_mnemonic (_("_Select Current Paragraph"));
+  gtk_widget_show (select_current_paragraph1);
+  gtk_container_add (GTK_CONTAINER (commands2_menu), select_current_paragraph1);
+
+  separator50 = gtk_separator_menu_item_new ();
+  gtk_widget_show (separator50);
+  gtk_container_add (GTK_CONTAINER (commands2_menu), separator50);
+  gtk_widget_set_sensitive (separator50, FALSE);
+
+  insert_alternative_white_space1 = gtk_menu_item_new_with_mnemonic (_("_Insert Alternative White Space"));
+  gtk_widget_show (insert_alternative_white_space1);
+  gtk_container_add (GTK_CONTAINER (commands2_menu), insert_alternative_white_space1);
+
+  separator52 = gtk_separator_menu_item_new ();
+  gtk_widget_show (separator52);
+  gtk_container_add (GTK_CONTAINER (commands2_menu), separator52);
+  gtk_widget_set_sensitive (separator52, FALSE);
+
+  send_selection_to_vte1 = gtk_menu_item_new_with_mnemonic (_("_Send Selection to Terminal"));
+  gtk_widget_show (send_selection_to_vte1);
+  gtk_container_add (GTK_CONTAINER (commands2_menu), send_selection_to_vte1);
+
   menu_format1 = gtk_menu_item_new_with_mnemonic (_("_Format"));
   gtk_widget_show (menu_format1);
   gtk_container_add (GTK_CONTAINER (edit1_menu), menu_format1);
@@ -544,17 +606,17 @@
   gtk_widget_show (menu_increase_indent1);
   gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_increase_indent1);
 
-  image3656 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image3656);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image3656);
+  image3712 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3712);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image3712);
 
   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);
 
-  image3657 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image3657);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image3657);
+  image3713 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3713);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image3713);
 
   smart_line_indent1 = gtk_menu_item_new_with_mnemonic (_("_Smart Line Indent"));
   gtk_widget_show (smart_line_indent1);
@@ -575,68 +637,6 @@
   invisible13 = gtk_menu_item_new_with_mnemonic (_("invisible"));
   gtk_container_add (GTK_CONTAINER (send_selection_to2_menu), invisible13);
 
-  commands2 = gtk_menu_item_new_with_mnemonic (_("_Commands"));
-  gtk_widget_show (commands2);
-  gtk_container_add (GTK_CONTAINER (edit1_menu), commands2);
-
-  commands2_menu = gtk_menu_new ();
-  gtk_menu_item_set_submenu (GTK_MENU_ITEM (commands2), commands2_menu);
-
-  cut_current_line_s_1 = gtk_image_menu_item_new_with_mnemonic (_("_Cut Current Line(s)"));
-  gtk_widget_show (cut_current_line_s_1);
-  gtk_container_add (GTK_CONTAINER (commands2_menu), cut_current_line_s_1);
-
-  image3658 = gtk_image_new_from_stock ("gtk-cut", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image3658);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (cut_current_line_s_1), image3658);
-
-  copy_current_line_s_1 = gtk_image_menu_item_new_with_mnemonic (_("_Copy Current Line(s)"));
-  gtk_widget_show (copy_current_line_s_1);
-  gtk_container_add (GTK_CONTAINER (commands2_menu), copy_current_line_s_1);
-
-  image3659 = gtk_image_new_from_stock ("gtk-copy", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image3659);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (copy_current_line_s_1), image3659);
-
-  delete_current_line_s_1 = gtk_menu_item_new_with_mnemonic (_("_Delete Current Line(s)"));
-  gtk_widget_show (delete_current_line_s_1);
-  gtk_container_add (GTK_CONTAINER (commands2_menu), delete_current_line_s_1);
-
-  duplicate_line_or_selection1 = gtk_menu_item_new_with_mnemonic (_("_Duplicate Line or Selection"));
-  gtk_widget_show (duplicate_line_or_selection1);
-  gtk_container_add (GTK_CONTAINER (commands2_menu), duplicate_line_or_selection1);
-
-  separator49 = gtk_separator_menu_item_new ();
-  gtk_widget_show (separator49);
-  gtk_container_add (GTK_CONTAINER (commands2_menu), separator49);
-  gtk_widget_set_sensitive (separator49, FALSE);
-
-  select_current_line_s_1 = gtk_menu_item_new_with_mnemonic (_("_Select Current Line(s)"));
-  gtk_widget_show (select_current_line_s_1);
-  gtk_container_add (GTK_CONTAINER (commands2_menu), select_current_line_s_1);
-
-  select_current_paragraph1 = gtk_menu_item_new_with_mnemonic (_("_Select Current Paragraph"));
-  gtk_widget_show (select_current_paragraph1);
-  gtk_container_add (GTK_CONTAINER (commands2_menu), select_current_paragraph1);
-
-  separator50 = gtk_separator_menu_item_new ();
-  gtk_widget_show (separator50);
-  gtk_container_add (GTK_CONTAINER (commands2_menu), separator50);
-  gtk_widget_set_sensitive (separator50, FALSE);
-
-  insert_alternative_white_space1 = gtk_menu_item_new_with_mnemonic (_("_Insert Alternative White Space"));
-  gtk_widget_show (insert_alternative_white_space1);
-  gtk_container_add (GTK_CONTAINER (commands2_menu), insert_alternative_white_space1);
-
-  separator52 = gtk_separator_menu_item_new ();
-  gtk_widget_show (separator52);
-  gtk_container_add (GTK_CONTAINER (commands2_menu), separator52);
-  gtk_widget_set_sensitive (separator52, FALSE);
-
-  send_selection_to_vte1 = gtk_menu_item_new_with_mnemonic (_("_Send Selection to Terminal"));
-  gtk_widget_show (send_selection_to_vte1);
-  gtk_container_add (GTK_CONTAINER (commands2_menu), send_selection_to_vte1);
-
   separator18 = gtk_separator_menu_item_new ();
   gtk_widget_show (separator18);
   gtk_container_add (GTK_CONTAINER (edit1_menu), separator18);
@@ -646,9 +646,9 @@
   gtk_widget_show (add_comments1);
   gtk_container_add (GTK_CONTAINER (edit1_menu), add_comments1);
 
-  image3660 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image3660);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image3660);
+  image3714 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3714);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image3714);
 
   add_comments1_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (add_comments1), add_comments1_menu);
@@ -681,9 +681,9 @@
   gtk_widget_show (insert_date1);
   gtk_container_add (GTK_CONTAINER (edit1_menu), insert_date1);
 
-  image3661 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image3661);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image3661);
+  image3715 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3715);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image3715);
 
   insert_date1_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_date1), insert_date1_menu);
@@ -695,9 +695,9 @@
   gtk_widget_show (insert_include2);
   gtk_container_add (GTK_CONTAINER (edit1_menu), insert_include2);
 
-  image3662 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image3662);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image3662);
+  image3716 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3716);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image3716);
 
   insert_include2_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include2), insert_include2_menu);
@@ -714,17 +714,17 @@
   gtk_widget_show (preferences1);
   gtk_container_add (GTK_CONTAINER (edit1_menu), preferences1);
 
-  image3663 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image3663);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (preferences1), image3663);
+  image3717 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3717);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (preferences1), image3717);
 
   plugin_preferences1 = gtk_image_menu_item_new_with_mnemonic (_("P_lugin Preferences"));
   gtk_widget_show (plugin_preferences1);
   gtk_container_add (GTK_CONTAINER (edit1_menu), plugin_preferences1);
 
-  image3664 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image3664);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (plugin_preferences1), image3664);
+  image3718 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3718);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (plugin_preferences1), image3718);
 
   search1 = gtk_menu_item_new_with_mnemonic (_("_Search"));
   gtk_widget_show (search1);
@@ -754,17 +754,17 @@
   gtk_widget_show (find_in_files1);
   gtk_container_add (GTK_CONTAINER (search1_menu), find_in_files1);
 
-  image3665 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image3665);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_in_files1), image3665);
+  image3719 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3719);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_in_files1), image3719);
 
   replace1 = gtk_image_menu_item_new_with_mnemonic (_("_Replace"));
   gtk_widget_show (replace1);
   gtk_container_add (GTK_CONTAINER (search1_menu), replace1);
 
-  image3666 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image3666);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image3666);
+  image3720 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3720);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image3720);
 
   separator35 = gtk_separator_menu_item_new ();
   gtk_widget_show (separator35);
@@ -775,17 +775,17 @@
   gtk_widget_show (next_message1);
   gtk_container_add (GTK_CONTAINER (search1_menu), next_message1);
 
-  image3667 = gtk_image_new_from_stock ("gtk-go-down", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image3667);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (next_message1), image3667);
+  image3721 = gtk_image_new_from_stock ("gtk-go-down", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3721);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (next_message1), image3721);
 
   previous_message1 = gtk_image_menu_item_new_with_mnemonic (_("Pr_evious Message"));
   gtk_widget_show (previous_message1);
   gtk_container_add (GTK_CONTAINER (search1_menu), previous_message1);
 
-  image3668 = gtk_image_new_from_stock ("gtk-go-up", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image3668);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (previous_message1), image3668);
+  image3722 = gtk_image_new_from_stock ("gtk-go-up", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3722);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (previous_message1), image3722);
 
   separator51 = gtk_separator_menu_item_new ();
   gtk_widget_show (separator51);
@@ -809,9 +809,9 @@
   gtk_widget_show (go_to_line1);
   gtk_container_add (GTK_CONTAINER (search1_menu), go_to_line1);
 
-  image3669 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image3669);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image3669);
+  image3723 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3723);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image3723);
 
   more1 = gtk_menu_item_new_with_mnemonic (_("_More"));
   gtk_widget_show (more1);
@@ -865,9 +865,9 @@
   gtk_widget_show (menu_change_font1);
   gtk_container_add (GTK_CONTAINER (menu_view1_menu), menu_change_font1);
 
-  image3670 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image3670);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image3670);
+  image3724 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3724);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image3724);
 
   menu_separator4 = gtk_separator_menu_item_new ();
   gtk_widget_show (menu_separator4);
@@ -1161,17 +1161,17 @@
   gtk_widget_show (project_new1);
   gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_new1);
 
-  image3671 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image3671);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image3671);
+  image3725 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3725);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image3725);
 
   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);
 
-  image3672 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image3672);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image3672);
+  image3726 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3726);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image3726);
 
   recent_projects1 = gtk_menu_item_new_with_mnemonic (_("_Recent Projects"));
   gtk_widget_show (recent_projects1);
@@ -1181,9 +1181,9 @@
   gtk_widget_show (project_close1);
   gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_close1);
 
-  image3673 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image3673);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image3673);
+  image3727 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3727);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image3727);
 
   separator34 = gtk_separator_menu_item_new ();
   gtk_widget_show (separator34);
@@ -1209,17 +1209,17 @@
   gtk_widget_show (menu_reload_configuration1);
   gtk_container_add (GTK_CONTAINER (tools1_menu), menu_reload_configuration1);
 
-  image3674 = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image3674);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_configuration1), image3674);
+  image3728 = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3728);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_configuration1), image3728);
 
   configuration_files1 = gtk_image_menu_item_new_with_mnemonic (_("C_onfiguration Files"));
   gtk_widget_show (configuration_files1);
   gtk_container_add (GTK_CONTAINER (tools1_menu), configuration_files1);
 
-  image3675 = gtk_image_new_from_stock ("gtk-file", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image3675);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (configuration_files1), image3675);
+  image3729 = gtk_image_new_from_stock ("gtk-file", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3729);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (configuration_files1), image3729);
 
   separator47 = gtk_separator_menu_item_new ();
   gtk_widget_show (separator47);
@@ -1230,9 +1230,9 @@
   gtk_widget_show (menu_choose_color1);
   gtk_container_add (GTK_CONTAINER (tools1_menu), menu_choose_color1);
 
-  image3676 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image3676);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image3676);
+  image3730 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3730);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image3730);
 
   menu_count_words1 = gtk_menu_item_new_with_mnemonic (_("_Word Count"));
   gtk_widget_show (menu_count_words1);
@@ -1253,9 +1253,9 @@
   gtk_widget_show (help1);
   gtk_container_add (GTK_CONTAINER (menu_help1_menu), help1);
 
-  image3677 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image3677);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image3677);
+  image3731 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3731);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image3731);
 
   website1 = gtk_menu_item_new_with_mnemonic (_("_Website"));
   gtk_widget_show (website1);
@@ -1477,6 +1477,30 @@
   g_signal_connect ((gpointer) menu_select_all1, "activate",
                     G_CALLBACK (on_menu_select_all1_activate),
                     NULL);
+  g_signal_connect ((gpointer) cut_current_line_s_1, "activate",
+                    G_CALLBACK (on_cut_current_line_s_1_activate),
+                    NULL);
+  g_signal_connect ((gpointer) copy_current_line_s_1, "activate",
+                    G_CALLBACK (on_copy_current_line_s_1_activate),
+                    NULL);
+  g_signal_connect ((gpointer) delete_current_line_s_1, "activate",
+                    G_CALLBACK (on_delete_current_line_s_1_activate),
+                    NULL);
+  g_signal_connect ((gpointer) duplicate_line_or_selection1, "activate",
+                    G_CALLBACK (on_duplicate_line_or_selection1_activate),
+                    NULL);
+  g_signal_connect ((gpointer) select_current_line_s_1, "activate",
+                    G_CALLBACK (on_select_current_line_s_1_activate),
+                    NULL);
+  g_signal_connect ((gpointer) select_current_paragraph1, "activate",
+                    G_CALLBACK (on_select_current_paragraph1_activate),
+                    NULL);
+  g_signal_connect ((gpointer) insert_alternative_white_space1, "activate",
+                    G_CALLBACK (on_insert_alternative_white_space1_activate),
+                    NULL);
+  g_signal_connect ((gpointer) send_selection_to_vte1, "activate",
+                    G_CALLBACK (on_send_selection_to_vte1_activate),
+                    NULL);
   g_signal_connect ((gpointer) reflow_lines_block1, "activate",
                     G_CALLBACK (on_reflow_lines_block1_activate),
                     NULL);
@@ -1504,30 +1528,6 @@
   g_signal_connect ((gpointer) smart_line_indent1, "activate",
                     G_CALLBACK (on_smart_line_indent1_activate),
                     NULL);
-  g_signal_connect ((gpointer) cut_current_line_s_1, "activate",
-                    G_CALLBACK (on_cut_current_line_s_1_activate),
-                    NULL);
-  g_signal_connect ((gpointer) copy_current_line_s_1, "activate",
-                    G_CALLBACK (on_copy_current_line_s_1_activate),
-                    NULL);
-  g_signal_connect ((gpointer) delete_current_line_s_1, "activate",
-                    G_CALLBACK (on_delete_current_line_s_1_activate),
-                    NULL);
-  g_signal_connect ((gpointer) duplicate_line_or_selection1, "activate",
-                    G_CALLBACK (on_duplicate_line_or_selection1_activate),
-                    NULL);
-  g_signal_connect ((gpointer) select_current_line_s_1, "activate",
-                    G_CALLBACK (on_select_current_line_s_1_activate),
-                    NULL);
-  g_signal_connect ((gpointer) select_current_paragraph1, "activate",
-                    G_CALLBACK (on_select_current_paragraph1_activate),
-                    NULL);
-  g_signal_connect ((gpointer) insert_alternative_white_space1, "activate",
-                    G_CALLBACK (on_insert_alternative_white_space1_activate),
-                    NULL);
-  g_signal_connect ((gpointer) send_selection_to_vte1, "activate",
-                    G_CALLBACK (on_send_selection_to_vte1_activate),
-                    NULL);
   g_signal_connect ((gpointer) menu_add_changelog_entry1, "activate",
                     G_CALLBACK (on_comments_changelog_activate),
                     NULL);
@@ -1791,7 +1791,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, image3650, "image3650");
+  GLADE_HOOKUP_OBJECT (window1, image3704, "image3704");
   GLADE_HOOKUP_OBJECT (window1, separator12, "separator12");
   GLADE_HOOKUP_OBJECT (window1, menu_open1, "menu_open1");
   GLADE_HOOKUP_OBJECT (window1, menu_open_selected_file1, "menu_open_selected_file1");
@@ -1800,11 +1800,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, image3651, "image3651");
+  GLADE_HOOKUP_OBJECT (window1, image3705, "image3705");
   GLADE_HOOKUP_OBJECT (window1, menu_reload1, "menu_reload1");
-  GLADE_HOOKUP_OBJECT (window1, image3652, "image3652");
+  GLADE_HOOKUP_OBJECT (window1, image3706, "image3706");
   GLADE_HOOKUP_OBJECT (window1, menu_reload_as1, "menu_reload_as1");
-  GLADE_HOOKUP_OBJECT (window1, image3653, "image3653");
+  GLADE_HOOKUP_OBJECT (window1, image3707, "image3707");
   GLADE_HOOKUP_OBJECT (window1, menu_reload_as1_menu, "menu_reload_as1_menu");
   GLADE_HOOKUP_OBJECT (window1, invisible7, "invisible7");
   GLADE_HOOKUP_OBJECT (window1, separator21, "separator21");
@@ -1815,9 +1815,9 @@
   GLADE_HOOKUP_OBJECT (window1, separator14, "separator14");
   GLADE_HOOKUP_OBJECT (window1, menu_close1, "menu_close1");
   GLADE_HOOKUP_OBJECT (window1, close_other_documents1, "close_other_documents1");
-  GLADE_HOOKUP_OBJECT (window1, image3654, "image3654");
+  GLADE_HOOKUP_OBJECT (window1, image3708, "image3708");
   GLADE_HOOKUP_OBJECT (window1, menu_close_all1, "menu_close_all1");
-  GLADE_HOOKUP_OBJECT (window1, image3655, "image3655");
+  GLADE_HOOKUP_OBJECT (window1, image3709, "image3709");
   GLADE_HOOKUP_OBJECT (window1, menu_separatormenuitem1, "menu_separatormenuitem1");
   GLADE_HOOKUP_OBJECT (window1, menu_quit1, "menu_quit1");
   GLADE_HOOKUP_OBJECT (window1, edit1, "edit1");
@@ -1832,6 +1832,21 @@
   GLADE_HOOKUP_OBJECT (window1, menu_seperator2, "menu_seperator2");
   GLADE_HOOKUP_OBJECT (window1, menu_select_all1, "menu_select_all1");
   GLADE_HOOKUP_OBJECT (window1, separator25, "separator25");
+  GLADE_HOOKUP_OBJECT (window1, commands2, "commands2");
+  GLADE_HOOKUP_OBJECT (window1, commands2_menu, "commands2_menu");
+  GLADE_HOOKUP_OBJECT (window1, cut_current_line_s_1, "cut_current_line_s_1");
+  GLADE_HOOKUP_OBJECT (window1, image3710, "image3710");
+  GLADE_HOOKUP_OBJECT (window1, copy_current_line_s_1, "copy_current_line_s_1");
+  GLADE_HOOKUP_OBJECT (window1, image3711, "image3711");
+  GLADE_HOOKUP_OBJECT (window1, delete_current_line_s_1, "delete_current_line_s_1");
+  GLADE_HOOKUP_OBJECT (window1, duplicate_line_or_selection1, "duplicate_line_or_selection1");
+  GLADE_HOOKUP_OBJECT (window1, separator49, "separator49");
+  GLADE_HOOKUP_OBJECT (window1, select_current_line_s_1, "select_current_line_s_1");
+  GLADE_HOOKUP_OBJECT (window1, select_current_paragraph1, "select_current_paragraph1");
+  GLADE_HOOKUP_OBJECT (window1, separator50, "separator50");
+  GLADE_HOOKUP_OBJECT (window1, insert_alternative_white_space1, "insert_alternative_white_space1");
+  GLADE_HOOKUP_OBJECT (window1, separator52, "separator52");
+  GLADE_HOOKUP_OBJECT (window1, send_selection_to_vte1, "send_selection_to_vte1");
   GLADE_HOOKUP_OBJECT (window1, menu_format1, "menu_format1");
   GLADE_HOOKUP_OBJECT (window1, menu_format1_menu, "menu_format1_menu");
   GLADE_HOOKUP_OBJECT (window1, reflow_lines_block1, "reflow_lines_block1");
@@ -1843,32 +1858,17 @@
   GLADE_HOOKUP_OBJECT (window1, menu_toggle_line_commentation1, "menu_toggle_line_commentation1");
   GLADE_HOOKUP_OBJECT (window1, separator29, "separator29");
   GLADE_HOOKUP_OBJECT (window1, menu_increase_indent1, "menu_increase_indent1");
-  GLADE_HOOKUP_OBJECT (window1, image3656, "image3656");
+  GLADE_HOOKUP_OBJECT (window1, image3712, "image3712");
   GLADE_HOOKUP_OBJECT (window1, menu_decrease_indent1, "menu_decrease_indent1");
-  GLADE_HOOKUP_OBJECT (window1, image3657, "image3657");
+  GLADE_HOOKUP_OBJECT (window1, image3713, "image3713");
   GLADE_HOOKUP_OBJECT (window1, smart_line_indent1, "smart_line_indent1");
   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, commands2, "commands2");
-  GLADE_HOOKUP_OBJECT (window1, commands2_menu, "commands2_menu");
-  GLADE_HOOKUP_OBJECT (window1, cut_current_line_s_1, "cut_current_line_s_1");
-  GLADE_HOOKUP_OBJECT (window1, image3658, "image3658");
-  GLADE_HOOKUP_OBJECT (window1, copy_current_line_s_1, "copy_current_line_s_1");
-  GLADE_HOOKUP_OBJECT (window1, image3659, "image3659");
-  GLADE_HOOKUP_OBJECT (window1, delete_current_line_s_1, "delete_current_line_s_1");
-  GLADE_HOOKUP_OBJECT (window1, duplicate_line_or_selection1, "duplicate_line_or_selection1");
-  GLADE_HOOKUP_OBJECT (window1, separator49, "separator49");
-  GLADE_HOOKUP_OBJECT (window1, select_current_line_s_1, "select_current_line_s_1");
-  GLADE_HOOKUP_OBJECT (window1, select_current_paragraph1, "select_current_paragraph1");
-  GLADE_HOOKUP_OBJECT (window1, separator50, "separator50");
-  GLADE_HOOKUP_OBJECT (window1, insert_alternative_white_space1, "insert_alternative_white_space1");
-  GLADE_HOOKUP_OBJECT (window1, separator52, "separator52");
-  GLADE_HOOKUP_OBJECT (window1, send_selection_to_vte1, "send_selection_to_vte1");
   GLADE_HOOKUP_OBJECT (window1, separator18, "separator18");
   GLADE_HOOKUP_OBJECT (window1, add_comments1, "add_comments1");
-  GLADE_HOOKUP_OBJECT (window1, image3660, "image3660");
+  GLADE_HOOKUP_OBJECT (window1, image3714, "image3714");
   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");
@@ -1877,18 +1877,18 @@
   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, image3661, "image3661");
+  GLADE_HOOKUP_OBJECT (window1, image3715, "image3715");
   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, image3662, "image3662");
+  GLADE_HOOKUP_OBJECT (window1, image3716, "image3716");
   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, image3663, "image3663");
+  GLADE_HOOKUP_OBJECT (window1, image3717, "image3717");
   GLADE_HOOKUP_OBJECT (window1, plugin_preferences1, "plugin_preferences1");
-  GLADE_HOOKUP_OBJECT (window1, image3664, "image3664");
+  GLADE_HOOKUP_OBJECT (window1, image3718, "image3718");
   GLADE_HOOKUP_OBJECT (window1, search1, "search1");
   GLADE_HOOKUP_OBJECT (window1, search1_menu, "search1_menu");
   GLADE_HOOKUP_OBJECT (window1, find1, "find1");
@@ -1896,20 +1896,20 @@
   GLADE_HOOKUP_OBJECT (window1, find_previous1, "find_previous1");
   GLADE_HOOKUP_OBJECT (window1, separator54, "separator54");
   GLADE_HOOKUP_OBJECT (window1, find_in_files1, "find_in_files1");
-  GLADE_HOOKUP_OBJECT (window1, image3665, "image3665");
+  GLADE_HOOKUP_OBJECT (window1, image3719, "image3719");
   GLADE_HOOKUP_OBJECT (window1, replace1, "replace1");
-  GLADE_HOOKUP_OBJECT (window1, image3666, "image3666");
+  GLADE_HOOKUP_OBJECT (window1, image3720, "image3720");
   GLADE_HOOKUP_OBJECT (window1, separator35, "separator35");
   GLADE_HOOKUP_OBJECT (window1, next_message1, "next_message1");
-  GLADE_HOOKUP_OBJECT (window1, image3667, "image3667");
+  GLADE_HOOKUP_OBJECT (window1, image3721, "image3721");
   GLADE_HOOKUP_OBJECT (window1, previous_message1, "previous_message1");
-  GLADE_HOOKUP_OBJECT (window1, image3668, "image3668");
+  GLADE_HOOKUP_OBJECT (window1, image3722, "image3722");
   GLADE_HOOKUP_OBJECT (window1, separator51, "separator51");
   GLADE_HOOKUP_OBJECT (window1, go_to_next_marker1, "go_to_next_marker1");
   GLADE_HOOKUP_OBJECT (window1, go_to_previous_marker1, "go_to_previous_marker1");
   GLADE_HOOKUP_OBJECT (window1, separator32, "separator32");
   GLADE_HOOKUP_OBJECT (window1, go_to_line1, "go_to_line1");
-  GLADE_HOOKUP_OBJECT (window1, image3669, "image3669");
+  GLADE_HOOKUP_OBJECT (window1, image3723, "image3723");
   GLADE_HOOKUP_OBJECT (window1, more1, "more1");
   GLADE_HOOKUP_OBJECT (window1, more1_menu, "more1_menu");
   GLADE_HOOKUP_OBJECT (window1, find_nextsel1, "find_nextsel1");
@@ -1923,7 +1923,7 @@
   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, image3670, "image3670");
+  GLADE_HOOKUP_OBJECT (window1, image3724, "image3724");
   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");
@@ -1989,30 +1989,30 @@
   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, image3671, "image3671");
+  GLADE_HOOKUP_OBJECT (window1, image3725, "image3725");
   GLADE_HOOKUP_OBJECT (window1, project_open1, "project_open1");
-  GLADE_HOOKUP_OBJECT (window1, image3672, "image3672");
+  GLADE_HOOKUP_OBJECT (window1, image3726, "image3726");
   GLADE_HOOKUP_OBJECT (window1, recent_projects1, "recent_projects1");
   GLADE_HOOKUP_OBJECT (window1, project_close1, "project_close1");
-  GLADE_HOOKUP_OBJECT (window1, image3673, "image3673");
+  GLADE_HOOKUP_OBJECT (window1, image3727, "image3727");
   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_reload_configuration1, "menu_reload_configuration1");
-  GLADE_HOOKUP_OBJECT (window1, image3674, "image3674");
+  GLADE_HOOKUP_OBJECT (window1, image3728, "image3728");
   GLADE_HOOKUP_OBJECT (window1, configuration_files1, "configuration_files1");
-  GLADE_HOOKUP_OBJECT (window1, image3675, "image3675");
+  GLADE_HOOKUP_OBJECT (window1, image3729, "image3729");
   GLADE_HOOKUP_OBJECT (window1, separator47, "separator47");
   GLADE_HOOKUP_OBJECT (window1, menu_choose_color1, "menu_choose_color1");
-  GLADE_HOOKUP_OBJECT (window1, image3676, "image3676");
+  GLADE_HOOKUP_OBJECT (window1, image3730, "image3730");
   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, image3677, "image3677");
+  GLADE_HOOKUP_OBJECT (window1, image3731, "image3731");
   GLADE_HOOKUP_OBJECT (window1, website1, "website1");
   GLADE_HOOKUP_OBJECT (window1, keyboard_shortcuts1, "keyboard_shortcuts1");
   GLADE_HOOKUP_OBJECT (window1, debug_messages1, "debug_messages1");
@@ -2116,35 +2116,32 @@
   GtkWidget *separator3;
   GtkWidget *menu_select_all2;
   GtkWidget *separator26;
-  GtkWidget *menu_open_selected_file2;
-  GtkWidget *image3617;
-  GtkWidget *separator36;
   GtkWidget *commands1;
   GtkWidget *menu_format2;
-  GtkWidget *search2;
-  GtkWidget *separator17;
-  GtkWidget *comments;
-  GtkWidget *image3618;
-  GtkWidget *comments_menu;
+  GtkWidget *insert1;
+  GtkWidget *insert1_menu;
   GtkWidget *add_changelog_entry2;
-  GtkWidget *insert_file_header2;
   GtkWidget *insert_function_description1;
   GtkWidget *insert_multiline_comment1;
-  GtkWidget *insert_gpl_notice1;
-  GtkWidget *insert_bsd_license_notice1;
+  GtkWidget *comments;
+  GtkWidget *image3732;
+  GtkWidget *separator57;
   GtkWidget *insert_date2;
-  GtkWidget *image3619;
+  GtkWidget *image3733;
   GtkWidget *insert_date2_menu;
   GtkWidget *invisible10;
   GtkWidget *insert_include1;
-  GtkWidget *image3620;
+  GtkWidget *image3734;
   GtkWidget *insert_include1_menu;
   GtkWidget *invisible3;
+  GtkWidget *search2;
   GtkWidget *separator7;
+  GtkWidget *menu_open_selected_file2;
+  GtkWidget *image3735;
   GtkWidget *find_usage1;
-  GtkWidget *image3621;
+  GtkWidget *image3736;
   GtkWidget *goto_tag_definition1;
-  GtkWidget *image3622;
+  GtkWidget *image3737;
   GtkWidget *context_action1;
   GtkAccelGroup *accel_group;
 
@@ -2195,19 +2192,6 @@
   gtk_container_add (GTK_CONTAINER (edit_menu1), separator26);
   gtk_widget_set_sensitive (separator26, FALSE);
 
-  menu_open_selected_file2 = gtk_image_menu_item_new_with_mnemonic (_("Open Selected F_ile"));
-  gtk_widget_show (menu_open_selected_file2);
-  gtk_container_add (GTK_CONTAINER (edit_menu1), menu_open_selected_file2);
-
-  image3617 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image3617);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_open_selected_file2), image3617);
-
-  separator36 = gtk_separator_menu_item_new ();
-  gtk_widget_show (separator36);
-  gtk_container_add (GTK_CONTAINER (edit_menu1), separator36);
-  gtk_widget_set_sensitive (separator36, FALSE);
-
   commands1 = gtk_menu_item_new_with_mnemonic (_("_Edit"));
   gtk_widget_show (commands1);
   gtk_container_add (GTK_CONTAINER (edit_menu1), commands1);
@@ -2216,57 +2200,45 @@
   gtk_widget_show (menu_format2);
   gtk_container_add (GTK_CONTAINER (edit_menu1), menu_format2);
 
-  search2 = gtk_menu_item_new_with_mnemonic (_("_Search"));
-  gtk_widget_show (search2);
-  gtk_container_add (GTK_CONTAINER (edit_menu1), search2);
+  insert1 = gtk_menu_item_new_with_mnemonic (_("I_nsert"));
+  gtk_widget_show (insert1);
+  gtk_container_add (GTK_CONTAINER (edit_menu1), insert1);
 
-  separator17 = gtk_separator_menu_item_new ();
-  gtk_widget_show (separator17);
-  gtk_container_add (GTK_CONTAINER (edit_menu1), separator17);
-  gtk_widget_set_sensitive (separator17, FALSE);
+  insert1_menu = gtk_menu_new ();
+  gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert1), insert1_menu);
 
-  comments = gtk_image_menu_item_new_with_mnemonic (_("I_nsert Comments"));
-  gtk_widget_show (comments);
-  gtk_container_add (GTK_CONTAINER (edit_menu1), comments);
-
-  image3618 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image3618);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (comments), image3618);
-
-  comments_menu = gtk_menu_new ();
-  gtk_menu_item_set_submenu (GTK_MENU_ITEM (comments), comments_menu);
-
   add_changelog_entry2 = gtk_menu_item_new_with_mnemonic (_("Insert _ChangeLog Entry"));
   gtk_widget_show (add_changelog_entry2);
-  gtk_container_add (GTK_CONTAINER (comments_menu), add_changelog_entry2);
+  gtk_container_add (GTK_CONTAINER (insert1_menu), add_changelog_entry2);
 
-  insert_file_header2 = gtk_menu_item_new_with_mnemonic (_("Insert File _Header"));
-  gtk_widget_show (insert_file_header2);
-  gtk_container_add (GTK_CONTAINER (comments_menu), insert_file_header2);
-
   insert_function_description1 = gtk_menu_item_new_with_mnemonic (_("Insert _Function Description"));
   gtk_widget_show (insert_function_description1);
-  gtk_container_add (GTK_CONTAINER (comments_menu), insert_function_description1);
+  gtk_container_add (GTK_CONTAINER (insert1_menu), insert_function_description1);
 
   insert_multiline_comment1 = gtk_menu_item_new_with_mnemonic (_("Insert _Multiline Comment"));
   gtk_widget_show (insert_multiline_comment1);
-  gtk_container_add (GTK_CONTAINER (comments_menu), insert_multiline_comment1);
+  gtk_container_add (GTK_CONTAINER (insert1_menu), insert_multiline_comment1);
 
-  insert_gpl_notice1 = gtk_menu_item_new_with_mnemonic (_("Insert _GPL Notice"));
-  gtk_widget_show (insert_gpl_notice1);
-  gtk_container_add (GTK_CONTAINER (comments_menu), insert_gpl_notice1);
+  comments = gtk_image_menu_item_new_with_mnemonic (_("I_nsert Comments"));
+  gtk_widget_show (comments);
+  gtk_container_add (GTK_CONTAINER (insert1_menu), comments);
 
-  insert_bsd_license_notice1 = gtk_menu_item_new_with_mnemonic (_("Insert _BSD License Notice"));
-  gtk_widget_show (insert_bsd_license_notice1);
-  gtk_container_add (GTK_CONTAINER (comments_menu), insert_bsd_license_notice1);
+  image3732 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3732);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (comments), image3732);
 
+  separator57 = gtk_separator_menu_item_new ();
+  gtk_widget_show (separator57);
+  gtk_container_add (GTK_CONTAINER (insert1_menu), separator57);
+  gtk_widget_set_sensitive (separator57, FALSE);
+
   insert_date2 = gtk_image_menu_item_new_with_mnemonic (_("Insert Dat_e"));
   gtk_widget_show (insert_date2);
-  gtk_container_add (GTK_CONTAINER (edit_menu1), insert_date2);
+  gtk_container_add (GTK_CONTAINER (insert1_menu), insert_date2);
 
-  image3619 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image3619);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date2), image3619);
+  image3733 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3733);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date2), image3733);
 
   insert_date2_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_date2), insert_date2_menu);
@@ -2276,11 +2248,11 @@
 
   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);
+  gtk_container_add (GTK_CONTAINER (insert1_menu), insert_include1);
 
-  image3620 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image3620);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include1), image3620);
+  image3734 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3734);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include1), image3734);
 
   insert_include1_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include1), insert_include1_menu);
@@ -2288,26 +2260,38 @@
   invisible3 = gtk_menu_item_new_with_mnemonic (_("invisible"));
   gtk_container_add (GTK_CONTAINER (insert_include1_menu), invisible3);
 
+  search2 = gtk_menu_item_new_with_mnemonic (_("_Search"));
+  gtk_widget_show (search2);
+  gtk_container_add (GTK_CONTAINER (edit_menu1), search2);
+
   separator7 = gtk_separator_menu_item_new ();
   gtk_widget_show (separator7);
   gtk_container_add (GTK_CONTAINER (edit_menu1), separator7);
   gtk_widget_set_sensitive (separator7, FALSE);
 
+  menu_open_selected_file2 = gtk_image_menu_item_new_with_mnemonic (_("Open Selected F_ile"));
+  gtk_widget_show (menu_open_selected_file2);
+  gtk_container_add (GTK_CONTAINER (edit_menu1), menu_open_selected_file2);
+
+  image3735 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3735);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_open_selected_file2), image3735);
+
   find_usage1 = gtk_image_menu_item_new_with_mnemonic (_("Find _Usage"));
   gtk_widget_show (find_usage1);
   gtk_container_add (GTK_CONTAINER (edit_menu1), find_usage1);
 
-  image3621 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image3621);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_usage1), image3621);
+  image3736 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3736);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_usage1), image3736);
 
   goto_tag_definition1 = gtk_image_menu_item_new_with_mnemonic (_("Go to _Tag Definition"));
   gtk_widget_show (goto_tag_definition1);
   gtk_container_add (GTK_CONTAINER (edit_menu1), goto_tag_definition1);
 
-  image3622 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image3622);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (goto_tag_definition1), image3622);
+  image3737 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3737);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (goto_tag_definition1), image3737);
 
   context_action1 = gtk_menu_item_new_with_mnemonic (_("Conte_xt Action"));
   gtk_widget_show (context_action1);
@@ -2334,27 +2318,18 @@
   g_signal_connect ((gpointer) menu_select_all2, "activate",
                     G_CALLBACK (on_menu_select_all1_activate),
                     NULL);
-  g_signal_connect ((gpointer) menu_open_selected_file2, "activate",
-                    G_CALLBACK (on_menu_open_selected_file1_activate),
-                    NULL);
   g_signal_connect ((gpointer) add_changelog_entry2, "activate",
                     G_CALLBACK (on_comments_changelog_activate),
                     NULL);
-  g_signal_connect ((gpointer) insert_file_header2, "activate",
-                    G_CALLBACK (on_comments_fileheader_activate),
-                    NULL);
   g_signal_connect ((gpointer) insert_function_description1, "activate",
                     G_CALLBACK (on_comments_function_activate),
                     NULL);
   g_signal_connect ((gpointer) insert_multiline_comment1, "activate",
                     G_CALLBACK (on_comments_multiline_activate),
                     NULL);
-  g_signal_connect ((gpointer) insert_gpl_notice1, "activate",
-                    G_CALLBACK (on_comments_gpl_activate),
+  g_signal_connect ((gpointer) menu_open_selected_file2, "activate",
+                    G_CALLBACK (on_menu_open_selected_file1_activate),
                     NULL);
-  g_signal_connect ((gpointer) insert_bsd_license_notice1, "activate",
-                    G_CALLBACK (on_comments_bsd_activate),
-                    NULL);
   g_signal_connect ((gpointer) find_usage1, "activate",
                     G_CALLBACK (on_find_usage1_activate),
                     NULL);
@@ -2377,35 +2352,32 @@
   GLADE_HOOKUP_OBJECT (edit_menu1, separator3, "separator3");
   GLADE_HOOKUP_OBJECT (edit_menu1, menu_select_all2, "menu_select_all2");
   GLADE_HOOKUP_OBJECT (edit_menu1, separator26, "separator26");
-  GLADE_HOOKUP_OBJECT (edit_menu1, menu_open_selected_file2, "menu_open_selected_file2");
-  GLADE_HOOKUP_OBJECT (edit_menu1, image3617, "image3617");
-  GLADE_HOOKUP_OBJECT (edit_menu1, separator36, "separator36");
   GLADE_HOOKUP_OBJECT (edit_menu1, commands1, "commands1");
   GLADE_HOOKUP_OBJECT (edit_menu1, menu_format2, "menu_format2");
-  GLADE_HOOKUP_OBJECT (edit_menu1, search2, "search2");
-  GLADE_HOOKUP_OBJECT (edit_menu1, separator17, "separator17");
-  GLADE_HOOKUP_OBJECT (edit_menu1, comments, "comments");
-  GLADE_HOOKUP_OBJECT (edit_menu1, image3618, "image3618");
-  GLADE_HOOKUP_OBJECT (edit_menu1, comments_menu, "comments_menu");
+  GLADE_HOOKUP_OBJECT (edit_menu1, insert1, "insert1");
+  GLADE_HOOKUP_OBJECT (edit_menu1, insert1_menu, "insert1_menu");
   GLADE_HOOKUP_OBJECT (edit_menu1, add_changelog_entry2, "add_changelog_entry2");
-  GLADE_HOOKUP_OBJECT (edit_menu1, insert_file_header2, "insert_file_header2");
   GLADE_HOOKUP_OBJECT (edit_menu1, insert_function_description1, "insert_function_description1");
   GLADE_HOOKUP_OBJECT (edit_menu1, insert_multiline_comment1, "insert_multiline_comment1");
-  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, comments, "comments");
+  GLADE_HOOKUP_OBJECT (edit_menu1, image3732, "image3732");
+  GLADE_HOOKUP_OBJECT (edit_menu1, separator57, "separator57");
   GLADE_HOOKUP_OBJECT (edit_menu1, insert_date2, "insert_date2");
-  GLADE_HOOKUP_OBJECT (edit_menu1, image3619, "image3619");
+  GLADE_HOOKUP_OBJECT (edit_menu1, image3733, "image3733");
   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, image3620, "image3620");
+  GLADE_HOOKUP_OBJECT (edit_menu1, image3734, "image3734");
   GLADE_HOOKUP_OBJECT (edit_menu1, insert_include1_menu, "insert_include1_menu");
   GLADE_HOOKUP_OBJECT (edit_menu1, invisible3, "invisible3");
+  GLADE_HOOKUP_OBJECT (edit_menu1, search2, "search2");
   GLADE_HOOKUP_OBJECT (edit_menu1, separator7, "separator7");
+  GLADE_HOOKUP_OBJECT (edit_menu1, menu_open_selected_file2, "menu_open_selected_file2");
+  GLADE_HOOKUP_OBJECT (edit_menu1, image3735, "image3735");
   GLADE_HOOKUP_OBJECT (edit_menu1, find_usage1, "find_usage1");
-  GLADE_HOOKUP_OBJECT (edit_menu1, image3621, "image3621");
+  GLADE_HOOKUP_OBJECT (edit_menu1, image3736, "image3736");
   GLADE_HOOKUP_OBJECT (edit_menu1, goto_tag_definition1, "goto_tag_definition1");
-  GLADE_HOOKUP_OBJECT (edit_menu1, image3622, "image3622");
+  GLADE_HOOKUP_OBJECT (edit_menu1, image3737, "image3737");
   GLADE_HOOKUP_OBJECT (edit_menu1, context_action1, "context_action1");
 
   gtk_menu_set_accel_group (GTK_MENU (edit_menu1), accel_group);

Modified: trunk/src/ui_utils.c
===================================================================
--- trunk/src/ui_utils.c	2010-09-21 16:40:29 UTC (rev 5249)
+++ trunk/src/ui_utils.c	2010-09-21 17:48:42 UTC (rev 5250)
@@ -2088,6 +2088,7 @@
 			{"commands2_menu", "commands2", "commands1"},
 			{"menu_format1_menu", "menu_format1", "menu_format2"},
 			{"more1_menu", "more1", "search2"},
+			{"add_comments1_menu", "add_comments1", "comments"},
 			{NULL, NULL, NULL}
 		};
 		static GeanySharedMenu items[G_N_ELEMENTS(arr)];


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



More information about the Commits mailing list