X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui2.cc;h=ad8336ca103e84c02628a11bdf47f06eca6de6fe;hb=9f4a00fa898845ba177955f115fa2f96d62a8643;hp=3b060a73eaa71d2e9086770413717d3e629bf84e;hpb=beb3ec2d7a440308bce6e2db793d78f528c9fa85;p=ardour.git diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 3b060a73ea..ad8336ca10 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -46,7 +46,6 @@ #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" @@ -65,6 +64,7 @@ using namespace PBD; using namespace Gtkmm2ext; using namespace Gtk; using namespace Glib; +using namespace ARDOUR_UI_UTILS; int ARDOUR_UI::setup_windows () @@ -79,12 +79,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); @@ -140,8 +143,9 @@ ARDOUR_UI::setup_tooltips () 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 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.\nSee http://ardour.org/a3_features_clocks for details.")); - 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.\nSee http://ardour.org/a3_features_clocks for details.")); + 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")); + set_tip (editor_meter_peak_display, _("Reset Level Meter")); synchronize_sync_source_and_video_pullup (); @@ -219,7 +223,7 @@ ARDOUR_UI::setup_transport () 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); - if (Profile->get_sae()) { + if (Profile->get_sae() || Profile->get_mixbus()) { transport_tearoff->set_can_be_torn_off (false); } @@ -242,8 +246,10 @@ ARDOUR_UI::setup_transport () static_cast (&transport_frame), 1)); auto_return_button.set_text(_("Auto Return")); + follow_edits_button.set_text(_("Follow Edits")); - auto_input_button.set_text (_("Auto Input")); + +// auto_input_button.set_text (_("Auto Input")); click_button.set_image (get_icon (X_("metronome"))); act = ActionManager::get_action ("Transport", "ToggleClick"); @@ -336,6 +342,8 @@ ARDOUR_UI::setup_transport () 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* tbox = manage (new HBox); @@ -350,16 +358,18 @@ ARDOUR_UI::setup_transport () tbox2->set_spacing (2); tbox->set_spacing (2); - tbox1->pack_start (click_button, false, false, 5); - tbox1->pack_start (midi_panic_button, false, false); + if (!Profile->get_trx()) { + 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); - play_selection_button.set_rounded_corner_mask (0x1); /* upper left only */ - roll_button.set_rounded_corner_mask (0x2); /* upper right only */ - - tbox2->pack_start (play_selection_button, false, false); + if (!Profile->get_trx()) { + 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); @@ -378,20 +388,29 @@ ARDOUR_UI::setup_transport () HBox* clock_box = manage (new HBox); clock_box->pack_start (*primary_clock, false, false); - if (!ARDOUR::Profile->get_small_screen()) { + if (!ARDOUR::Profile->get_small_screen() && !ARDOUR::Profile->get_trx()) { 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); + + if (!Profile->get_trx()) { + transport_vbox->pack_start (*shuttle_box, false, false, 0); + } + + time_info_box = manage (new TimeInfoBox); + + if (ARDOUR::Profile->get_trx()) { + transport_tearoff_hbox.pack_start (*time_info_box, false, false); + } transport_tearoff_hbox.pack_start (*transport_vbox, false, false); @@ -401,19 +420,33 @@ 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 (follow_edits_button, false, false); - auto_box->pack_start (auto_return_button, false, false); + if (!ARDOUR::Profile->get_trx()) { + 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); + if (!ARDOUR::Profile->get_trx()) { + transport_tearoff_hbox.pack_start (*auto_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); + if (ARDOUR::Profile->get_trx()) { + transport_tearoff_hbox.pack_start (*auto_box, false, false); + } + + if (!ARDOUR::Profile->get_trx()) { + transport_tearoff_hbox.pack_start (*time_info_box, false, false); + } - if (Profile->get_small_screen()) { + if (ARDOUR::Profile->get_small_screen()) { transport_tearoff_hbox.pack_start (_editor_transport_box, false, false); } - transport_tearoff_hbox.pack_start (alert_box, false, false); + + if (!ARDOUR::Profile->get_trx()) { + transport_tearoff_hbox.pack_start (alert_box, false, false); + transport_tearoff_hbox.pack_start (meter_box, false, false); + transport_tearoff_hbox.pack_start (editor_meter_peak_display, false, false); + } if (Profile->get_sae()) { Image* img = manage (new Image ((::get_icon (X_("sae"))))); @@ -430,14 +463,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) { @@ -622,18 +647,17 @@ 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; } void -ARDOUR_UI::toggle_always_play_range () +ARDOUR_UI::toggle_follow_edits () { RefPtr act = ActionManager::get_action (X_("Transport"), X_("ToggleFollowEdits")); assert (act); @@ -641,7 +665,7 @@ ARDOUR_UI::toggle_always_play_range () RefPtr tact = RefPtr::cast_dynamic (act); assert (tact); - Config->set_always_play_range (tact->get_active ()); + Config->set_follow_edits (tact->get_active ()); }