From b9ad6710e0423e48a18c24da871f7b382964a757 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Tue, 6 May 2008 01:52:59 +0000
Subject: [PATCH] minor tweaks to View/Zoom menus

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3315 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/ardour.menus      | 16 ++++++++--------
 gtk2_ardour/editor_actions.cc |  3 +--
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/gtk2_ardour/ardour.menus b/gtk2_ardour/ardour.menus
index c5e81d9546..5df1eceef2 100644
--- a/gtk2_ardour/ardour.menus
+++ b/gtk2_ardour/ardour.menus
@@ -252,6 +252,14 @@
 	</menu>
 
         <menu name='View' action = 'View'>
+	       <menu action="ZoomMenu">
+               	     <menuitem action='temporal-zoom-in'/>
+               	     <menuitem action='temporal-zoom-out'/>
+               	     <menuitem action='zoom-to-session'/>
+               	     <menuitem action='zoom-to-region'/>
+               	     <menuitem action='zoom-to-region-both-axes'/>
+               	     <menuitem action='toggle-zoom'/>
+	       </menu>
                <menu name='ZoomFocus' action='ZoomFocus'>
                    <menuitem action='zoom-focus-left'/>
                    <menuitem action='zoom-focus-right'/>
@@ -326,14 +334,6 @@
 	       	     <menuitem action="toggle-cd-marker-ruler"/>
 	       	     <menuitem action="toggle-marker-ruler"/>
 	       </menu>
-	       <menu action="ZoomMenu">
-               	     <menuitem action='temporal-zoom-in'/>
-               	     <menuitem action='temporal-zoom-out'/>
-               	     <menuitem action='zoom-to-session'/>
-               	     <menuitem action='zoom-to-region'/>
-               	     <menuitem action='zoom-to-region-both-axes'/>
-               	     <menuitem action='toggle-zoom'/>
-	       </menu>
 	       <menu action="ScrollMenu">
                	     <menuitem action='scroll-tracks-down'/>
                	     <menuitem action='scroll-tracks-up'/>
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index 5093c87576..9c7fb3a074 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -92,9 +92,8 @@ Editor::register_actions ()
 	ActionManager::register_action (editor_actions, X_("TrimMenu"), _("Trim"));
 	ActionManager::register_action (editor_actions, X_("View"), _("View"));
 	ActionManager::register_action (editor_actions, X_("WaveformMenu"), _("Waveforms"));
-	ActionManager::register_action (editor_actions, X_("ZoomFocus"), _("Zoom"));
+	ActionManager::register_action (editor_actions, X_("ZoomFocus"), _("Zoom Focus"));
 	ActionManager::register_action (editor_actions, X_("ZoomMenu"), _("Zoom"));
-	ActionManager::register_action (editor_actions, X_("ZoomFocusMenu"), _("Zoom Focus"));
 
 	ActionManager::register_toggle_action (editor_actions, "link-region-and-track-selection", _("Link Region/Track Selection"), mem_fun (*this, &Editor::toggle_link_region_and_track_selection));
 	ActionManager::register_action (editor_actions, "break-drag", _("Break drag"), mem_fun (*this, &Editor::break_drag));
-- 
2.30.2