use new method in MidiPatchManager to use MIDNAM data when setting a MidiTimeAxisView

[ardour.git] / gtk2_ardour / editor_actions.cc

diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index 76dba12ff7570f652f005dbe1e2e1433beafa968..adb783ca54ef0f47aecba565149fa694fd686b5d 100644 (file)
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -482,10 +482,12 @@ Editor::register_actions ()
 
        ActionManager::register_action (editor_actions, X_("cycle-zoom-focus"), _("Next Zoom Focus"), sigc::mem_fun (*this, &Editor::cycle_zoom_focus));
 
+       Glib::RefPtr<ActionGroup> lua_script_actions = ActionManager::create_action_group (bindings, X_("LuaAction"));
+
        for (int i = 1; i <= MAX_LUA_ACTION_SCRIPTS; ++i) {
                string const a = string_compose (X_("script-action-%1"), i);
                string const n = string_compose (_("Unset #%1"), i);
-               act = ActionManager::register_action (editor_actions, a.c_str(), n.c_str(), sigc::bind (sigc::mem_fun (*this, &Editor::trigger_script), i - 1));
+               act = ActionManager::register_action (lua_script_actions, a.c_str(), n.c_str(), sigc::bind (sigc::mem_fun (*this, &Editor::trigger_script), i - 1));
                act->set_tooltip (_("no action bound"));
                act->set_sensitive (false);
        }
@@ -529,12 +531,10 @@ Editor::register_actions ()
        mouse_content_button.set_icon (ArdourWidgets::ArdourIcon::ToolContent);
        mouse_content_button.set_name ("mouse mode button");
 
-       if(!Profile->get_mixbus()) {
-               act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-cut", _("Cut Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseCut));
-               mouse_cut_button.set_related_action (act);
-               mouse_cut_button.set_icon (ArdourWidgets::ArdourIcon::ToolCut);
-               mouse_cut_button.set_name ("mouse mode button");
-       }
+       act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-cut", _("Cut Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseCut));
+       mouse_cut_button.set_related_action (act);
+       mouse_cut_button.set_icon (ArdourWidgets::ArdourIcon::ToolCut);
+       mouse_cut_button.set_name ("mouse mode button");
 
        ActionManager::register_action (editor_actions, "step-mouse-mode", _("Step Mouse Mode"), sigc::bind (sigc::mem_fun(*this, &Editor::step_mouse_mode), true));
 
@@ -628,29 +628,16 @@ Editor::register_actions ()
 
        no_ruler_shown_update = true;
 
-       if (Profile->get_trx()) {
-               ruler_marker_action->set_active (true);
-               ruler_meter_action->set_active (false);
-               ruler_tempo_action->set_active (false);
-               ruler_range_action->set_active (false);
-               ruler_loop_punch_action->set_active (false);
-               ruler_loop_punch_action->set_active (false);
-               ruler_bbt_action->set_active (true);
-               ruler_cd_marker_action->set_active (false);
-               ruler_timecode_action->set_active (false);
-               ruler_minsec_action->set_active (true);
-       } else {
-               ruler_marker_action->set_active (true);
-               ruler_meter_action->set_active (true);
-               ruler_tempo_action->set_active (true);
-               ruler_range_action->set_active (true);
-               ruler_loop_punch_action->set_active (true);
-               ruler_loop_punch_action->set_active (true);
-               ruler_bbt_action->set_active (true);
-               ruler_cd_marker_action->set_active (true);
-               ruler_timecode_action->set_active (true);
-               ruler_minsec_action->set_active (false);
-       }
+       ruler_marker_action->set_active (true);
+       ruler_meter_action->set_active (true);
+       ruler_tempo_action->set_active (true);
+       ruler_range_action->set_active (true);
+       ruler_loop_punch_action->set_active (true);
+       ruler_loop_punch_action->set_active (true);
+       ruler_bbt_action->set_active (true);
+       ruler_cd_marker_action->set_active (true);
+       ruler_timecode_action->set_active (true);
+       ruler_minsec_action->set_active (false);
 
        ruler_video_action->set_active (false);
        xjadeo_proc_action->set_active (false);