#include "public_editor.h"
#include "audio_clock.h"
#include "actions.h"
-#include "button_joiner.h"
#include "main_clock.h"
#include "utils.h"
#include "theme_manager.h"
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 (follow_edits_button, _("Playhead follows Range Selections and Edits"));
set_tip (auto_input_button, _("Be sensible about input monitoring"));
set_tip (click_button, _("Enable/Disable audio click"));
set_tip (solo_alert_button, _("When active, something is soloed.\nClick to de-solo everything"));
set_tip (auditioning_alert_button, _("When active, auditioning is taking place\nClick to stop the audition"));
set_tip (feedback_alert_button, _("When active, there is a feedback loop."));
- set_tip (primary_clock, _("Primary Clock"));
- set_tip (secondary_clock, _("Secondary Clock"));
+ set_tip (primary_clock, _("<b>Primary Clock</b> right-click to set display mode. Click to edit, click+drag a digit or mouse-over+scroll wheel to modify.\nText edits: right-to-left overwrite <tt>Esc</tt>: cancel; <tt>Enter</tt>: confirm; postfix the edit with '+' or '-' to enter delta times.\nSee <span color=\"blue\">http://ardour.org/a3_features_clocks</span> for details."));
+ set_tip (secondary_clock, _("<b>Secondary Clock</b> right-click to set display mode. Click to edit, click+drag a digit or mouse-over+scroll wheel to modify.\nText edits: right-to-left overwrite <tt>Esc</tt>: cancel; <tt>Enter</tt>: confirm; postfix the edit with '+' or '-' to enter delta times.\nSee <span color=\"blue\">http://ardour.org/a3_features_clocks</span> for details."));
synchronize_sync_source_and_video_pullup ();
static_cast<Widget*> (&transport_frame), 1));
auto_return_button.set_text(_("Auto Return"));
- auto_play_button.set_text(_("Auto Play"));
- auto_input_button.set_text (_("Auto Input"));
+
+ follow_edits_button.set_text(_("Follow Edits"));
+
+// auto_input_button.set_text (_("Auto Input"));
click_button.set_image (get_icon (X_("metronome")));
act = ActionManager::get_action ("Transport", "ToggleClick");
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");
+ follow_edits_button.set_name ("transport option button");
auto_input_button.set_name ("transport option button");
/* these have to provide a clear indication of active state */
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::mem_fun (primary_clock, &AudioClock::set));
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 (X_("Transport"), X_("ToggleFollowEdits"));
+ follow_edits_button.set_related_action (act);
act = ActionManager::get_action ("Transport", "ToggleAutoInput");
auto_input_button.set_related_action (act);
transport_button_size_group->add_widget (roll_button);
transport_button_size_group->add_widget (stop_button);
+ goto_start_button.set_size_request (-1, 40);
+
HBox* tbox1 = manage (new HBox);
HBox* tbox2 = manage (new HBox);
- HBox* tbox3 = manage (new HBox);
HBox* tbox = manage (new HBox);
VBox* vbox1 = manage (new VBox);
VBox* vbox2 = manage (new VBox);
- VBox* vbox3 = manage (new VBox);
Alignment* a1 = manage (new Alignment);
Alignment* a2 = manage (new Alignment);
- Alignment* a3 = manage (new Alignment);
tbox1->set_spacing (2);
tbox2->set_spacing (2);
- tbox3->set_spacing (2);
tbox->set_spacing (2);
+ tbox1->pack_start (midi_panic_button, false, false, 5);
tbox1->pack_start (click_button, false, false, 5);
- 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);
- play_selection_button.set_rounded_corner_mask (0x1); /* upper left only */
- roll_button.set_rounded_corner_mask (0x2); /* upper right only */
-
- tbox2->pack_start (*transport_joiner, false, false);
-
- tbox3->pack_start (stop_button, false, false);
- tbox3->pack_start (rec_button, false, false, 6);
+ tbox2->pack_start (play_selection_button, false, false);
+ tbox2->pack_start (roll_button, false, false);
+ tbox2->pack_start (stop_button, false, false);
+ tbox2->pack_start (rec_button, false, false, 5);
vbox1->pack_start (*tbox1, false, false);
vbox2->pack_start (*tbox2, false, false);
- vbox3->pack_start (*tbox3, false, false);
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 (*a1, false, false);
tbox->pack_start (*a2, false, false);
- tbox->pack_start (*a3, false, false);
HBox* clock_box = manage (new HBox);
VBox* transport_vbox = manage (new VBox);
transport_vbox->set_name ("TransportBase");
- transport_vbox->set_border_width (3);
+ transport_vbox->set_border_width (0);
transport_vbox->set_spacing (3);
transport_vbox->pack_start (*tbox, true, true, 0);
transport_vbox->pack_start (*shuttle_box, false, false, 0);
auto_box->set_homogeneous (true);
auto_box->set_spacing (2);
auto_box->pack_start (sync_button, false, false);
- auto_box->pack_start (auto_play_button, false, false);
+ auto_box->pack_start (follow_edits_button, false, false);
auto_box->pack_start (auto_return_button, 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 (*clock_box, true, true);
time_info_box = manage (new TimeInfoBox);
transport_tearoff_hbox.pack_start (*time_info_box, false, false);
void
ARDOUR_UI::toggle_always_play_range ()
{
- RefPtr<Action> act = ActionManager::get_action (X_("Transport"), X_("AlwaysPlayRange"));
+ RefPtr<Action> act = ActionManager::get_action (X_("Transport"), X_("ToggleFollowEdits"));
assert (act);
RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic (act);
projects / ardour.git / blobdiff