diff options
-rw-r--r-- | gtk2_ardour/ardour3_ui_default.conf | 98 | ||||
-rw-r--r-- | gtk2_ardour/ardour_ui.cc | 8 | ||||
-rw-r--r-- | gtk2_ardour/ardour_ui.h | 8 | ||||
-rw-r--r-- | gtk2_ardour/ardour_ui2.cc | 41 | ||||
-rw-r--r-- | gtk2_ardour/canvas_vars.h | 1 |
5 files changed, 88 insertions, 68 deletions
diff --git a/gtk2_ardour/ardour3_ui_default.conf b/gtk2_ardour/ardour3_ui_default.conf index 08507da2a4..ac6f7c0c45 100644 --- a/gtk2_ardour/ardour3_ui_default.conf +++ b/gtk2_ardour/ardour3_ui_default.conf @@ -207,38 +207,38 @@ <Option name="monitor text" value="aaaaa3ff"/> <Option name="monitor text active" value="c6c6beff"/> <Option name="monitor text mid" value="c7c7bfff"/> - <Option name="solo isolate border start" value="bbeff5ff"/> + <Option name="solo isolate border start" value="b7b7d2ff"/> <Option name="solo isolate border end" value="000000ff"/> - <Option name="solo isolate border start selected" value="bbeff5ff"/> - <Option name="solo isolate border end selected" value="0041ddff"/> - <Option name="solo isolate fill start" value="475c5eff"/> - <Option name="solo isolate fill end" value="3e4f51ff"/> - <Option name="solo isolate fill start active" value="475c5eff"/> - <Option name="solo isolate fill end active" value="3e4f51ff"/> - <Option name="solo isolate fill start mid" value="475c5eff"/> - <Option name="solo isolate fill end mid" value="475c5eff"/> + <Option name="solo isolate border start selected" value="9a908eff"/> + <Option name="solo isolate border end selected" value="675c5bff"/> + <Option name="solo isolate fill start" value="5d5856ff"/> + <Option name="solo isolate fill end" value="564d48ff"/> + <Option name="solo isolate fill start active" value="5d5856ff"/> + <Option name="solo isolate fill end active" value="564d48ff"/> + <Option name="solo isolate fill start mid" value="5d5856ff"/> + <Option name="solo isolate fill end mid" value="564d48ff"/> <Option name="solo isolate led" value="660000ff"/> <Option name="solo isolate led active" value="ff0000ff"/> <Option name="solo isolate led mid" value="660000ff"/> - <Option name="solo isolate text" value="e3e3d9ff"/> - <Option name="solo isolate text active" value="e3e3d9ff"/> - <Option name="solo isolate text mid" value="e3e3d9ff"/> - <Option name="solo safe border start" value="94e833ff"/> + <Option name="solo isolate text" value="c7c7d8ff"/> + <Option name="solo isolate text active" value="c8c8d9ff"/> + <Option name="solo isolate text mid" value="000000ff"/> + <Option name="solo safe border start" value="b7b7d2ff"/> <Option name="solo safe border end" value="000000ff"/> - <Option name="solo safe border start selected" value="94e833ff"/> - <Option name="solo safe border end selected" value="54841cff"/> - <Option name="solo safe fill start" value="536b6dff"/> - <Option name="solo safe fill end" value="3c5e13ff"/> - <Option name="solo safe fill start active" value="536b6dff"/> - <Option name="solo safe fill end active" value="3c5e13ff"/> - <Option name="solo safe fill start mid" value="5b7577ff"/> - <Option name="solo safe fill end mid" value="506568ff"/> + <Option name="solo safe border start selected" value="9a908eff"/> + <Option name="solo safe border end selected" value="675c5bff"/> + <Option name="solo safe fill start" value="5d5856ff"/> + <Option name="solo safe fill end" value="564d48ff"/> + <Option name="solo safe fill start active" value="5d5856ff"/> + <Option name="solo safe fill end active" value="564d48ff"/> + <Option name="solo safe fill start mid" value="5d5856ff"/> + <Option name="solo safe fill end mid" value="564d48ff"/> <Option name="solo safe led" value="660000ff"/> <Option name="solo safe led active" value="ff0000ff"/> <Option name="solo safe led mid" value="660000ff"/> - <Option name="solo safe text" value="e2e2d8ff"/> - <Option name="solo safe text active" value="e3e3d9ff"/> - <Option name="solo safe text mid" value="e3e3d9ff"/> + <Option name="solo safe text" value="c7c7d8ff"/> + <Option name="solo safe text active" value="c8c8d9ff"/> + <Option name="solo safe text mid" value="000000ff"/> <Option name="monitor section cut border start" value="b7b7d2ff"/> <Option name="monitor section cut border end" value="000000ff"/> <Option name="monitor section cut border start selected" value="9a908e00"/> @@ -479,15 +479,15 @@ <Option name="send alert button text" value="ccccccff"/> <Option name="send alert button text active" value="000000ff"/> <Option name="send alert button text mid" value="00000000"/> - <Option name="transport button border start" value="5d9624ff"/> - <Option name="transport button border end" value="64a327ff"/> +<Option name="transport button border start" value="727272ff"/> + <Option name="transport button border end" value="333333ff"/> <Option name="transport button border start selected" value="00000000"/> <Option name="transport button border end selected" value="00000000"/> - <Option name="transport button fill start" value="585963ff"/> - <Option name="transport button fill end" value="4f5057ff"/> - <Option name="transport button fill start active" value="9eff3eff"/> - <Option name="transport button fill end active" value="7dca31ff"/> - <Option name="transport button fill start mid" value="00000000"/> + <Option name="transport button fill start" value="595959ff"/> + <Option name="transport button fill end" value="0c0c0cff"/> + <Option name="transport button fill start active" value="a1ff43ff"/> + <Option name="transport button fill end active" value="00a300ff"/> + <Option name="transport button fill start mid" value="000000ff"/> <Option name="transport button fill end mid" value="00000000"/> <Option name="transport button led" value="00000000"/> <Option name="transport button led active" value="00000000"/> @@ -495,21 +495,37 @@ <Option name="transport button text" value="00000000"/> <Option name="transport button text active" value="00000000"/> <Option name="transport button text mid" value="00000000"/> - <Option name="transport recenable button border start" value="962432ff"/> - <Option name="transport recenable button border end" value="601720ff"/> - <Option name="transport recenable button border start selected" value="00000000"/> - <Option name="transport recenable button border end selected" value="00000000"/> - <Option name="transport recenable button fill start" value="635858ff"/> - <Option name="transport recenable button fill end" value="574f50ff"/> - <Option name="transport recenable button fill start active" value="ea0f0fff"/> - <Option name="transport recenable button fill end active" value="af0b0bff"/> - <Option name="transport recenable button fill start mid" value="932648ff"/> - <Option name="transport recenable button fill end mid" value="00000000"/> + <Option name="transport recenable button border start" value="a06a6aff"/> + <Option name="transport recenable button border end" value="000000ff"/> + <Option name="transport recenable button border start selected" value="000000ff"/> + <Option name="transport recenable button border end selected" value="000000ff"/> + <Option name="transport recenable button fill start" value="5f3f3fff"/> + <Option name="transport recenable button fill end" value="3d2828ff"/> + <Option name="transport recenable button fill start active" value="f80b0bff"/> + <Option name="transport recenable button fill end active" value="b50e0eff"/> + <Option name="transport recenable button fill start mid" value="ffa8a8ff"/> + <Option name="transport recenable button fill end mid" value="f87878ff"/> <Option name="transport recenable button led" value="00000000"/> <Option name="transport recenable button led active" value="00000000"/> <Option name="transport recenable button led mid" value="00000000"/> <Option name="transport recenable button text" value="00000000"/> <Option name="transport recenable button text active" value="00000000"/> <Option name="transport recenable button text mid" value="00000000"/> + <Option name="transport option button border start" value="00000000"/> + <Option name="transport option button border end" value="00000000"/> + <Option name="transport option button border start selected" value="00000000"/> + <Option name="transport option button border end selected" value="00000000"/> + <Option name="transport option button fill start" value="585962ff"/> + <Option name="transport option button fill end" value="4f5057ff"/> + <Option name="transport option button fill start active" value="a1fe43ff"/> + <Option name="transport option button fill end active" value="91f928ff"/> + <Option name="transport option button fill start mid" value="00000000"/> + <Option name="transport option button fill end mid" value="00000000"/> + <Option name="transport option button led" value="4a3535ff"/> + <Option name="transport option button led active" value="ba0202ff"/> + <Option name="transport option button led mid" value="00000000"/> + <Option name="transport option button text" value="e5e5e5ff"/> + <Option name="transport option button text active" value="000000ff"/> + <Option name="transport option button text mid" value="00000000"/> </Canvas> </Ardour> diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index bbc5211c3e..750480b5d7 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -153,10 +153,10 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[]) , play_selection_controllable (new TransportControllable ("transport play selection", *this, TransportControllable::PlaySelection)) , rec_controllable (new TransportControllable ("transport rec-enable", *this, TransportControllable::RecordEnable)) - , auto_return_button (_("Auto Return")) - , auto_play_button (_("Auto Play")) - , auto_input_button (_("Auto Input")) - // , click_button (_("Click")) + , auto_return_button (ArdourButton::led_default_elements) + , auto_play_button (ArdourButton::led_default_elements) + , auto_input_button (ArdourButton::led_default_elements) + , time_master_button (_("time\nmaster")) , auditioning_alert_button (_("AUDITION")) diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index f29f06ce94..e8340f366d 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -435,10 +435,10 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr ShuttleControl* shuttle_box; - Gtkmm2ext::StatefulToggleButton auto_return_button; - Gtkmm2ext::StatefulToggleButton auto_play_button; - Gtkmm2ext::StatefulToggleButton auto_input_button; - Gtkmm2ext::StatefulToggleButton click_button; + ArdourButton auto_return_button; + ArdourButton auto_play_button; + ArdourButton auto_input_button; + ArdourButton click_button; Gtkmm2ext::StatefulToggleButton time_master_button; Gtkmm2ext::StatefulToggleButton sync_button; diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index dd100b820f..076f9f2f52 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -210,6 +210,8 @@ ARDOUR_UI::tearoff_settings (const char* name) const void ARDOUR_UI::setup_transport () { + RefPtr<Action> act; + transport_tearoff = manage (new TearOff (transport_tearoff_hbox)); transport_tearoff->set_name ("TransportBase"); transport_tearoff->tearoff_window().signal_key_press_event().connect (sigc::bind (sigc::ptr_fun (relay_key_press), &transport_tearoff->tearoff_window()), false); @@ -236,15 +238,23 @@ ARDOUR_UI::setup_transport () transport_tearoff->Visible.connect (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast<Box*> (&top_packer), static_cast<Widget*> (&transport_frame), 1)); - auto_return_button.set_name ("TransportButton"); - auto_play_button.set_name ("TransportButton"); - auto_input_button.set_name ("TransportButton"); - click_button.set_name ("TransportButton"); + auto_return_button.set_text(_("Auto Return")); + auto_play_button.set_text(_("Auto Play")); + auto_input_button.set_text (_("Auto Input")); + + click_button.set_image (get_icon (X_("metronome"))); + act = ActionManager::get_action ("Transport", "ToggleClick"); + click_button.set_related_action (act); + click_button.signal_button_press_event().connect (sigc::mem_fun (*this, &ARDOUR_UI::click_button_clicked), false); + + auto_return_button.set_name ("transport option button"); + auto_play_button.set_name ("transport option button"); + auto_input_button.set_name ("transport option button"); + click_button.set_name ("transport option button"); + time_master_button.set_name ("TransportButton"); sync_button.set_name ("TransportSyncButton"); - Widget* w; - stop_button.set_active_state (Active); goto_start_button.set_image (get_icon (X_("transport_start"))); @@ -256,8 +266,6 @@ ARDOUR_UI::setup_transport () auto_loop_button.set_image (get_icon (X_("transport_loop"))); join_play_range_button.set_image (get_icon (X_("tool_object_range"))); - RefPtr<Action> act; - act = ActionManager::get_action (X_("Transport"), X_("Stop")); stop_button.set_related_action (act); act = ActionManager::get_action (X_("Transport"), X_("Roll")); @@ -289,9 +297,12 @@ ARDOUR_UI::setup_transport () secondary_clock->ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::secondary_clock_value_changed)); big_clock->ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::big_clock_value_changed)); - ActionManager::get_action ("Transport", "ToggleAutoReturn")->connect_proxy (auto_return_button); - ActionManager::get_action ("Transport", "ToggleAutoPlay")->connect_proxy (auto_play_button); - ActionManager::get_action ("Transport", "ToggleAutoInput")->connect_proxy (auto_input_button); + act = ActionManager::get_action ("Transport", "ToggleAutoReturn"); + auto_return_button.set_related_action (act); + act = ActionManager::get_action ("Transport", "ToggleAutoPlay"); + auto_play_button.set_related_action (act); + act = ActionManager::get_action ("Transport", "ToggleAutoInput"); + auto_input_button.set_related_action (act); /* alerts */ @@ -382,14 +393,6 @@ ARDOUR_UI::setup_transport () time_controls_table->attach (sync_button, 0, 1, 0, 1, Gtk::AttachOptions(FILL|EXPAND), Gtk::AttachOptions(0)); time_controls_table->attach (time_master_button, 0, 1, 1, 2, Gtk::AttachOptions(FILL|EXPAND), Gtk::AttachOptions(0)); - w = manage (new Image (get_icon (X_("metronome")))); - w->show (); - click_button.add (*w); - - ActionManager::get_action ("Transport", "ToggleClick")->connect_proxy (click_button); - - click_button.signal_button_press_event().connect (sigc::mem_fun (*this, &ARDOUR_UI::click_button_clicked), false); - time_controls_table->attach (click_button, 1, 2, 0, 2, Gtk::AttachOptions(FILL|EXPAND), FILL); transport_tearoff_hbox.pack_start (*clock_box, false, false); diff --git a/gtk2_ardour/canvas_vars.h b/gtk2_ardour/canvas_vars.h index c4a64eb6e8..d9ff718639 100644 --- a/gtk2_ardour/canvas_vars.h +++ b/gtk2_ardour/canvas_vars.h @@ -179,4 +179,5 @@ BUTTON_VARS(RecEnableButton, "record enable button") BUTTON_VARS(SendButton, "send alert button") BUTTON_VARS(TransportButton, "transport button") BUTTON_VARS(TransportRecenableButton, "transport recenable button") +BUTTON_VARS(TransportOptionButton, "transport option button") |