diff options
| author | Ben Loftis <ben@harrisonconsoles.com> | 2017-07-21 14:44:37 -0500 |
|---|---|---|
| committer | Ben Loftis <ben@harrisonconsoles.com> | 2017-07-21 14:44:37 -0500 |
| commit | 36f70d2bc2f88bfeb362e76be573146f699e1bd9 (patch) | |
| tree | 39d8f557eaafbed5317cd0cbc77c4374b89132e8 | |
| parent | addcca9ff3c1c10ee6e211578cedbf976c27803c (diff) | |
Main Menu: some re-organization of session- and global-centric windows.
| -rw-r--r-- | gtk2_ardour/ardour.menus.in | 32 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui_ed.cc | 2 |
2 files changed, 17 insertions, 17 deletions
diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in index e216c22d20..668df5c905 100644 --- a/gtk2_ardour/ardour.menus.in +++ b/gtk2_ardour/ardour.menus.in @@ -14,12 +14,7 @@ <menuitem action='SnapshotSwitch'/> #endif <menuitem action='SaveTemplate'/> - <menuitem action='ManageTemplates'/> <menuitem action='Archive'/> - <menu name='Metadata' action='Metadata'> - <menuitem action='EditMetadata'/> - <menuitem action='ImportMetadata'/> - </menu> <separator/> <menuitem action='AddTrackBus'/> <separator/> @@ -37,14 +32,18 @@ <menuitem action='StemExport'/> <menuitem action='ExportVideo'/> </menu> + <separator/> + <menuitem action='toggle-session-options-editor'/> + <menu name='Metadata' action='Metadata'> + <menuitem action='EditMetadata'/> + <menuitem action='ImportMetadata'/> + </menu> <menu name='Cleanup' action='Cleanup'> <menuitem action='bring-into-session'/> <menuitem action='CleanupPeakFiles'/> <menuitem action='CleanupUnused'/> <menuitem action='FlushWastebasket'/> </menu> - <separator/> - <menuitem action='toggle-session-options-editor'/> #ifdef __APPLE__ <menuitem action='toggle-about'/> #endif @@ -560,13 +559,11 @@ <menuitem action='detach-preferences'/> </menu> <menuitem action='toggle-meterbridge'/> - <menuitem action='toggle-luawindow'/> <separator/> #ifndef MIXBUS <menuitem action='toggle-inspector'/> #endif <menuitem action='toggle-locations'/> - <menuitem action='toggle-key-editor'/> #ifndef MIXBUS <menuitem action='toggle-bundle-manager'/> #endif @@ -579,18 +576,21 @@ #endif <separator/> -#ifdef MIXBUS - <menuitem action='license-manager'/> - - <separator/> -#endif - <menuitem action='ToggleJadeo'/> <separator/> - <menuitem action='NewMIDITracer'/> <menuitem action='toggle-audio-connection-manager'/> <menuitem action='toggle-midi-connection-manager'/> + <separator/> + <menuitem action='toggle-luawindow'/> + <menuitem action='ManageTemplates'/> + <menuitem action='toggle-key-editor'/> + <separator/> +#ifdef MIXBUS + <menuitem action='license-manager'/> + <separator/> +#endif + <menuitem action='NewMIDITracer'/> <menuitem action='toggle-log-window'/> <separator/> </menu> diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index 1a2188c85c..bc40973f2f 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -223,7 +223,7 @@ ARDOUR_UI::install_actions () act = global_actions.register_action (main_actions, X_("SaveTemplate"), _("Save Template..."), sigc::mem_fun(*this, &ARDOUR_UI::save_template)); ActionManager::session_sensitive_actions.push_back (act); - act = global_actions.register_action (main_actions, X_("ManageTemplates"), _("Manage Templates..."), sigc::mem_fun(*this, &ARDOUR_UI::manage_templates)); + act = global_actions.register_action (main_actions, X_("ManageTemplates"), _("Templates"), sigc::mem_fun(*this, &ARDOUR_UI::manage_templates)); ActionManager::session_sensitive_actions.push_back (act); act = global_actions.register_action (main_actions, X_("Metadata"), _("Metadata")); |