X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui2.cc;h=05addb98e3addfc936fdf59444f675faef126c55;hb=d7deaa21bb78222e25b820c9583942a47dbc8fac;hp=db32c7b7e298dff78c829b84b6592e467e59bf85;hpb=84bb14efdc07b5c6a18f02aa61d46bbf76c4a077;p=ardour.git diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index db32c7b7e2..05addb98e3 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -48,6 +48,7 @@ #include "public_editor.h" #include "audio_clock.h" #include "actions.h" +#include "button_joiner.h" #include "utils.h" #include "theme_manager.h" #include "midi_tracer.h" @@ -114,6 +115,7 @@ ARDOUR_UI::setup_windows () editor->add_toplevel_controls (top_packer); setup_transport(); + build_menu_bar (); setup_tooltips (); @@ -128,12 +130,11 @@ ARDOUR_UI::setup_tooltips () set_tip (stop_button, _("Stop playback")); set_tip (rec_button, _("Toggle record")); set_tip (play_selection_button, _("Play range/selection")); - set_tip (join_play_range_button, _("Always play range/selection")); set_tip (goto_start_button, _("Go to start of session")); set_tip (goto_end_button, _("Go to end of session")); set_tip (auto_loop_button, _("Play loop range")); set_tip (midi_panic_button, _("MIDI Panic\nSend note off and reset controller messages on all MIDI channels")); - + set_tip (*transport_joiner, _("Always Play Range Selection (if any)")); set_tip (auto_return_button, _("Return to last playback start when stopped")); set_tip (auto_play_button, _("Start playback after any locate")); set_tip (auto_input_button, _("Be sensible about input monitoring")); @@ -260,7 +261,7 @@ ARDOUR_UI::setup_transport () click_button.set_name ("transport active option button"); sync_button.set_name ("transport active option button"); - stop_button.set_active_state (Active); + stop_button.set_active (true); goto_start_button.set_image (get_icon (X_("transport_start"))); goto_end_button.set_image (get_icon (X_("transport_end"))); @@ -269,7 +270,6 @@ ARDOUR_UI::setup_transport () play_selection_button.set_image (get_icon (X_("transport_range"))); rec_button.set_image (get_icon (X_("transport_record"))); auto_loop_button.set_image (get_icon (X_("transport_loop"))); - join_play_range_button.set_image (get_icon (X_("tool_object_range"))); midi_panic_button.set_image (get_icon (X_("midi_panic"))); /* the icon for this has an odd aspect ratio, so fatten up the button */ @@ -294,10 +294,15 @@ ARDOUR_UI::setup_transport () act = ActionManager::get_action (X_("Transport"), X_("ToggleExternalSync")); sync_button.set_related_action (act); + transport_joiner = manage (new ButtonJoiner ("transport button", play_selection_button, roll_button)); + + act = ActionManager::get_action (X_("Transport"), X_("AlwaysPlayRange")); + transport_joiner->set_related_action (act); + /* clocks, etc. */ - ARDOUR_UI::Clock.connect (sigc::bind (sigc::mem_fun (primary_clock, &AudioClock::set), 'p')); - ARDOUR_UI::Clock.connect (sigc::bind (sigc::mem_fun (secondary_clock, &AudioClock::set), 's')); + ARDOUR_UI::Clock.connect (sigc::mem_fun (primary_clock, &AudioClock::set)); + ARDOUR_UI::Clock.connect (sigc::mem_fun (secondary_clock, &AudioClock::set)); primary_clock->ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::primary_clock_value_changed)); secondary_clock->ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::secondary_clock_value_changed)); @@ -325,51 +330,67 @@ ARDOUR_UI::setup_transport () alert_box.pack_start (auditioning_alert_button, true, false); alert_box.pack_start (feedback_alert_button, true, false); + /* all transport buttons should be the same size vertically and + * horizontally + */ + + Glib::RefPtr transport_button_size_group = SizeGroup::create (SIZE_GROUP_BOTH); + transport_button_size_group->add_widget (goto_start_button); + transport_button_size_group->add_widget (goto_end_button); + transport_button_size_group->add_widget (auto_loop_button); + transport_button_size_group->add_widget (rec_button); + transport_button_size_group->add_widget (play_selection_button); + transport_button_size_group->add_widget (roll_button); + transport_button_size_group->add_widget (stop_button); + + HBox* tbox1 = manage (new HBox); + HBox* tbox2 = manage (new HBox); + HBox* tbox3 = manage (new HBox); HBox* tbox = manage (new HBox); - tbox->set_spacing (2); - tbox->pack_start (midi_panic_button, false, false); - tbox->pack_start (goto_start_button, false, false); - tbox->pack_start (goto_end_button, false, false); + VBox* vbox1 = manage (new VBox); + VBox* vbox2 = manage (new VBox); + VBox* vbox3 = manage (new VBox); - Glib::RefPtr transport_button_size_group1 = SizeGroup::create (SIZE_GROUP_HORIZONTAL); - transport_button_size_group1->add_widget (goto_start_button); - transport_button_size_group1->add_widget (goto_end_button); - transport_button_size_group1->add_widget (auto_loop_button); - transport_button_size_group1->add_widget (rec_button); + Alignment* a1 = manage (new Alignment); + Alignment* a2 = manage (new Alignment); + Alignment* a3 = manage (new Alignment); - if (Profile->get_sae()) { - tbox->pack_start (auto_loop_button); - tbox->pack_start (roll_button); - transport_button_size_group1->add_widget (play_selection_button); - transport_button_size_group1->add_widget (roll_button); + tbox1->set_spacing (2); + tbox2->set_spacing (2); + tbox3->set_spacing (2); + tbox->set_spacing (2); - } else { + tbox1->pack_start (midi_panic_button, false, false); + tbox1->pack_start (goto_start_button, false, false); + tbox1->pack_start (goto_end_button, false, false); + tbox1->pack_start (auto_loop_button, false, false); - tbox->pack_start (auto_loop_button, false, false); + play_selection_button.set_rounded_corner_mask (0x1); /* upper left only */ + roll_button.set_rounded_corner_mask (0x2); /* upper right only */ - Frame* jpframe = manage (new Frame); - HBox* jpbox = manage (new HBox); + tbox2->pack_start (*transport_joiner, false, false); - jpframe->add (*jpbox); - jpframe->set_shadow_type (SHADOW_NONE); - - jpbox->pack_start (play_selection_button, false, false); - jpbox->pack_start (join_play_range_button, false, false); - jpbox->pack_start (roll_button, false, false); + tbox3->pack_start (stop_button, false, false); + tbox3->pack_start (rec_button, false, false, 6); - tbox->pack_start (*jpframe, false, false); + vbox1->pack_start (*tbox1, false, false); + vbox2->pack_start (*tbox2, false, false); + vbox3->pack_start (*tbox3, false, false); - Glib::RefPtr transport_button_size_group2 = SizeGroup::create (SIZE_GROUP_HORIZONTAL); - transport_button_size_group2->add_widget (play_selection_button); - transport_button_size_group2->add_widget (join_play_range_button); - transport_button_size_group2->add_widget (roll_button); - } + a1->add (*vbox1); + a1->set (0.5, 1.0, 0.0, 0.0); + a2->add (*vbox2); + a2->set (0.5, 1.0, 0.0, 0.0); + a3->add (*vbox3); + a3->set (0.5, 1.0, 0.0, 0.0); - tbox->pack_start (stop_button, false, false); - tbox->pack_start (rec_button, false, false, 6); + tbox->pack_start (*a1, false, false); + tbox->pack_start (*a2, false, false); + tbox->pack_start (*a3, false, false); HBox* clock_box = manage (new HBox); + primary_clock->set_border_width (2); clock_box->pack_start (*primary_clock, false, false); if (!ARDOUR::Profile->get_small_screen()) { @@ -377,7 +398,6 @@ ARDOUR_UI::setup_transport () clock_box->pack_start (*secondary_clock, false, false); } - shuttle_box = new ShuttleControl; shuttle_box->show (); @@ -398,10 +418,8 @@ ARDOUR_UI::setup_transport () auto_box->pack_start (sync_button, false, false); auto_box->pack_start (auto_play_button, false, false); auto_box->pack_start (auto_return_button, false, false); - if (!Profile->get_small_screen()) { - transport_tearoff_hbox.pack_start (*auto_box, false, false); - } + transport_tearoff_hbox.pack_start (*auto_box, false, false); transport_tearoff_hbox.pack_start (*clock_box, false, false); transport_tearoff_hbox.pack_start (click_button, false, false); @@ -461,10 +479,8 @@ ARDOUR_UI::soloing_changed (bool onoff) void ARDOUR_UI::_auditioning_changed (bool onoff) { - if (auditioning_alert_button.get_active() != onoff) { - auditioning_alert_button.set_active (onoff); - set_transport_sensitivity (!onoff); - } + auditioning_alert_button.set_active (onoff); + set_transport_sensitivity (!onoff); } void @@ -510,13 +526,12 @@ ARDOUR_UI::solo_blink (bool onoff) if (_session->soloing() || _session->listening()) { if (onoff) { - solo_alert_button.set_state (STATE_ACTIVE); + solo_alert_button.set_active (true); } else { - solo_alert_button.set_state (STATE_NORMAL); + solo_alert_button.set_active (false); } } else { solo_alert_button.set_active (false); - solo_alert_button.set_state (STATE_NORMAL); } } @@ -525,7 +540,7 @@ ARDOUR_UI::sync_blink (bool onoff) { if (_session == 0 || !_session->config.get_external_sync()) { /* internal sync */ - sync_button.unset_active_state (); + sync_button.set_active (false); return; } @@ -533,13 +548,13 @@ ARDOUR_UI::sync_blink (bool onoff) /* not locked, so blink on and off according to the onoff argument */ if (onoff) { - sync_button.set_active_state (Gtkmm2ext::Active); // "-active" + sync_button.set_active (true); } else { - sync_button.unset_active_state (); // normal + sync_button.set_active (false); } } else { /* locked */ - sync_button.set_active_state (Gtkmm2ext::Active); // "-active" + sync_button.set_active (true); } } @@ -552,12 +567,12 @@ ARDOUR_UI::audition_blink (bool onoff) if (_session->is_auditioning()) { if (onoff) { - auditioning_alert_button.set_active_state (Gtkmm2ext::Active); + auditioning_alert_button.set_active (true); } else { - auditioning_alert_button.unset_active_state(); + auditioning_alert_button.set_active (false); } } else { - auditioning_alert_button.unset_active_state (); + auditioning_alert_button.set_active (false); } } @@ -594,26 +609,17 @@ ARDOUR_UI::editor_realized () void ARDOUR_UI::maximise_editing_space () { - if (!editor) { - return; - } - - transport_tearoff->set_visible (false); - editor->maximise_editing_space (); - if (Config->get_keep_tearoffs()) { - transport_tearoff->set_visible (true); + if (editor) { + editor->maximise_editing_space (); } } void ARDOUR_UI::restore_editing_space () { - if (!editor) { - return; + if (editor) { + editor->restore_editing_space (); } - - transport_tearoff->set_visible (true); - editor->restore_editing_space (); } bool @@ -633,3 +639,17 @@ ARDOUR_UI::click_button_clicked (GdkEventButton* ev) rc_option_editor->set_current_page (_("Misc")); return true; } + +void +ARDOUR_UI::toggle_always_play_range () +{ + RefPtr act = ActionManager::get_action (X_("Transport"), X_("AlwaysPlayRange")); + assert (act); + + RefPtr tact = RefPtr::cast_dynamic (act); + assert (tact); + + Config->set_always_play_range (tact->get_active ()); +} + +