ardour/livetrax
13
0
Fork 0
Code

Window Manager object should use global action map, since bindings are part of the global set

Browse Source
This commit is contained in:
Paul Davis 2015-09-01 13:51:59 -04:00
parent f6721344bd
commit 75e671b867
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk2_ardour/window_manager.cc
View File

@ -66,12 +66,12 @@ Manager::register_window (ProxyBase* info)
if (!info->menu_name().empty()) { if (!info->menu_name().empty()) {
if (!window_actions) { if (!window_actions) {
window_actions = window_action_map.create_action_group (X_("Window")); window_actions = ARDOUR_UI::instance()->global_actions.create_action_group (X_("Window"));
} }
info->set_action (window_action_map.register_toggle_action (window_actions, info->set_action (ARDOUR_UI::instance()->global_actions.register_toggle_action (window_actions,
info->action_name().c_str(), info->menu_name().c_str(), info->action_name().c_str(), info->menu_name().c_str(),
sigc::bind (sigc::mem_fun (*this, &Manager::toggle_window), info))); sigc::bind (sigc::mem_fun (*this, &Manager::toggle_window), info)));
} }
} }
@ -90,7 +90,7 @@ void
Manager::toggle_window (ProxyBase* proxy) Manager::toggle_window (ProxyBase* proxy)
{ {
Glib::RefPtr<Gtk::Action> act = window_action_map.find_action (string_compose ("%1/%2", window_actions->get_name(), proxy->action_name())); Glib::RefPtr<Gtk::Action> act = ARDOUR_UI::instance()->global_actions.find_action (string_compose ("%1/%2", window_actions->get_name(), proxy->action_name()));
if (!act) { if (!act) {
return; return;
} }

1
gtk2_ardour/window_manager.h
View File

@ -71,7 +71,6 @@ class Manager : public ARDOUR::SessionHandlePtr
Windows _windows; Windows _windows;
Glib::RefPtr<Gtk::ActionGroup> window_actions; Glib::RefPtr<Gtk::ActionGroup> window_actions;
Gtk::Window* current_transient_parent; Gtk::Window* current_transient_parent;
Gtkmm2ext::ActionMap window_action_map;
Manager(); Manager();
~Manager(); ~Manager();