use WindowManager toggle API for script-manager

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index e54e021267dfe890fcc33d4642875dbbc1904d30..e9128da8b81d8bccd472a88265e0148c28ac47cb 100644 (file)
--- 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 ab10e80136ea0472d698a41d5ca007a5e77d6766..6d2cb636e3d2f0c92fc7fcc48978a85345b15ff5 100644 (file)
--- 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 a134a19b8fa4d9a303c27017d0fa4653c086d80b..8349683d5d09ba1cd4dd7628ffa8759de5bea38f 100644 (file)
--- 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 c3b93fd86e1c71071a97910cd1234dea845be5ee..49b5b5491e49b51128696b6ab4cc4ab0a47f5d8f 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -5726,12 +5726,6 @@ Editor::session_going_away ()
        SessionHandlePtr::session_going_away ();
 }
 
-void
-Editor::manage_action_scripts ()
-{
-       ARDOUR_UI::instance()->lua_script_manager();
-}
-
 void
 Editor::trigger_script (int i)
 {

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index c8a2f817775bbd0d613ca13e691dfbbbeec247a5..fbe3f117410ff42f4aacff9ed37ffbc798713ab6 100644 (file)
--- 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 3c26390aa63e30994a21f5d66f500d4d27abe411..39587d33e3b268ff403260ec07a50b161f8ff179 100644 (file)
--- 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 7ac960ac533ee48490d85b4e45dec5cef83e51ed..279cd50e67e7b88cb6b1e6dcec2bf003e735f0a7 100644 (file)
--- 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 ef1f48ba92140416474264dbd954a01c4f14ff37..03e2756c8a9cb81875973b97f2d147efeaaeeebd 100644 (file)
--- 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: