From f2a4f64802f57c22f3ac78ae7527d83f0abcdf09 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sat, 16 Dec 2006 02:12:29 +0000
Subject: [PATCH] Fixed menu organization.

git-svn-id: svn://localhost/ardour2/trunk@1216 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/ardour.menus    | 32 ++++++++++++++++----------------
 gtk2_ardour/ardour_ui_ed.cc |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/gtk2_ardour/ardour.menus b/gtk2_ardour/ardour.menus
index 6e562a2fb1..b74174c157 100644
--- a/gtk2_ardour/ardour.menus
+++ b/gtk2_ardour/ardour.menus
@@ -123,6 +123,21 @@
 	           <menuitem action="nudge-backward"/>
         	   <menuitem action="nudge-next-backward"/>
 	       </menu>
+	       <menu name='KeyMouse Actions' action='KeyMouse Actions'>
+	       		<menuitem action='audition-at-mouse'/>
+               		<menuitem action='brush-at-mouse'/>
+               		<menuitem action='set-edit-cursor'/>
+               		<menuitem action='mute-unmute-region'/>
+              	 	<menuitem action='set-playhead'/>
+	       		<menuitem action='split-region'/>
+	       		<menuitem action='set-region-sync-position'/>
+			<separator/>
+			<menuitem action='set-mouse-mode-object'/>
+			<menuitem action='set-mouse-mode-range'/>
+			<menuitem action='set-mouse-mode-gain'/>
+			<menuitem action='set-mouse-mode-zoom'/>
+			<menuitem action='set-mouse-mode-timefx'/>
+          </menu>
         </menu>         
         <menu name='View' action = 'View'>
                <menu name='ZoomFocus' action='ZoomFocus'>
@@ -221,7 +236,6 @@
                <menuitem action='ToggleColorManager'/>
                <menuitem action='ToggleBigClock'/>
    	       <separator/>
-	       <menuitem action='About'/>
         </menu>
         <menu name='Options' action='Options'>
 	       <menu action='AudioFileFormat'>
@@ -329,21 +343,7 @@
 	       <separator/>
          </menu>
 	 <menu name='Help' action='Help'>
-	       <menu name='KeyMouse Actions' action='KeyMouse Actions'>
-	       		<menuitem action='audition-at-mouse'/>
-               		<menuitem action='brush-at-mouse'/>
-               		<menuitem action='set-edit-cursor'/>
-               		<menuitem action='mute-unmute-region'/>
-              	 	<menuitem action='set-playhead'/>
-	       		<menuitem action='split-region'/>
-	       		<menuitem action='set-region-sync-position'/>
-			<separator/>
-			<menuitem action='set-mouse-mode-object'/>
-			<menuitem action='set-mouse-mode-range'/>
-			<menuitem action='set-mouse-mode-gain'/>
-			<menuitem action='set-mouse-mode-zoom'/>
-			<menuitem action='set-mouse-mode-timefx'/>
-               </menu>
+	     <menuitem action='About'/>
 	</menu>
      </menubar>
 
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index e764779300..2acf1b28c6 100644
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -80,7 +80,7 @@ ARDOUR_UI::install_actions ()
 	ActionManager::register_action (main_actions, X_("Sync"), _("Sync"));
 	ActionManager::register_action (main_actions, X_("Options"), _("Options"));
 	ActionManager::register_action (main_actions, X_("TransportOptions"), _("Options"));
-        ActionManager::register_action (main_actions, X_("Help"), _("Help"));
+	ActionManager::register_action (main_actions, X_("Help"), _("Help"));
  	ActionManager::register_action (main_actions, X_("KeyMouse Actions"), _("KeyMouse Actions"));
 	ActionManager::register_action (main_actions, X_("AudioFileFormat"), _("Audio File Format"));
 	ActionManager::register_action (main_actions, X_("AudioFileFormatHeader"), _("Header"));