change action group owner pointer to be the relevant keybindings; reorder setting...

[ardour.git] / gtk2_ardour / window_manager.cc

diff --git a/gtk2_ardour/window_manager.cc b/gtk2_ardour/window_manager.cc
index c9c8d78b6a4ac9389d7d5055c2dbc24c5bdf2722..493618bfcb34de1cba05ee9f979e79f765bbc639 100644 (file)
--- a/gtk2_ardour/window_manager.cc
+++ b/gtk2_ardour/window_manager.cc
@@ -32,7 +32,7 @@
 #include "window_manager.h"
 #include "processor_box.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using std::string;
 using namespace WM;
@@ -66,12 +66,12 @@ Manager::register_window (ProxyBase* info)
        if (!info->menu_name().empty()) {
 
                if (!window_actions) {
-                       window_actions = ARDOUR_UI::instance()->global_actions.create_action_group (X_("Window"));
+                       window_actions = ActionManager::create_action_group (Gtkmm2ext::UI::instance()->global_bindings, X_("Window"));
                }
 
-               info->set_action (ARDOUR_UI::instance()->global_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)));
+               ActionManager::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));
 
                info->signal_map.connect (sigc::bind (sigc::mem_fun (*this, &Manager::window_proxy_was_mapped), info));
                info->signal_unmap.connect (sigc::bind (sigc::mem_fun (*this, &Manager::window_proxy_was_unmapped), info));
@@ -82,7 +82,7 @@ Manager::register_window (ProxyBase* info)
 void
 Manager::window_proxy_was_mapped (ProxyBase* proxy)
 {
-       Glib::RefPtr<Gtk::Action> act = ARDOUR_UI::instance()->global_actions.find_action (string_compose ("%1/%2", window_actions->get_name(), proxy->action_name()));
+       Glib::RefPtr<Gtk::Action> act = ActionManager::get_action (string_compose ("%1/%2", window_actions->get_name(), proxy->action_name()));
        if (!act) {
                return;
        }
@@ -97,7 +97,7 @@ Manager::window_proxy_was_mapped (ProxyBase* proxy)
 void
 Manager::window_proxy_was_unmapped (ProxyBase* proxy)
 {
-       Glib::RefPtr<Gtk::Action> act = ARDOUR_UI::instance()->global_actions.find_action (string_compose ("%1/%2", window_actions->get_name(), proxy->action_name()));
+       Glib::RefPtr<Gtk::Action> act = ActionManager::get_action (string_compose ("%1/%2", window_actions->get_name(), proxy->action_name()));
        if (!act) {
                return;
        }
@@ -123,7 +123,7 @@ Manager::remove (const ProxyBase* info)
 void
 Manager::toggle_window (ProxyBase* proxy)
 {
-       Glib::RefPtr<Gtk::Action> act = ARDOUR_UI::instance()->global_actions.find_action (string_compose ("%1/%2", window_actions->get_name(), proxy->action_name()));
+       Glib::RefPtr<Gtk::Action> act = ActionManager::get_action (string_compose ("%1/%2", window_actions->get_name(), proxy->action_name()));
        if (!act) {
                return;
        }
@@ -255,11 +255,6 @@ ProxyTemporary::ProxyTemporary (const string& name, Gtk::Window* win)
        _window = win;
 }
 
-ProxyTemporary::~ProxyTemporary ()
-{
-}
-
-
 ARDOUR::SessionHandlePtr*
 ProxyTemporary::session_handle()
 {