action maps now have names

7 files changed, 8 insertions, 3 deletions

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 8f05f60777..30113ece44 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -238,6 +238,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
 	, secondary_clock (new MainClock (X_("secondary"), X_("secondary"), false))
 	, big_clock (new AudioClock (X_("bigclock"), false, "big", true, true, false, false))
 	, video_timeline(0)
+	, global_actions (X_("global"))
 	, ignore_dual_punch (false)
 	, editor (0)
 	, mixer (0)
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index d4b3f5798d..ace51c79cb 100644
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -333,6 +333,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 	bool tabbed_window_state_event_handler (GdkEventWindowState*, void* object);
 	bool key_event_handler (GdkEventKey*, Gtk::Window* window);
 
+	Gtkmm2ext::ActionMap global_actions;
+
   protected:
 	friend class PublicEditor;
 
@@ -830,8 +832,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 	bool idle_ask_about_quit ();
 
 	void load_bindings ();
-
-	Gtkmm2ext::ActionMap global_actions;
 };
 
 #endif /* __ardour_gui_h__ */
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 314c92b73f..ecececc40c 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -461,6 +461,7 @@ Editor::Editor ()
 	, _stepping_axis_view (0)
 	, quantize_dialog (0)
 	, _main_menu_disabler (0)
+	, myactions (X_("editor"))
 {
 	/* we are a singleton */
 
diff --git a/gtk2_ardour/mixer_actor.cc b/gtk2_ardour/mixer_actor.cc
index 6b106c0d8d..b2d34040d8 100644
--- a/gtk2_ardour/mixer_actor.cc
+++ b/gtk2_ardour/mixer_actor.cc
@@ -44,6 +44,7 @@ using namespace PBD;
 using Gtkmm2ext::Bindings;
 
 MixerActor::MixerActor ()
+	: myactions (X_("mixer"))
 {
 	register_actions ();
 	load_bindings ();
diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc
index 9b12723ac5..2a7593c58c 100644
--- a/gtk2_ardour/monitor_section.cc
+++ b/gtk2_ardour/monitor_section.cc
@@ -83,6 +83,7 @@ MonitorSection::MonitorSection (Session* s)
 	, toggle_processorbox_button (ArdourButton::default_elements)
 	, _inhibit_solo_model_update (false)
 	, _ui_initialized (false)
+	, myactions (X_("monitor section"))
 	, bindings (0)
 {
 
diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index 239e005915..cb2ad7a7e1 100644
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -102,7 +102,7 @@ RefPtr<Action> ProcessorBox::rename_action;
 RefPtr<Action> ProcessorBox::delete_action;
 RefPtr<Action> ProcessorBox::edit_action;
 RefPtr<Action> ProcessorBox::edit_generic_action;
-ActionMap      ProcessorBox::processor_box_actions;
+ActionMap      ProcessorBox::processor_box_actions (X_("processor box"));
 
 static const uint32_t audio_port_color = 0x4A8A0EFF; // Green
 static const uint32_t midi_port_color = 0x960909FF; //Red
diff --git a/gtk2_ardour/step_entry.cc b/gtk2_ardour/step_entry.cc
index c2b6c2c6e8..61b5584adb 100644
--- a/gtk2_ardour/step_entry.cc
+++ b/gtk2_ardour/step_entry.cc
@@ -85,6 +85,7 @@ StepEntry::StepEntry (StepEditor& seditor)
 	, _piano (0)
 	, piano (0)
 	, se (&seditor)
+	, myactions (X_("step entry"))
 {
         register_actions ();
         load_bindings ();