diff options
author | Carl Hetherington <carl@carlh.net> | 2011-04-03 20:57:04 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2011-04-03 20:57:04 +0000 |
commit | 1ec69a3b7007278fbe1fe349494ccb1881b9c2cd (patch) | |
tree | 52bea50d8aed5567f384e54ffbb224f6be87ab67 /gtk2_ardour | |
parent | 58f386961be8ee024dcd6bc637e06ec94a43bae4 (diff) |
Fix Transport->Play->Play option name, and rename Play Selection to Play Selected Range (part of #3927).
git-svn-id: svn://localhost/ardour2/branches/3.0@9274 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/ardour.menus.in | 2 | ||||
-rw-r--r-- | gtk2_ardour/ardour_ui_ed.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/editor_actions.cc | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in index ef3201e05f..db5a78eab7 100644 --- a/gtk2_ardour/ardour.menus.in +++ b/gtk2_ardour/ardour.menus.in @@ -51,7 +51,7 @@ <menu name='Transport' action='Transport'> <menuitem action='ToggleRoll'/> <menu action="PlayMenu"> - <menuitem action='play-selected-regions'/> + <menuitem action='main-menu-play-selected-regions'/> <menuitem action='play-edit-range'/> <menuitem action='PlaySelection'/> <menuitem action='play-from-edit-point-and-return'/> diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index b90e67bc19..81cf8091e2 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -308,7 +308,7 @@ ARDOUR_UI::install_actions () act = ActionManager::register_action (transport_actions, X_("Loop"), _("Play Loop Range"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_session_auto_loop)); ActionManager::session_sensitive_actions.push_back (act); ActionManager::transport_sensitive_actions.push_back (act); - act = ActionManager::register_action (transport_actions, X_("PlaySelection"), _("Play Selection"), sigc::mem_fun(*this, &ARDOUR_UI::transport_play_selection)); + act = ActionManager::register_action (transport_actions, X_("PlaySelection"), _("Play Selected Range"), sigc::mem_fun(*this, &ARDOUR_UI::transport_play_selection)); ActionManager::session_sensitive_actions.push_back (act); ActionManager::transport_sensitive_actions.push_back (act); diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index a8db2414c6..ffbec63494 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -264,6 +264,8 @@ Editor::register_actions () reg_sens (editor_actions, "set-loop-from-edit-range", _("Set Loop from Edit Range"), sigc::bind (sigc::mem_fun(*this, &Editor::set_loop_from_edit_range), false)); reg_sens (editor_actions, "set-punch-from-edit-range", _("Set Punch from Edit Range"), sigc::mem_fun(*this, &Editor::set_punch_from_edit_range)); + /* this is a duplicated action so that the main menu can use a different label */ + reg_sens (editor_actions, "main-menu-play-selected-regions", _("Play Selected Regions"), sigc::mem_fun (*this, &Editor::play_selected_region)); reg_sens (editor_actions, "play-from-edit-point", _("Play From Edit Point"), sigc::mem_fun(*this, &Editor::play_from_edit_point)); reg_sens (editor_actions, "play-from-edit-point-and-return", _("Play from Edit Point and Return"), sigc::mem_fun(*this, &Editor::play_from_edit_point_and_return)); |