diff --git a/gtk2_ardour/ardour.keys.in b/gtk2_ardour/ardour.keys.in index 019183507e..656a261bce 100644 --- a/gtk2_ardour/ardour.keys.in +++ b/gtk2_ardour/ardour.keys.in @@ -231,9 +231,9 @@ This mode provides many different operations on both regions and control points, @wvis|Window/toggle-midi-connection-manager|<@SECONDARY@><@TERTIARY@>m|toggle global midi patchbay @wvis|Window/show-mixer|<@SECONDARY@>m|show mixer window -@gmon|Transport/monitor-cut-all|<@PRIMARY@>m|monitor cut all -@gmon|Transport/monitor-mono|<@PRIMARY@><@SECONDARY@>m|monitor mono -@gmon|Transport/monitor-dim-all|<@PRIMARY@><@TERTIARY@>m|monitor dim +@gmon|Monitor/monitor-cut-all|<@PRIMARY@>m|monitor cut all +@gmon|Monitor/monitor-mono|<@PRIMARY@><@SECONDARY@>m|monitor mono +@gmon|Monitor/monitor-dim-all|<@PRIMARY@><@TERTIARY@>m|monitor dim ;; arrow keys, navigation etc. diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index b4253318c8..9321f13137 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -5996,7 +5996,7 @@ ARDOUR_UI::monitor_dim_all () } boost::shared_ptr _monitor = mon->monitor_control (); - Glib::RefPtr act = global_actions.find_action (X_("Transport"), "monitor-dim-all"); + Glib::RefPtr act = global_actions.find_action (X_("Monitor"), "monitor-dim-all"); assert (act); Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(act); assert (tact); _monitor->set_dim_all (tact->get_active()); } @@ -6010,7 +6010,7 @@ ARDOUR_UI::monitor_cut_all () } boost::shared_ptr _monitor = mon->monitor_control (); - Glib::RefPtr act = global_actions.find_action (X_("Transport"), "monitor-cut-all"); + Glib::RefPtr act = global_actions.find_action (X_("Monitor"), "monitor-cut-all"); assert (act); Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(act); assert (tact); _monitor->set_cut_all (tact->get_active()); } @@ -6024,7 +6024,7 @@ ARDOUR_UI::monitor_mono () } boost::shared_ptr _monitor = mon->monitor_control (); - Glib::RefPtr act = global_actions.find_action (X_("Transport"), "monitor-mono"); + Glib::RefPtr act = global_actions.find_action (X_("Monitor"), "monitor-mono"); assert (act); Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(act); assert (tact);_monitor->set_mono (tact->get_active()); } diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index a2a5e7b6e6..6e9227dd6b 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -630,13 +630,15 @@ ARDOUR_UI::install_actions () act = global_actions.register_action (main_actions, X_("MonitorMenu"), _("Monitor Section")); ActionManager::session_sensitive_actions.push_back (act); - act = global_actions.register_toggle_action (transport_actions, X_("UseMonitorSection"), _("Use Monitor Section"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_use_monitor_section)); + Glib::RefPtr monitor_actions = global_actions.create_action_group (X_("Monitor")); + + act = global_actions.register_toggle_action (monitor_actions, X_("UseMonitorSection"), _("Use Monitor Section"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_use_monitor_section)); ActionManager::session_sensitive_actions.push_back (act); - act = global_actions.register_toggle_action (transport_actions, "monitor-mono", _("Monitor Section: Mono"), sigc::mem_fun (*this, &ARDOUR_UI::monitor_mono)); + act = global_actions.register_toggle_action (monitor_actions, "monitor-mono", _("Monitor Section: Mono"), sigc::mem_fun (*this, &ARDOUR_UI::monitor_mono)); act->set_sensitive(false); - act = global_actions.register_toggle_action (transport_actions, "monitor-cut-all", _("Monitor Section: Mute"), sigc::mem_fun (*this, &ARDOUR_UI::monitor_cut_all)); + act = global_actions.register_toggle_action (monitor_actions, "monitor-cut-all", _("Monitor Section: Mute"), sigc::mem_fun (*this, &ARDOUR_UI::monitor_cut_all)); act->set_sensitive(false); - act = global_actions.register_toggle_action (transport_actions, "monitor-dim-all", _("Monitor Section: Dim"), sigc::mem_fun (*this, &ARDOUR_UI::monitor_dim_all)); + act = global_actions.register_toggle_action (monitor_actions, "monitor-dim-all", _("Monitor Section: Dim"), sigc::mem_fun (*this, &ARDOUR_UI::monitor_dim_all)); act->set_sensitive(false); act = global_actions.register_toggle_action (transport_actions, X_("ToggleVideoSync"), _("Sync Startup to Video"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_video_sync)); diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index 706edf29e8..5ec3203654 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -2639,15 +2639,15 @@ Mixer_UI::monitor_section_going_away () Glib::RefPtr act; Glib::RefPtr tact; - act = ActionManager::get_action (X_("Transport"), "monitor-cut-all"); + act = ActionManager::get_action (X_("Monitor"), "monitor-cut-all"); assert (act); tact = Glib::RefPtr::cast_dynamic (act); assert (tact); tact->set_sensitive ( false ); - act = ActionManager::get_action (X_("Transport"), "monitor-dim-all"); + act = ActionManager::get_action (X_("Monitor"), "monitor-dim-all"); assert (act); tact = Glib::RefPtr::cast_dynamic (act); assert (tact); tact->set_sensitive ( false ); - act = ActionManager::get_action (X_("Transport"), "monitor-mono"); + act = ActionManager::get_action (X_("Monitor"), "monitor-mono"); assert (act); tact = Glib::RefPtr::cast_dynamic (act); assert (tact); tact->set_sensitive ( false ); @@ -2734,13 +2734,13 @@ Mixer_UI::monitor_section_attached () Glib::RefPtr act; - act = ActionManager::get_action (X_("Transport"), "monitor-cut-all"); + act = ActionManager::get_action (X_("Monitor"), "monitor-cut-all"); assert (act); act->set_sensitive ( true ); - act = ActionManager::get_action (X_("Transport"), "monitor-dim-all"); + act = ActionManager::get_action (X_("Monitor"), "monitor-dim-all"); assert (act); act->set_sensitive ( true ); - act = ActionManager::get_action (X_("Transport"), "monitor-mono"); + act = ActionManager::get_action (X_("Monitor"), "monitor-mono"); assert (act); act->set_sensitive ( true ); act = myactions.find_action ("Mixer", "ToggleMonitorSection"); diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc index 589bee555d..1fb8f79f72 100644 --- a/gtk2_ardour/monitor_section.cc +++ b/gtk2_ardour/monitor_section.cc @@ -260,7 +260,7 @@ MonitorSection::MonitorSection (Session* s) cut_all_button.set_size_request (-1, PX_SCALE(30)); cut_all_button.show (); - act = ActionManager::get_action (X_("Transport"), X_("monitor-cut-all")); + act = ActionManager::get_action (X_("Monitor"), X_("monitor-cut-all")); if (act) { cut_all_button.set_related_action (act); } @@ -269,7 +269,7 @@ MonitorSection::MonitorSection (Session* s) dim_all_button.set_text (_("Dim")); dim_all_button.set_name ("monitor section dim"); dim_all_button.set_size_request (-1, PX_SCALE(25)); - act = ActionManager::get_action (X_("Transport"), X_("monitor-dim-all")); + act = ActionManager::get_action (X_("Monitor"), X_("monitor-dim-all")); if (act) { dim_all_button.set_related_action (act); } @@ -278,7 +278,7 @@ MonitorSection::MonitorSection (Session* s) mono_button.set_text (_("Mono")); mono_button.set_name ("monitor section mono"); mono_button.set_size_request (-1, PX_SCALE(25)); - act = ActionManager::get_action (X_("Transport"), X_("monitor-mono")); + act = ActionManager::get_action (X_("Monitor"), X_("monitor-mono")); if (act) { mono_button.set_related_action (act); } @@ -812,7 +812,7 @@ MonitorSection::dim_all () return; } - Glib::RefPtr act = ActionManager::get_action (X_("Transport"), "monitor-dim-all"); + Glib::RefPtr act = ActionManager::get_action (X_("Monitor"), "monitor-dim-all"); if (act) { Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(act); _monitor->set_dim_all (tact->get_active()); @@ -827,7 +827,7 @@ MonitorSection::cut_all () return; } - Glib::RefPtr act = ActionManager::get_action (X_("Transport"), "monitor-cut-all"); + Glib::RefPtr act = ActionManager::get_action (X_("Monitor"), "monitor-cut-all"); if (act) { Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(act); _monitor->set_cut_all (tact->get_active()); @@ -841,7 +841,7 @@ MonitorSection::mono () return; } - Glib::RefPtr act = ActionManager::get_action (X_("Transport"), "monitor-mono"); + Glib::RefPtr act = ActionManager::get_action (X_("Monitor"), "monitor-mono"); if (act) { Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(act); _monitor->set_mono (tact->get_active()); @@ -1099,7 +1099,7 @@ MonitorSection::map_state () Glib::RefPtr act; Glib::RefPtr tact; - act = ActionManager::get_action (X_("Transport"), "monitor-cut-all"); + act = ActionManager::get_action (X_("Monitor"), "monitor-cut-all"); if (act) { tact = Glib::RefPtr::cast_dynamic (act); if (tact) { @@ -1107,7 +1107,7 @@ MonitorSection::map_state () } } - act = ActionManager::get_action (X_("Transport"), "monitor-dim-all"); + act = ActionManager::get_action (X_("Monitor"), "monitor-dim-all"); if (act) { tact = Glib::RefPtr::cast_dynamic (act); if (tact) { @@ -1115,7 +1115,7 @@ MonitorSection::map_state () } } - act = ActionManager::get_action (X_("Transport"), "monitor-mono"); + act = ActionManager::get_action (X_("Monitor"), "monitor-mono"); if (act) { tact = Glib::RefPtr::cast_dynamic (act); if (tact) {