smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 08:36:32 +01:00
Code Issues Projects Releases Wiki Activity

action maps now have names

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

1
gtk2_ardour/ardour_ui.cc
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)) , secondary_clock (new MainClock (X_("secondary"), X_("secondary"), false))
, big_clock (new AudioClock (X_("bigclock"), false, "big", true, true, false, false)) , big_clock (new AudioClock (X_("bigclock"), false, "big", true, true, false, false))
, video_timeline(0) , video_timeline(0)
, global_actions (X_("global"))
, ignore_dual_punch (false) , ignore_dual_punch (false)
, editor (0) , editor (0)
, mixer (0) , mixer (0)

4
gtk2_ardour/ardour_ui.h
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 tabbed_window_state_event_handler (GdkEventWindowState*, void* object);
bool key_event_handler (GdkEventKey*, Gtk::Window* window); bool key_event_handler (GdkEventKey*, Gtk::Window* window);
Gtkmm2ext::ActionMap global_actions;
protected: protected:
friend class PublicEditor; friend class PublicEditor;
@ -830,8 +832,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
bool idle_ask_about_quit (); bool idle_ask_about_quit ();
void load_bindings (); void load_bindings ();
Gtkmm2ext::ActionMap global_actions;
}; };
#endif /* __ardour_gui_h__ */ #endif /* __ardour_gui_h__ */

1
gtk2_ardour/editor.cc
View file

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

1
gtk2_ardour/mixer_actor.cc
View file

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

1
gtk2_ardour/monitor_section.cc
View file

@ -83,6 +83,7 @@ MonitorSection::MonitorSection (Session* s)
, toggle_processorbox_button (ArdourButton::default_elements) , toggle_processorbox_button (ArdourButton::default_elements)
, _inhibit_solo_model_update (false) , _inhibit_solo_model_update (false)
, _ui_initialized (false) , _ui_initialized (false)
, myactions (X_("monitor section"))
, bindings (0) , bindings (0)
{ {

2
gtk2_ardour/processor_box.cc
View file

@ -102,7 +102,7 @@ RefPtr<Action> ProcessorBox::rename_action;
RefPtr<Action> ProcessorBox::delete_action; RefPtr<Action> ProcessorBox::delete_action;
RefPtr<Action> ProcessorBox::edit_action; RefPtr<Action> ProcessorBox::edit_action;
RefPtr<Action> ProcessorBox::edit_generic_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 audio_port_color = 0x4A8A0EFF; // Green
static const uint32_t midi_port_color = 0x960909FF; //Red static const uint32_t midi_port_color = 0x960909FF; //Red

1
gtk2_ardour/step_entry.cc
View file

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