minor tweaks to View/Zoom menus

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3315 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/ardour.menus b/gtk2_ardour/ardour.menus
index c5e81d95464c32001d3a44317ebac218ddebc447..5df1eceef22a404634fe04dbaaa92b669b1713f0 100644 (file)
--- 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 5093c875767b8d7bebd9d42d96459867542b2618..9c7fb3a07428aaca49f6af83544334ab568485fb 100644 (file)
--- 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));