radically change Keyboard/Binding API design to disconnect Gtk::Action lookup from...

[ardour.git] / gtk2_ardour / window_manager.cc

diff --git a/gtk2_ardour/window_manager.cc b/gtk2_ardour/window_manager.cc
index cf336903b26976c28a6ee88cd36860f6a6de4874..eda294364867eae3600ee72f8365fb4b52207e40 100644 (file)
--- a/gtk2_ardour/window_manager.cc
+++ b/gtk2_ardour/window_manager.cc
@@ -22,10 +22,12 @@
 
 #include "ardour/session_handle.h"
 
+#include "gtkmm2ext/bindings.h"
 #include "gtkmm2ext/visibility_tracker.h"
 
 #include "actions.h"
 #include "ardour_dialog.h"
+#include "ardour_ui.h"
 #include "ardour_window.h"
 #include "window_manager.h"
 #include "processor_box.h"
@@ -64,12 +66,12 @@ Manager::register_window (ProxyBase* info)
        if (!info->menu_name().empty()) {
 
                if (!window_actions) {
-                       window_actions = Gtk::ActionGroup::create (X_("Window"));
-                       ActionManager::add_action_group (window_actions);
+                       window_actions = Gtkmm2ext::Actions.create_action_group (X_("Window"));
                }
 
-               // info->set_action (ActionManager::register_action (window_actions, info->action_name().c_str(), info->menu_name().c_str(), 
-               // sigc::bind (sigc::mem_fun (*this, &Manager::toggle_window), info)));
+               info->set_action (Gtkmm2ext::Actions.register_toggle_action (window_actions,
+                                                                            info->action_name().c_str(), info->menu_name().c_str(),
+                                                                            sigc::bind (sigc::mem_fun (*this, &Manager::toggle_window), info)));
        }
 }
 
@@ -87,8 +89,20 @@ Manager::remove (const ProxyBase* info)
 void
 Manager::toggle_window (ProxyBase* proxy)
 {
-       if (proxy) {
-               proxy->toggle ();
+
+       Glib::RefPtr<Gtk::Action> act = Gtkmm2ext::Actions.find_action (string_compose ("%1/%2", window_actions->get_name(), proxy->action_name()));
+       if (!act) {
+               return;
+       }
+       Glib::RefPtr<Gtk::ToggleAction> tact = Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic (act);
+       if (!tact) {
+               return;
+       }
+
+       if (tact->get_active()) {
+               proxy->present ();
+       } else {
+               proxy->hide ();
        }
 }