diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-01-16 20:01:59 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-06-29 14:18:13 -0400 |
| commit | eb791b7302123d4a0a30485bebbc54b673aa4f61 (patch) | |
| tree | 249b94d8105ddad83390157e763e13b10c17002b /gtk2_ardour/ardour_ui2.cc | |
| parent | 6c8e11d3f8d049c12255da95719610745fe38483 (diff) | |
start work on auto return target dropdown rather than button
Conflicts:
gtk2_ardour/ardour_ui.cc
Diffstat (limited to 'gtk2_ardour/ardour_ui2.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui2.cc | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index c7fb167b7c..db53080e5c 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -133,7 +133,6 @@ ARDOUR_UI::setup_tooltips () 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 (auto_return_button, _("Return to last playback start when stopped")); 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")); @@ -252,7 +251,19 @@ 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_text(_("Auto Return")); + /* build auto-return dropdown */ + + auto_return_dropdown.set_text (_("Auto Return")); + + auto_return_last_locate = manage (new CheckMenuItem (_("Play from last roll"))); + auto_return_last_locate->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::toggle_auto_return_state), LastLocate)); + auto_return_last_locate->show (); + auto_return_dropdown.AddMenuElem (Gtk::Menu_Helpers::CheckMenuElem (*auto_return_last_locate)); + + auto_return_region_selection = manage (new CheckMenuItem (_("Play from region selection"))); + auto_return_region_selection->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::toggle_auto_return_state), RegionSelectionStart)); + auto_return_region_selection->show (); + auto_return_dropdown.AddMenuElem (Gtk::Menu_Helpers::CheckMenuElem (*auto_return_region_selection)); follow_edits_button.set_text(_("Follow Edits")); @@ -264,7 +275,6 @@ ARDOUR_UI::setup_transport () 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"); follow_edits_button.set_name ("transport option button"); auto_input_button.set_name ("transport option button"); @@ -312,8 +322,6 @@ 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)); - act = ActionManager::get_action ("Transport", "ToggleAutoReturn"); - auto_return_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"); @@ -438,7 +446,7 @@ ARDOUR_UI::setup_transport () auto_box->pack_start (sync_button, true, true); if (!ARDOUR::Profile->get_trx()) { auto_box->pack_start (follow_edits_button, true, true); - auto_box->pack_start (auto_return_button, true, true); + auto_box->pack_start (auto_return_dropdown, true, true); } if (!ARDOUR::Profile->get_trx()) { |