action maps now have names

This commit is contained in:
Paul Davis 2015-09-01 13:54:29 -04:00
parent 66e0328a93
commit 09f9020897
7 changed files with 8 additions and 3 deletions

View File

@ -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)

View File

@ -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__ */

View File

@ -461,6 +461,7 @@ Editor::Editor ()
, _stepping_axis_view (0)
, quantize_dialog (0)
, _main_menu_disabler (0)
, myactions (X_("editor"))
{
/* we are a singleton */

View File

@ -44,6 +44,7 @@ using namespace PBD;
using Gtkmm2ext::Bindings;
MixerActor::MixerActor ()
: myactions (X_("mixer"))
{
register_actions ();
load_bindings ();

View File

@ -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)
{

View File

@ -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

View File

@ -85,6 +85,7 @@ StepEntry::StepEntry (StepEditor& seditor)
, _piano (0)
, piano (0)
, se (&seditor)
, myactions (X_("step entry"))
{
register_actions ();
load_bindings ();