X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui2.cc;h=50affa6c960524a4940a473da5a6246037fcc16b;hb=fbdae25bedf6a0a064540eccc235e8a9c256673e;hp=1858011164482ce5a93b029d918a807fb0eecdaa;hpb=7629120cda89dd4ec1b03ba4ddcc6f5dd1b0ca5a;p=ardour.git diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 1858011164..50affa6c96 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -37,17 +37,16 @@ #include #include -#include "ardour/session.h" -#include "ardour/audioengine.h" -#include "ardour/ardour.h" #include "ardour/profile.h" -#include "ardour/route.h" +#include "ardour/session.h" +#include "ardour/types.h" #include "ardour_ui.h" #include "keyboard.h" #include "public_editor.h" #include "audio_clock.h" #include "actions.h" +#include "main_clock.h" #include "utils.h" #include "theme_manager.h" #include "midi_tracer.h" @@ -79,12 +78,15 @@ ARDOUR_UI::setup_windows () return -1; } + if (create_meterbridge ()) { + error << _("UI: cannot setup meterbridge") << endmsg; + return -1; + } + /* all other dialogs are created conditionally */ we_have_dependents (); - theme_manager->signal_unmap().connect (sigc::bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("/Common/ToggleThemeManager"))); - #ifdef TOP_MENUBAR HBox* status_bar_packer = manage (new HBox); EventBox* status_bar_event_box = manage (new EventBox); @@ -129,21 +131,19 @@ 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 (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, _("Primary Clock 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 Esc: cancel; Enter: confirm; postfix the edit with '+' or '-' to enter delta times.\n")); + set_tip (secondary_clock, _("Secondary Clock 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 Esc: cancel; Enter: confirm; postfix the edit with '+' or '-' to enter delta times.\n")); synchronize_sync_source_and_video_pullup (); @@ -244,8 +244,10 @@ ARDOUR_UI::setup_transport () static_cast (&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"); @@ -253,15 +255,15 @@ ARDOUR_UI::setup_transport () 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 */ - click_button.set_name ("transport active option button"); + click_button.set_name ("transport 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"))); @@ -270,7 +272,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,8 +295,6 @@ ARDOUR_UI::setup_transport () midi_panic_button.set_related_action (act); act = ActionManager::get_action (X_("Transport"), X_("ToggleExternalSync")); sync_button.set_related_action (act); - act = ActionManager::get_action (X_("Transport"), X_("AlwaysPlayRange")); - join_play_range_button.set_related_action (act); /* clocks, etc. */ @@ -308,8 +307,8 @@ ARDOUR_UI::setup_transport () 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); @@ -328,65 +327,71 @@ ARDOUR_UI::setup_transport () alert_box.pack_start (auditioning_alert_button, true, false); alert_box.pack_start (feedback_alert_button, true, false); - HBox* tbox = manage (new HBox); - tbox->set_spacing (2); + /* all transport buttons should be the same size vertically and + * horizontally + */ - tbox->pack_start (midi_panic_button, false, false); - tbox->pack_start (goto_start_button, false, false); - tbox->pack_start (goto_end_button, false, false); + 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); - 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); + goto_start_button.set_size_request (-1, 40); - 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); + HBox* tbox1 = manage (new HBox); + HBox* tbox2 = manage (new HBox); + HBox* tbox = manage (new HBox); - } else { + VBox* vbox1 = manage (new VBox); + VBox* vbox2 = manage (new VBox); - tbox->pack_start (auto_loop_button, false, false); + Alignment* a1 = manage (new Alignment); + Alignment* a2 = manage (new Alignment); - Frame* jpframe = manage (new Frame); - HBox* jpbox = manage (new HBox); + tbox1->set_spacing (2); + tbox2->set_spacing (2); + tbox->set_spacing (2); - 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); + tbox1->pack_start (midi_panic_button, false, false, 5); + tbox1->pack_start (click_button, false, false, 5); + 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 (*jpframe, false, false); + 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); - 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); - } + vbox1->pack_start (*tbox1, false, false); + vbox2->pack_start (*tbox2, false, false); - tbox->pack_start (stop_button, false, false); - tbox->pack_start (rec_button, false, false, 6); + 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); + + tbox->pack_start (*a1, false, false); + tbox->pack_start (*a2, 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()) { - secondary_clock->set_border_width (2); clock_box->pack_start (*secondary_clock, false, false); } + clock_box->set_spacing (3); shuttle_box = new ShuttleControl; shuttle_box->show (); 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); @@ -399,12 +404,11 @@ ARDOUR_UI::setup_transport () 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 (click_button, 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); @@ -429,14 +433,6 @@ ARDOUR_UI::setup_transport () } } -void -ARDOUR_UI::manage_window (Window& win) -{ - win.signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), &win)); - win.signal_enter_notify_event().connect (sigc::bind (sigc::mem_fun (Keyboard::the_keyboard(), &Keyboard::enter_window), &win)); - win.signal_leave_notify_event().connect (sigc::bind (sigc::mem_fun (Keyboard::the_keyboard(), &Keyboard::leave_window), &win)); -} - void ARDOUR_UI::detach_tearoff (Box* b, Widget* w) { @@ -589,6 +585,14 @@ ARDOUR_UI::editor_realized () reset_dpi (); } +void +ARDOUR_UI::update_tearoff_visibility () +{ + if (editor) { + editor->update_tearoff_visibility (); + } +} + void ARDOUR_UI::maximise_editing_space () { @@ -613,11 +617,10 @@ ARDOUR_UI::click_button_clicked (GdkEventButton* ev) return false; } - RefPtr act = ActionManager::get_action (X_("Common"), X_("ToggleRCOptionsEditor")); + RefPtr act = ActionManager::get_action (X_("Window"), X_("toggle-rc-options-editor")); assert (act); - RefPtr tact = RefPtr::cast_dynamic (act); - tact->set_active (); + act->activate(); rc_option_editor->set_current_page (_("Misc")); return true; @@ -626,7 +629,7 @@ ARDOUR_UI::click_button_clicked (GdkEventButton* ev) void ARDOUR_UI::toggle_always_play_range () { - RefPtr act = ActionManager::get_action (X_("Transport"), X_("AlwaysPlayRange")); + RefPtr act = ActionManager::get_action (X_("Transport"), X_("ToggleFollowEdits")); assert (act); RefPtr tact = RefPtr::cast_dynamic (act);