show-editor and show-mixer actions are now part of Common, not Window or Mixer action groups
This is a bit arbitary but they are supposed to be invokable from anywhere, and since they control Tabbables and note pure windows, they are not part of WM::Manager's purview (Window/* actions). Thus ... Common
This commit is contained in:
parent
5b513828bd
commit
12a88c9706
@ -229,7 +229,7 @@ This mode provides many different operations on both regions and control points,
|
||||
@sess|Main/AddTrackBus|<@PRIMARY@><@TERTIARY@>n|add track(s) or bus(ses)
|
||||
@sess|Main/New|<@PRIMARY@>n|open a new session
|
||||
@wvis|Window/toggle-midi-connection-manager|<@SECONDARY@><@TERTIARY@>m|toggle global midi patchbay
|
||||
@wvis|Window/show-mixer|<@SECONDARY@>m|show mixer window
|
||||
@wvis|Common/show-mixer|<@SECONDARY@>m|show mixer window
|
||||
|
||||
@gmon|Monitor/monitor-cut-all|<@PRIMARY@>m|monitor cut all
|
||||
@gmon|Monitor/monitor-mono|<@PRIMARY@><@SECONDARY@>m|monitor mono
|
||||
|
@ -278,8 +278,9 @@ ARDOUR_UI::install_actions ()
|
||||
ActionManager::register_action (common_actions, X_("detach-mixer"), _("Detach"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::detach_tabbable), mixer));
|
||||
ActionManager::register_action (common_actions, X_("detach-preferences"), _("Detach"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::detach_tabbable), rc_option_editor));
|
||||
|
||||
Glib::RefPtr<Gtk::ActionGroup> window_actions = ActionManager::create_action_group (X_("Window"));
|
||||
ActionManager::register_action (window_actions, X_("show-mixer"), _("Show Mixer"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::show_tabbable), mixer));
|
||||
ActionManager::register_action (common_actions, X_("show-mixer"), _("Show Mixer"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::show_tabbable), mixer));
|
||||
ActionManager::register_action (common_actions, X_("show-editor"), _("Show Editor"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::show_tabbable), editor));
|
||||
|
||||
|
||||
/* these actions are all currently implemented by the Editor, but need
|
||||
* to be accessible from anywhere as actions.
|
||||
|
@ -17,7 +17,7 @@
|
||||
<Binding key="Return" action="Mixer/toggle-processors" group="Processor operations on the selected strip(s)"/>
|
||||
<Binding key="Primary-a" action="Mixer/select-all-processors" group="Processor operations on the selected strip(s)"/>
|
||||
<Binding key="slash" action="Mixer/ab-plugins" group="Processor operations on the selected strip(s)"/>
|
||||
<Binding key="Secondary-m" action="Mixer/show-editor" group="Window Visibility"/>
|
||||
<Binding key="Secondary-m" action="Common/show-editor" group="Window Visibility"/>
|
||||
<Binding key="Secondary-Down" action="Mixer/select-next-stripable" group="Window Visibility"/>
|
||||
<Binding key="Secondary-Up" action="Mixer/select-prev-stripable" group="Window Visibility"/>
|
||||
|
||||
|
@ -3202,18 +3202,10 @@ Mixer_UI::showing_spill_for (boost::shared_ptr<Stripable> s) const
|
||||
return s == spilled_strip.lock();
|
||||
}
|
||||
|
||||
void
|
||||
Mixer_UI::show_editor_window () const
|
||||
{
|
||||
PublicEditor::instance().make_visible ();
|
||||
}
|
||||
|
||||
void
|
||||
Mixer_UI::register_actions ()
|
||||
{
|
||||
Glib::RefPtr<ActionGroup> group = ActionManager::create_action_group (X_("Mixer"));
|
||||
|
||||
ActionManager::register_action (group, "show-editor", _("Show Editor"), sigc::mem_fun (*this, &Mixer_UI::show_editor_window));
|
||||
Glib::RefPtr<ActionGroup> group = ActionManager::create_action_group (this, X_("Mixer"));
|
||||
|
||||
ActionManager::register_action (group, "solo", _("Toggle Solo on Mixer-Selected Tracks/Busses"), sigc::mem_fun (*this, &Mixer_UI::solo_action));
|
||||
ActionManager::register_action (group, "mute", _("Toggle Mute on Mixer-Selected Tracks/Busses"), sigc::mem_fun (*this, &Mixer_UI::mute_action));
|
||||
|
Loading…
Reference in New Issue
Block a user