diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-03-02 02:15:16 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-03-02 02:15:16 +0000 |
| commit | 50858919d38574f15af16f98d91826381b799864 (patch) | |
| tree | d691227909dd376115d4366193e813e17cf5be72 | |
| parent | 7ca751726b70a56cb51c3c7e929744aa63dc2c34 (diff) | |
Clean up Misc. Shortcuts menu.
git-svn-id: svn://localhost/ardour2/branches/3.0@9025 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/ardour.menus.in | 42 | ||||
| -rw-r--r-- | gtk2_ardour/editor_actions.cc | 3 |
2 files changed, 19 insertions, 26 deletions
diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in index 5d1e5aee11..8c2b1f7817 100644 --- a/gtk2_ardour/ardour.menus.in +++ b/gtk2_ardour/ardour.menus.in @@ -1,5 +1,13 @@ <ui> + <accelerator action='set-mouse-mode-object'/> + <accelerator action='set-mouse-mode-range'/> + <accelerator action='set-mouse-mode-gain'/> + <accelerator action='set-mouse-mode-zoom'/> + <accelerator action='set-mouse-mode-timefx'/> + <accelerator action='set-mouse-mode-object-range'/> + <accelerator action='toggle-internal-edit'/> + <menubar name='Main' action='MainMenu'> <menu name='Session' action='Session'> <menuitem action='New'/> @@ -162,6 +170,9 @@ <menuitem action='start-range'/> <menuitem action='finish-range'/> <menuitem action='finish-add-range'/> + <separator/> + <menuitem action='select-next-route'/> + <menuitem action='select-prev-route'/> </menu> <separator/> <menuitem action='editor-delete'/> @@ -189,33 +200,16 @@ <menuitem action='set-fade-out-length'/> <menuitem action='toggle-region-fade-out'/> </menu> + <menuitem action='brush-at-mouse'/> <separator/> <menuitem action='remove-last-capture'/> <separator/> - <menu action='KeyMouseActions'> - <menuitem action='select-next-route'/> - <menuitem action='select-prev-route'/> - <menuitem action='brush-at-mouse'/> - <separator/> - <menuitem action='step-mouse-mode'/> - <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'/> - <menuitem action='set-mouse-mode-object-range'/> - <separator/> - <menuitem action='toggle-internal-edit'/> - <separator/> - <menuitem action='cycle-edit-point'/> - <menuitem action='cycle-edit-point-with-marker'/> - <menuitem action='toggle-edit-mode'/> - <separator/> - <menuitem action='boost-region-gain'/> - <menuitem action='cut-region-gain'/> - <separator/> - <menuitem action='escape'/> - </menu> + <menu action="EditPointMenu"> + <menuitem action='cycle-edit-point'/> + <menuitem action='cycle-edit-point-with-marker'/> + </menu> + <menuitem action='toggle-edit-mode'/> + <separator/> <menu action="TempoMenu"> <menuitem action='set-tempo-from-region'/> <menuitem action='set-tempo-from-edit-range'/> diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index 62ab66207d..57754298f8 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -76,7 +76,6 @@ Editor::register_actions () ActionManager::register_action (editor_actions, X_("RegionMenuDuplicate"), _("Duplicate")); ActionManager::register_action (editor_actions, X_("Link"), _("Link")); ActionManager::register_action (editor_actions, X_("ZoomFocusMenu"), _("Zoom Focus")); - ActionManager::register_action (editor_actions, X_("KeyMouseActions"), _("Key Mouse")); ActionManager::register_action (editor_actions, X_("LocateToMarker"), _("Locate to Markers")); ActionManager::register_action (editor_actions, X_("MarkerMenu"), _("Markers")); ActionManager::register_action (editor_actions, X_("MeterFalloff"), _("Meter falloff")); @@ -370,7 +369,7 @@ Editor::register_actions () act = ActionManager::register_action (editor_actions, "editor-paste", _("Paste"), sigc::mem_fun(*this, &Editor::keyboard_paste)); ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "set-tempo-from-edit-range", _("Set Tempo from Edit Range=Bar"), sigc::mem_fun(*this, &Editor::use_range_as_bar)); + act = ActionManager::register_action (editor_actions, "set-tempo-from-edit-range", _("Set Tempo from Edit Range = Bar"), sigc::mem_fun(*this, &Editor::use_range_as_bar)); ActionManager::session_sensitive_actions.push_back (act); act = ActionManager::register_toggle_action (editor_actions, "toggle-log-window", _("Log"), |