diff options
author | Robin Gareus <robin@gareus.org> | 2016-05-06 03:59:02 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2016-05-06 03:59:02 +0200 |
commit | 05baa2d1c11116679172c6faadc21d01e5f5565b (patch) | |
tree | 4f94e43a8fd177019849f8d4119c459aa2a2cf9d | |
parent | cdb1395a99fa5f8a4f97305065cf11fbb48c8d6e (diff) |
use WindowManager toggle API for script-manager
-rw-r--r-- | gtk2_ardour/ardour.menus.in | 2 | ||||
-rw-r--r-- | gtk2_ardour/ardour_ui.h | 2 | ||||
-rw-r--r-- | gtk2_ardour/ardour_ui_dialogs.cc | 6 | ||||
-rw-r--r-- | gtk2_ardour/editor.cc | 6 | ||||
-rw-r--r-- | gtk2_ardour/editor.h | 1 | ||||
-rw-r--r-- | gtk2_ardour/editor_actions.cc | 3 | ||||
-rw-r--r-- | gtk2_ardour/lua_script_manager.cc | 6 | ||||
-rw-r--r-- | gtk2_ardour/lua_script_manager.h | 1 |
8 files changed, 1 insertions, 26 deletions
diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in index e54e021267..e9128da8b8 100644 --- a/gtk2_ardour/ardour.menus.in +++ b/gtk2_ardour/ardour.menus.in @@ -282,7 +282,7 @@ <menuitem action='set-mouse-mode-object-range'/> <separator/> <menu action="ActionScripts"> - <menuitem action='manage-action-scripts'/> + <menuitem action='toggle-script-manager'/> <separator/> <menuitem action='script-action-1'/> <menuitem action='script-action-2'/> diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index ab10e80136..6d2cb636e3 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -211,8 +211,6 @@ public: void toggle_monitor_section_visibility (); void toggle_keep_tearoffs(); - void lua_script_manager(); - static PublicEditor* _instance; /** Emitted frequently with the audible frame, false, and the edit point as diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc index a134a19b8f..8349683d5d 100644 --- a/gtk2_ardour/ardour_ui_dialogs.cc +++ b/gtk2_ardour/ardour_ui_dialogs.cc @@ -922,9 +922,3 @@ ARDOUR_UI::toggle_monitor_section_visibility () mixer->show_monitor_section (tact->get_active()); } } - -void -ARDOUR_UI::lua_script_manager () -{ - lua_script_window.show (); -} diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index c3b93fd86e..49b5b5491e 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -5727,12 +5727,6 @@ Editor::session_going_away () } void -Editor::manage_action_scripts () -{ - ARDOUR_UI::instance()->lua_script_manager(); -} - -void Editor::trigger_script (int i) { LuaInstance::instance()-> call_action (i); diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index c8a2f81777..fbe3f11741 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -1618,7 +1618,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void initialize_canvas (); - void manage_action_scripts (); void set_script_action_name (int i, const std::string&); /* display control */ diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index 3c26390aa6..39587d33e3 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -475,9 +475,6 @@ Editor::register_actions () myactions.register_action (editor_actions, X_("cycle-zoom-focus"), _("Next Zoom Focus"), sigc::mem_fun (*this, &Editor::cycle_zoom_focus)); - reg_sens (editor_actions, "manage-action-scripts", _("Manage"), - sigc::mem_fun(*this, &Editor::manage_action_scripts)); - for (int i = 1; i <= 9; ++i) { string const a = string_compose (X_("script-action-%1"), i); string const n = string_compose (_("Unset #%1"), i); diff --git a/gtk2_ardour/lua_script_manager.cc b/gtk2_ardour/lua_script_manager.cc index 7ac960ac53..279cd50e67 100644 --- a/gtk2_ardour/lua_script_manager.cc +++ b/gtk2_ardour/lua_script_manager.cc @@ -109,12 +109,6 @@ LuaScriptManager::LuaScriptManager () callback_selection_changed (); } -bool -LuaScriptManager::on_delete_event (GdkEventAny*) -{ - return false; -} - void LuaScriptManager::session_going_away () { diff --git a/gtk2_ardour/lua_script_manager.h b/gtk2_ardour/lua_script_manager.h index ef1f48ba92..03e2756c8a 100644 --- a/gtk2_ardour/lua_script_manager.h +++ b/gtk2_ardour/lua_script_manager.h @@ -31,7 +31,6 @@ public: LuaScriptManager (); protected: - bool on_delete_event (GdkEventAny*); void session_going_away(); private: |