X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui2.cc;h=c264c2c1c6fa2fa25fe1b6c4ab82abfd082046bd;hb=c59dded55d13486f7b8be0f026cb0e8d17aa5d02;hp=c895262cb6a43310289be5cf5a382c05d6142588;hpb=cf93eaec98fcd2a09173f7f975a74b3fcfe3a320;p=ardour.git diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index c895262cb6..c264c2c1c6 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -29,6 +29,8 @@ #include #include +#include "canvas/canvas.h" + #include "pbd/error.h" #include "pbd/basename.h" #include "pbd/fastlog.h" @@ -36,7 +38,6 @@ #include "gtkmm2ext/cairocell.h" #include "gtkmm2ext/utils.h" #include "gtkmm2ext/click_box.h" -#include "gtkmm2ext/tearoff.h" #include "gtkmm2ext/window_title.h" #include "ardour/profile.h" @@ -49,16 +50,15 @@ #include "audio_clock.h" #include "actions.h" #include "main_clock.h" +#include "mixer_ui.h" #include "utils.h" -#include "theme_manager.h" +#include "time_info_box.h" #include "midi_tracer.h" -#include "shuttle_control.h" #include "global_port_matrix.h" #include "location_ui.h" #include "rc_option_editor.h" -#include "time_info_box.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; @@ -68,170 +68,11 @@ using namespace Gtk; using namespace Glib; using namespace ARDOUR_UI_UTILS; - -static GtkNotebook* -tab_window_root_drop (GtkNotebook* src, - GtkWidget* w, - gint x, - gint y, - gpointer user_data) -{ - return ARDOUR_UI::instance()->tab_window_root_drop (src, w, x, y, user_data); -} - -int -ARDOUR_UI::setup_windows () -{ - if (create_editor ()) { - error << _("UI: cannot setup editor") << endmsg; - return -1; - } - - if (create_mixer ()) { - error << _("UI: cannot setup mixer") << endmsg; - return -1; - } - - if (create_meterbridge ()) { - error << _("UI: cannot setup meterbridge") << endmsg; - return -1; - } - - rc_option_editor = new RCOptionEditor; - rc_option_editor->add_to_notebook (_tabs, _("Preferences")); - rc_option_editor->contents().show_all (); - - /* all other dialogs are created conditionally */ - - we_have_dependents (); - -#ifdef TOP_MENUBAR - EventBox* status_bar_event_box = manage (new EventBox); - - status_bar_event_box->add (status_bar_label); - status_bar_event_box->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); - status_bar_label.set_size_request (300, -1); - - status_bar_label.show (); - status_bar_event_box->show (); - - status_bar_event_box->signal_button_press_event().connect (mem_fun (*this, &ARDOUR_UI::status_bar_button_press)); - - status_bar_hpacker.pack_start (*status_bar_event_box, true, true, 6); - status_bar_hpacker.pack_start (menu_bar_base, false, false, 2); -#else - top_packer.pack_start (menu_bar_base, false, false); -#endif - - main_vpacker.pack_start (top_packer, false, false); - - /* now add the transport frame to the top of main window */ - - main_vpacker.pack_start (transport_frame, false, false); - main_vpacker.pack_start (_tabs, true, true); - -#ifdef TOP_MENUBAR - main_vpacker.pack_start (status_bar_hpacker, false, false); -#endif - - setup_transport(); - build_menu_bar (); - setup_tooltips (); - - /* pack the main vpacker into the main window and show everything - */ - - _main_window.add (main_vpacker); - transport_frame.show_all (); - - const XMLNode* mnode = main_window_settings (); - - if (mnode) { - const XMLProperty* prop; - gint x = -1; - gint y = -1; - gint w = -1; - gint h = -1; - - if ((prop = mnode->property (X_("x"))) != 0) { - x = atoi (prop->value()); - } - - if ((prop = mnode->property (X_("y"))) != 0) { - y = atoi (prop->value()); - } - - if ((prop = mnode->property (X_("w"))) != 0) { - w = atoi (prop->value()); - } - - if ((prop = mnode->property (X_("h"))) != 0) { - h = atoi (prop->value()); - } - - if (x >= 0 && y >= 0 && w >= 0 && h >= 0) { - _main_window.set_position (Gtk::WIN_POS_NONE); - } - - if (x >= 0 && y >= 0) { - _main_window.move (x, y); - } - - if (w > 0 && h > 0) { - _main_window.set_default_size (w, h); - } - } - - _main_window.show_all (); - setup_toplevel_window (_main_window, "", this); - - _tabs.signal_switch_page().connect (sigc::mem_fun (*this, &ARDOUR_UI::tabs_switch)); - _tabs.signal_page_removed().connect (sigc::mem_fun (*this, &ARDOUR_UI::tabs_page_removed)); - _tabs.signal_page_added().connect (sigc::mem_fun (*this, &ARDOUR_UI::tabs_page_added)); - - /* It would be nice if Gtkmm had wrapped this rather than just - * deprecating the old set_window_creation_hook() method, but oh well... - */ - g_signal_connect (_tabs.gobj(), "create-window", (GCallback) ::tab_window_root_drop, this); - - return 0; -} - -void -ARDOUR_UI::tabs_page_removed (Gtk::Widget*, guint) -{ - if (_tabs.get_n_pages() == 1) { - _tabs.set_show_tabs (false); - } else { - _tabs.set_show_tabs (true); - } -} - -void -ARDOUR_UI::tabs_page_added (Gtk::Widget*, guint) -{ - if (_tabs.get_n_pages() == 1) { - _tabs.set_show_tabs (false); - } else { - _tabs.set_show_tabs (true); - } -} - -void -ARDOUR_UI::tabs_switch (GtkNotebookPage*, guint page_number) -{ - if (page_number == 2) { - if (!rc_option_editor) { - rc_option_editor = new RCOptionEditor; - rc_option_editor_placeholder.pack_start (*rc_option_editor, true, true); - rc_option_editor_placeholder.show_all (); - } - } -} - void ARDOUR_UI::setup_tooltips () { + ArdourCanvas::Canvas::set_tooltip_timeout (Gtk::Settings::get_default()->property_gtk_tooltip_timeout ()); + set_tip (roll_button, _("Play from playhead")); set_tip (stop_button, _("Stop playback")); set_tip (rec_button, _("Toggle record")); @@ -241,9 +82,9 @@ ARDOUR_UI::setup_tooltips () 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")); + set_tip (follow_edits_button, _("Playhead follows Range tool clicks, and Range selections")); + set_tip (auto_input_button, _("Track Input Monitoring automatically follows transport state")); + parameter_changed("click-gain"); 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.")); @@ -325,71 +166,169 @@ ARDOUR_UI::tearoff_settings (const char* name) const #define PX_SCALE(px) std::max((float)px, rintf((float)px * UIConfiguration::instance().get_ui_scale())) +static +bool drag_failed (const Glib::RefPtr& context, DragResult result, Tabbable* tab) +{ + if (result == Gtk::DRAG_RESULT_NO_TARGET) { + tab->detach (); + return true; + } + return false; +} + void -ARDOUR_UI::setup_transport () +ARDOUR_UI::repack_transport_hbox () { - RefPtr act; + if (time_info_box) { + if (time_info_box->get_parent()) { + transport_hbox.remove (*time_info_box); + } + if (UIConfiguration::instance().get_show_toolbar_selclock ()) { + transport_hbox.pack_start (*time_info_box, false, false); + time_info_box->show(); + } + } - transport_tearoff_hbox.set_border_width (PX_SCALE(3)); - transport_tearoff_hbox.set_spacing (PX_SCALE(3)); + if (mini_timeline.get_parent()) { + transport_hbox.remove (mini_timeline); + } + if (UIConfiguration::instance().get_show_mini_timeline ()) { + transport_hbox.pack_start (mini_timeline, true, true); + mini_timeline.show(); + } - transport_tearoff = manage (new TearOff (transport_tearoff_hbox)); - 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 (editor_meter) { + if (meter_box.get_parent()) { + transport_hbox.remove (meter_box); + transport_hbox.remove (editor_meter_peak_display); + } - if (Profile->get_sae() || Profile->get_mixbus()) { - transport_tearoff->set_can_be_torn_off (false); + if (UIConfiguration::instance().get_show_editor_meter()) { + transport_hbox.pack_end (editor_meter_peak_display, false, false); + transport_hbox.pack_end (meter_box, false, false); + meter_box.show(); + editor_meter_peak_display.show(); + } } - transport_hbox.pack_start (*transport_tearoff, true, false); + bool show_mon = UIConfiguration::instance().get_show_toolbar_monitoring (); + if (show_mon) { + monitor_in_button.show (); + monitor_disk_button.show (); + auto_input_button.show (); + monitoring_spacer.show (); + } else { + monitor_in_button.hide (); + monitor_disk_button.hide (); + auto_input_button.hide (); + monitoring_spacer.hide (); + } + + bool show_rec = UIConfiguration::instance().get_show_toolbar_recpunch (); + if (show_rec) { + punch_label.show (); + layered_label.show (); + punch_in_button.show (); + punch_out_button.show (); + layered_button.show (); + recpunch_spacer.show (); + } else { + punch_label.hide (); + layered_label.hide (); + punch_in_button.hide (); + punch_out_button.hide (); + layered_button.hide (); + recpunch_spacer.hide (); + } - transport_base.set_name ("TransportBase"); - transport_base.add (transport_hbox); +} - transport_frame.set_shadow_type (SHADOW_OUT); - transport_frame.set_name ("BaseFrame"); - transport_frame.add (transport_base); +void +ARDOUR_UI::update_clock_visibility () +{ + if (ARDOUR::Profile->get_small_screen()) { + return; + } + if (UIConfiguration::instance().get_show_secondary_clock ()) { + secondary_clock->show(); + secondary_clock->left_btn()->show(); + secondary_clock->right_btn()->show(); + if (secondary_clock_spacer) { + secondary_clock_spacer->show(); + } + } else { + secondary_clock->hide(); + secondary_clock->left_btn()->hide(); + secondary_clock->right_btn()->hide(); + if (secondary_clock_spacer) { + secondary_clock_spacer->hide(); + } + } +} - transport_tearoff->Detach.connect (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::detach_tearoff), static_cast(&top_packer), - static_cast(&transport_frame))); - transport_tearoff->Attach.connect (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast (&top_packer), - static_cast (&transport_frame), 1)); - transport_tearoff->Hidden.connect (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::detach_tearoff), static_cast(&top_packer), - static_cast(&transport_frame))); - transport_tearoff->Visible.connect (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast (&top_packer), - static_cast (&transport_frame), 1)); +bool +ARDOUR_UI::transport_expose (GdkEventExpose* ev) +{ +return false; + int x0, y0; + Gtk::Widget* window_parent; + Glib::RefPtr win = Gtkmm2ext::window_to_draw_on (transport_table, &window_parent); + Glib::RefPtr style = transport_table.get_style(); + if (!win || !style) { + return false; + } - auto_return_button.set_text(_("Auto Return")); + Cairo::RefPtr cr = transport_table.get_window()->create_cairo_context (); - follow_edits_button.set_text(_("Follow Edits")); + cr->rectangle (ev->area.x, ev->area.y, ev->area.width, ev->area.height); + cr->clip (); -// auto_input_button.set_text (_("Auto Input")); + transport_table.translate_coordinates (*window_parent, 0, 0, x0, y0); - click_button.set_icon (ArdourIcon::TransportMetronom); + cr->rectangle (x0, y0, transport_table.get_width(), transport_table.get_height()); + Gdk::Color bg (style->get_bg (transport_table.get_state())); + cr->set_source_rgb (bg.get_red_p(), bg.get_green_p(), bg.get_blue_p()); + cr->fill (); - act = ActionManager::get_action ("Transport", "ToggleClick"); - click_button.set_related_action (act); - click_button.signal_button_press_event().connect (sigc::mem_fun (*this, &ARDOUR_UI::click_button_clicked), false); + static const int xmargin = 2; + static const int ymargin = 1; - auto_return_button.set_name ("transport option button"); - follow_edits_button.set_name ("transport option button"); - auto_input_button.set_name ("transport option button"); + /* draw box around record-options */ + int xx, ww, hh, uu; - /* these have to provide a clear indication of active state */ + punch_label.translate_coordinates (transport_table, -xmargin, 0, xx, uu); // left + punch_out_button.translate_coordinates (transport_table, xmargin, 0, ww, uu); // right + ww += punch_out_button.get_width () - xx; // width + hh = transport_table.get_height() - 1; - click_button.set_name ("transport button"); - sync_button.set_name ("transport active option button"); + Gtkmm2ext::rounded_rectangle (cr->cobj(), x0 + xx - 0.5, y0 + 0.5, ww + 1, hh, 6); + cr->set_source_rgb (0, 0, 0); + cr->set_line_width (1.0); + cr->stroke (); - stop_button.set_active (true); + /* line to rec-enable */ + int rx; + rec_button.translate_coordinates (transport_table, -xmargin, 0, rx, uu); // top + int dx = rx + rec_button.get_width() - xx; - goto_start_button.set_icon (ArdourIcon::TransportStart); - goto_end_button.set_icon (ArdourIcon::TransportEnd); - roll_button.set_icon (ArdourIcon::TransportPlay); - stop_button.set_icon (ArdourIcon::TransportStop); - play_selection_button.set_icon (ArdourIcon::TransportRange); - auto_loop_button.set_icon (ArdourIcon::TransportLoop); - rec_button.set_icon (ArdourIcon::RecButton); - midi_panic_button.set_icon (ArdourIcon::TransportPanic); + cr->move_to (x0 + xx, 1.5 + y0 + ymargin + round (punch_in_button.get_height () * .5)); + cr->rel_line_to (dx, 0); + cr->set_line_width (2.0); + cr->stroke (); + + return false; +} + +void +ARDOUR_UI::setup_transport () +{ + RefPtr act; + /* setup actions */ + + act = ActionManager::get_action ("Transport", "ToggleClick"); + click_button.set_related_action (act); + click_button.signal_button_press_event().connect (sigc::mem_fun (*this, &ARDOUR_UI::click_button_clicked), false); + click_button.signal_scroll_event().connect (sigc::mem_fun (*this, &ARDOUR_UI::click_button_scroll), false); act = ActionManager::get_action (X_("Transport"), X_("Stop")); stop_button.set_related_action (act); @@ -408,16 +347,26 @@ ARDOUR_UI::setup_transport () act = ActionManager::get_action (X_("MIDI"), X_("panic")); midi_panic_button.set_related_action (act); act = ActionManager::get_action (X_("Transport"), X_("ToggleExternalSync")); + sync_button.set_related_action (act); + sync_button.signal_button_press_event().connect (sigc::mem_fun (*this, &ARDOUR_UI::sync_button_clicked), false); - /* clocks, etc. */ + sync_button.set_sizing_text (S_("LogestSync|M-Clk")); - ARDOUR_UI::Clock.connect (sigc::mem_fun (primary_clock, &AudioClock::set)); - ARDOUR_UI::Clock.connect (sigc::mem_fun (secondary_clock, &AudioClock::set)); + /* CANNOT sigc::bind these to clicked or toggled, must use pressed or released */ + act = ActionManager::get_action (X_("Main"), X_("cancel-solo")); + solo_alert_button.set_related_action (act); + auditioning_alert_button.signal_clicked.connect (sigc::mem_fun(*this,&ARDOUR_UI::audition_alert_clicked)); + error_alert_button.signal_button_release_event().connect (sigc::mem_fun(*this,&ARDOUR_UI::error_alert_press), false); + act = ActionManager::get_action (X_("Editor"), X_("toggle-log-window")); + error_alert_button.set_related_action(act); + error_alert_button.set_fallthrough_to_parent(true); - 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)); - big_clock->ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::big_clock_value_changed)); + layered_button.signal_clicked.connect (sigc::mem_fun(*this,&ARDOUR_UI::layered_button_clicked)); + + editor_visibility_button.set_related_action (ActionManager::get_action (X_("Common"), X_("change-editor-visibility"))); + mixer_visibility_button.set_related_action (ActionManager::get_action (X_("Common"), X_("change-mixer-visibility"))); + prefs_visibility_button.set_related_action (ActionManager::get_action (X_("Common"), X_("change-preferences-visibility"))); act = ActionManager::get_action ("Transport", "ToggleAutoReturn"); auto_return_button.set_related_action (act); @@ -426,32 +375,114 @@ ARDOUR_UI::setup_transport () act = ActionManager::get_action ("Transport", "ToggleAutoInput"); auto_input_button.set_related_action (act); - /* alerts */ + act = ActionManager::get_action ("Transport", "TogglePunchIn"); + punch_in_button.set_related_action (act); + act = ActionManager::get_action ("Transport", "TogglePunchOut"); + punch_out_button.set_related_action (act); - /* CANNOT sigc::bind these to clicked or toggled, must use pressed or released */ + act = ActionManager::get_action ("Transport", "SessionMonitorIn"); + monitor_in_button.set_related_action (act); + act = ActionManager::get_action ("Transport", "SessionMonitorDisk"); + monitor_disk_button.set_related_action (act); + + /* connect signals */ + 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)); + big_clock->ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::big_clock_value_changed)); + + editor_visibility_button.signal_drag_failed().connect (sigc::bind (sigc::ptr_fun (drag_failed), editor)); + mixer_visibility_button.signal_drag_failed().connect (sigc::bind (sigc::ptr_fun (drag_failed), mixer)); + prefs_visibility_button.signal_drag_failed().connect (sigc::bind (sigc::ptr_fun (drag_failed), rc_option_editor)); + + /* catch context clicks so that we can show a menu on these buttons */ + + editor_visibility_button.signal_button_press_event().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::tabbable_visibility_button_press), X_("editor")), false); + mixer_visibility_button.signal_button_press_event().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::tabbable_visibility_button_press), X_("mixer")), false); + prefs_visibility_button.signal_button_press_event().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::tabbable_visibility_button_press), X_("preferences")), false); + + /* setup widget style/name */ + + auto_return_button.set_name ("transport option button"); + follow_edits_button.set_name ("transport option button"); solo_alert_button.set_name ("rude solo"); - act = ActionManager::get_action (X_("Main"), X_("cancel-solo")); - solo_alert_button.set_related_action (act); auditioning_alert_button.set_name ("rude audition"); - auditioning_alert_button.signal_button_press_event().connect (sigc::mem_fun(*this,&ARDOUR_UI::audition_alert_press), false); feedback_alert_button.set_name ("feedback alert"); - feedback_alert_button.signal_button_press_event().connect (sigc::mem_fun (*this, &ARDOUR_UI::feedback_alert_press), false); error_alert_button.set_name ("error alert"); - error_alert_button.signal_button_release_event().connect (sigc::mem_fun(*this,&ARDOUR_UI::error_alert_press), false); - act = ActionManager::get_action (X_("Editor"), X_("toggle-log-window")); - error_alert_button.set_related_action(act); - error_alert_button.set_fallthrough_to_parent(true); - alert_box.set_homogeneous (true); - alert_box.set_spacing (PX_SCALE(2)); - alert_box.pack_start (solo_alert_button, true, true); - alert_box.pack_start (auditioning_alert_button, true, true); - alert_box.pack_start (feedback_alert_button, true, true); + solo_alert_button.set_elements (ArdourButton::Element(ArdourButton::Body|ArdourButton::Text)); + auditioning_alert_button.set_elements (ArdourButton::Element(ArdourButton::Body|ArdourButton::Text)); + feedback_alert_button.set_elements (ArdourButton::Element(ArdourButton::Body|ArdourButton::Text)); + + solo_alert_button.set_layout_font (UIConfiguration::instance().get_SmallerFont()); + auditioning_alert_button.set_layout_font (UIConfiguration::instance().get_SmallerFont()); + feedback_alert_button.set_layout_font (UIConfiguration::instance().get_SmallerFont()); + + editor_visibility_button.set_name (X_("page switch button")); + mixer_visibility_button.set_name (X_("page switch button")); + prefs_visibility_button.set_name (X_("page switch button")); + + punch_in_button.set_name ("punch button"); + punch_out_button.set_name ("punch button"); + layered_button.set_name (("layered button")); + + monitor_in_button.set_name ("monitor button"); + monitor_disk_button.set_name ("monitor button"); + auto_input_button.set_name ("transport option button"); + + click_button.set_name ("transport button"); + sync_button.set_name ("transport active option button"); + + /* and widget text */ + auto_return_button.set_text(_("Auto Return")); + follow_edits_button.set_text(_("Follow Range")); + punch_in_button.set_text (_("In")); + punch_out_button.set_text (_("Out")); + layered_button.set_text (_("Non-Layered")); + + monitor_in_button.set_text (_("All In")); + monitor_disk_button.set_text (_("All Disk")); + auto_input_button.set_text (_("Auto-Input")); + + punch_label.set_text (_("Punch:")); + layered_label.set_text (_("Rec:")); + + /* and tooltips */ + + Gtkmm2ext::UI::instance()->set_tip (editor_visibility_button, + string_compose (_("Drag this tab to the desktop to show %1 in its own window\n\n" + "To re-attach the window, use the Window > %1 > Attach menu action"), editor->name())); + + Gtkmm2ext::UI::instance()->set_tip (mixer_visibility_button, + string_compose (_("Drag this tab to the desktop to show %1 in its own window\n\n" + "To re-attach the window, use the Window > %1 > Attach menu action"), mixer->name())); + + Gtkmm2ext::UI::instance()->set_tip (prefs_visibility_button, + string_compose (_("Drag this tab to the desktop to show %1 in its own window\n\n" + "To re-attach the window, use the Window > %1 > Attach menu action"), rc_option_editor->name())); + + Gtkmm2ext::UI::instance()->set_tip (punch_in_button, _("Start recording at auto-punch start")); + Gtkmm2ext::UI::instance()->set_tip (punch_out_button, _("Stop recording at auto-punch end")); + + Gtkmm2ext::UI::instance()->set_tip (monitor_in_button, _("Force all tracks to monitor Input, unless they are explicitly set to monitor Disk")); + Gtkmm2ext::UI::instance()->set_tip (monitor_disk_button, _("Force all tracks to monitor Disk playback, unless they are explicitly set to Input")); + + /* setup icons */ - /* all transport buttons should be the same size vertically and - * horizontally - */ + click_button.set_icon (ArdourIcon::TransportMetronom); + goto_start_button.set_icon (ArdourIcon::TransportStart); + goto_end_button.set_icon (ArdourIcon::TransportEnd); + roll_button.set_icon (ArdourIcon::TransportPlay); + stop_button.set_icon (ArdourIcon::TransportStop); + play_selection_button.set_icon (ArdourIcon::TransportRange); + auto_loop_button.set_icon (ArdourIcon::TransportLoop); + rec_button.set_icon (ArdourIcon::RecButton); + midi_panic_button.set_icon (ArdourIcon::TransportPanic); + + /* transport control size-group */ Glib::RefPtr transport_button_size_group = SizeGroup::create (SIZE_GROUP_BOTH); transport_button_size_group->add_widget (goto_start_button); @@ -462,147 +493,202 @@ ARDOUR_UI::setup_transport () transport_button_size_group->add_widget (roll_button); transport_button_size_group->add_widget (stop_button); - /* the icon for this has an odd aspect ratio, so fatten up the button */ - midi_panic_button.set_size_request (PX_SCALE(25), -1); - goto_start_button.set_size_request (PX_SCALE(28), PX_SCALE(44)); - click_button.set_size_request (PX_SCALE(32), PX_SCALE(44)); + Glib::RefPtr punch_button_size_group = SizeGroup::create (Gtk::SIZE_GROUP_HORIZONTAL); + punch_button_size_group->add_widget (punch_in_button); + punch_button_size_group->add_widget (punch_out_button); + Glib::RefPtr monitor_button_size_group = SizeGroup::create (Gtk::SIZE_GROUP_HORIZONTAL); + monitor_button_size_group->add_widget (monitor_in_button); + monitor_button_size_group->add_widget (monitor_disk_button); - HBox* tbox1 = manage (new HBox); - HBox* tbox2 = manage (new HBox); - HBox* tbox = manage (new HBox); + /* and now the layout... */ + + /* top level packing */ + transport_table.set_spacings (0); + transport_table.set_row_spacings (4); + transport_table.set_border_width (2); + + transport_frame.set_name ("TransportFrame"); + transport_frame.set_shadow_type (Gtk::SHADOW_NONE); + + /* An event box to hold the table. We use this because we want specific + control over the background color, and without this event box, + nothing inside the transport_frame actually draws a background. We + would therefore end up seeing the background of the parent widget, + which is probably some default color. Adding the EventBox adds a + widget that will draw the background, using a style based on + the parent, "TransportFrame". + */ + Gtk::EventBox* ebox = manage (new Gtk::EventBox); + transport_frame.add (*ebox); + ebox->add (transport_table); - VBox* vbox1 = manage (new VBox); - VBox* vbox2 = manage (new VBox); + transport_table.signal_expose_event().connect (sigc::mem_fun (*this, &ARDOUR_UI::transport_expose), false); - Alignment* a1 = manage (new Alignment); - Alignment* a2 = manage (new Alignment); + /* transport controls sub-group */ + click_button.set_size_request (PX_SCALE(20), PX_SCALE(20)); - tbox1->set_spacing (PX_SCALE(2)); - tbox2->set_spacing (PX_SCALE(2)); + HBox* tbox = manage (new HBox); tbox->set_spacing (PX_SCALE(2)); - if (!Profile->get_trx()) { - tbox1->pack_start (midi_panic_button, true, true, 5); - tbox1->pack_start (click_button, true, true, 5); - } + tbox->pack_start (midi_panic_button, true, true, 0); + tbox->pack_start (click_button, true, true, 0); + tbox->pack_start (goto_start_button, true, true); + tbox->pack_start (goto_end_button, true, true); + tbox->pack_start (auto_loop_button, true, true); + tbox->pack_start (play_selection_button, true, true); + + tbox->pack_start (roll_button, true, true); + tbox->pack_start (stop_button, true, true); + tbox->pack_start (rec_button, true, true, 3); + + /* alert box sub-group */ + VBox* alert_box = manage (new VBox); + alert_box->set_homogeneous (true); + alert_box->set_spacing (1); + alert_box->set_border_width (0); + alert_box->pack_start (solo_alert_button, true, false, 0); + alert_box->pack_start (auditioning_alert_button, true, false, 0); + alert_box->pack_start (feedback_alert_button, true, false, 0); + + /* clock button size groups */ + Glib::RefPtr button_height_size_group = SizeGroup::create (Gtk::SIZE_GROUP_VERTICAL); + button_height_size_group->add_widget (follow_edits_button); + button_height_size_group->add_widget (*primary_clock->left_btn()); + button_height_size_group->add_widget (*primary_clock->right_btn()); + button_height_size_group->add_widget (*secondary_clock->left_btn()); + button_height_size_group->add_widget (*secondary_clock->right_btn()); + + button_height_size_group->add_widget (stop_button); +// button_height_size_group->add_widget (sync_button); + button_height_size_group->add_widget (auto_return_button); + + //tab selections + button_height_size_group->add_widget (editor_visibility_button); + button_height_size_group->add_widget (mixer_visibility_button); - tbox1->pack_start (goto_start_button, true, true); - tbox1->pack_start (goto_end_button, true, true); - tbox1->pack_start (auto_loop_button, true, true); + //punch section + button_height_size_group->add_widget (punch_in_button); + button_height_size_group->add_widget (punch_out_button); + button_height_size_group->add_widget (layered_button); - if (!Profile->get_trx()) { - tbox2->pack_start (play_selection_button, true, true); - } - tbox2->pack_start (roll_button, true, true); - tbox2->pack_start (stop_button, true, true); - tbox2->pack_start (rec_button, true, true, 5); + //input monitoring section + button_height_size_group->add_widget (monitor_in_button); + button_height_size_group->add_widget (monitor_disk_button); + button_height_size_group->add_widget (auto_input_button); - vbox1->pack_start (*tbox1, true, true); - vbox2->pack_start (*tbox2, true, true); + Glib::RefPtr clock1_size_group = SizeGroup::create (SIZE_GROUP_HORIZONTAL); + clock1_size_group->add_widget (*primary_clock->left_btn()); + clock1_size_group->add_widget (*primary_clock->right_btn()); - a1->add (*vbox1); - a1->set (0.5, 0.5, 0.0, 1.0); - a2->add (*vbox2); - a2->set (0.5, 0.5, 0.0, 1.0); + Glib::RefPtr clock2_size_group = SizeGroup::create (SIZE_GROUP_HORIZONTAL); + clock2_size_group->add_widget (*secondary_clock->left_btn()); + clock2_size_group->add_widget (*secondary_clock->right_btn()); - tbox->pack_start (*a1, false, false); - tbox->pack_start (*a2, false, false); + /* sub-layout for Sync | Shuttle (grow) */ + HBox* ssbox = manage (new HBox); + ssbox->set_spacing (PX_SCALE(2)); + ssbox->pack_start (sync_button, false, false, 0); + ssbox->pack_start (shuttle_box, true, true, 0); + ssbox->pack_start (*shuttle_box.info_button(), false, false, 0); - HBox* clock_box = manage (new HBox); - clock_box->pack_start (*primary_clock, false, false); - if (!ARDOUR::Profile->get_small_screen() && !ARDOUR::Profile->get_trx()) { - clock_box->pack_start (*secondary_clock, false, false); - } - clock_box->set_spacing (PX_SCALE(3)); + /* and the main table layout */ - shuttle_box = manage (new ShuttleControl); - shuttle_box->show (); + int col = 0; +#define TCOL col, col + 1 - VBox* transport_vbox = manage (new VBox); - transport_vbox->set_name ("TransportBase"); - transport_vbox->set_border_width (0); - transport_vbox->set_spacing (PX_SCALE(3)); - transport_vbox->pack_start (*tbox, true, true, 0); + transport_table.attach (*tbox, TCOL, 0, 1 , SHRINK, SHRINK, 0, 0); + transport_table.attach (*ssbox, TCOL, 1, 2 , FILL, SHRINK, 0, 0); + ++col; - if (!Profile->get_trx()) { - transport_vbox->pack_start (*shuttle_box, false, false, 0); - } + transport_table.attach (*(manage (new ArdourVSpacer ())), TCOL, 0, 2 , SHRINK, EXPAND|FILL, 3, 0); + ++col; - time_info_box = manage (new TimeInfoBox); + transport_table.attach (punch_label, TCOL, 0, 1 , FILL, SHRINK, 3, 0); + transport_table.attach (layered_label, TCOL, 1, 2 , FILL, SHRINK, 3, 0); + ++col; - if (ARDOUR::Profile->get_trx()) { - transport_tearoff_hbox.pack_start (*time_info_box, false, false); - } + transport_table.attach (punch_in_button, col, col + 1, 0, 1 , FILL, SHRINK, 2, 2); + transport_table.attach (punch_space, col + 1, col + 2, 0, 1 , FILL, SHRINK, 0, 2); + transport_table.attach (punch_out_button, col + 2, col + 3, 0, 1 , FILL, SHRINK, 2, 2); + transport_table.attach (layered_button, col, col + 3, 1, 2 , FILL, SHRINK, 2, 2); + col += 3; - transport_tearoff_hbox.pack_start (*transport_vbox, false, false); + transport_table.attach (recpunch_spacer, TCOL, 0, 2 , SHRINK, EXPAND|FILL, 3, 0); + ++col; - /* transport related toggle controls */ + transport_table.attach (auto_input_button, col, col + 3, 0, 1 , FILL, SHRINK, 2, 2); + transport_table.attach (monitor_in_button, col, col + 1, 1, 2 , FILL, SHRINK, 2, 2); + transport_table.attach (mon_space, col + 1, col + 2, 1, 2 , FILL, SHRINK, 2, 2); + transport_table.attach (monitor_disk_button, col + 2, col + 3, 1, 2 , FILL, SHRINK, 2, 2); + col += 3; - VBox* auto_box = manage (new VBox); - auto_box->set_homogeneous (true); - auto_box->set_spacing (PX_SCALE(2)); - 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); - } + transport_table.attach (monitoring_spacer, TCOL, 0, 2 , SHRINK, EXPAND|FILL, 3, 0); + ++col; - if (!ARDOUR::Profile->get_trx()) { - transport_tearoff_hbox.pack_start (*auto_box, false, false); - } - transport_tearoff_hbox.pack_start (*clock_box, true, true); + transport_table.attach (follow_edits_button, TCOL, 0, 1 , FILL, SHRINK, 2, 0); + transport_table.attach (auto_return_button, TCOL, 1, 2 , FILL, SHRINK, 2, 0); + ++col; - if (ARDOUR::Profile->get_trx()) { - transport_tearoff_hbox.pack_start (*auto_box, false, false); - } + transport_table.attach (*(manage (new ArdourVSpacer ())), TCOL, 0, 2 , SHRINK, EXPAND|FILL, 3, 0); + ++col; - if (!ARDOUR::Profile->get_trx()) { - transport_tearoff_hbox.pack_start (*time_info_box, false, false); - } + transport_table.attach (*primary_clock, col, col + 2, 0, 1 , FILL, SHRINK, 2, 0); + transport_table.attach (*primary_clock->left_btn(), col, col + 1, 1, 2 , FILL, SHRINK, 2, 0); + transport_table.attach (*primary_clock->right_btn(), col + 1, col + 2, 1, 2 , FILL, SHRINK, 2, 0); + col += 2; - 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); - } + transport_table.attach (*(manage (new ArdourVSpacer ())), TCOL, 0, 2 , SHRINK, EXPAND|FILL, 3, 0); + ++col; - if (Profile->get_sae()) { - Image* img = manage (new Image ((::get_icon (X_("sae"))))); - transport_tearoff_hbox.pack_end (*img, false, false); + if (!ARDOUR::Profile->get_small_screen()) { + transport_table.attach (*secondary_clock, col, col + 2, 0, 1 , FILL, SHRINK, 2, 0); + transport_table.attach (*secondary_clock->left_btn(), col, col + 1, 1, 2 , FILL, SHRINK, 2, 0); + transport_table.attach (*secondary_clock->right_btn(), col + 1, col + 2, 1, 2 , FILL, SHRINK, 2, 0); + secondary_clock->set_no_show_all (true); + secondary_clock->left_btn()->set_no_show_all (true); + secondary_clock->right_btn()->set_no_show_all (true); + col += 2; + + secondary_clock_spacer = manage (new ArdourVSpacer ()); + transport_table.attach (*secondary_clock_spacer, TCOL, 0, 2 , SHRINK, EXPAND|FILL, 3, 0); + ++col; } - /* desensitize */ + transport_table.attach (*alert_box, TCOL, 0, 2, SHRINK, EXPAND|FILL, 2, 0); + ++col; - set_transport_sensitivity (false); + transport_table.attach (*(manage (new ArdourVSpacer ())), TCOL, 0, 2 , SHRINK, EXPAND|FILL, 3, 0); + ++col; - XMLNode* tnode = tearoff_settings ("transport"); - if (tnode) { - transport_tearoff->set_state (*tnode); - } -} -#undef PX_SCALE + /* editor-meter, mini-timeline and selection clock are options in the transport_hbox */ + transport_hbox.set_spacing (3); + transport_table.attach (transport_hbox, TCOL, 0, 2, EXPAND|FILL, EXPAND|FILL, 2, 0); + ++col; -void -ARDOUR_UI::detach_tearoff (Box* b, Widget* w) -{ - b->remove (*w); -} + /* lua script action buttons */ + transport_table.attach (action_script_table, TCOL, 0, 2, SHRINK, EXPAND|FILL, 1, 0); + ++col; -void -ARDOUR_UI::reattach_tearoff (Box* b, Widget* w, int32_t n) -{ - b->pack_start (*w); - b->reorder_child (*w, n); -} + transport_table.attach (editor_visibility_button, TCOL, 0, 1 , FILL, SHRINK, 2, 0); + transport_table.attach (mixer_visibility_button, TCOL, 1, 2 , FILL, SHRINK, 2, 0); + ++col; -void -ARDOUR_UI::reattach_all_tearoffs () -{ - if (transport_tearoff) transport_tearoff->put_it_back(); - if (editor) editor->reattach_all_tearoffs (); + repack_transport_hbox (); + update_clock_visibility (); + /* desensitize */ + + feedback_alert_button.set_sensitive (false); + feedback_alert_button.set_visual_state (Gtkmm2ext::NoVisualState); + auditioning_alert_button.set_sensitive (false); + auditioning_alert_button.set_visual_state (Gtkmm2ext::NoVisualState); + + stop_button.set_active (true); + set_transport_sensitivity (false); } +#undef PX_SCALE +#undef TCOL void ARDOUR_UI::soloing_changed (bool onoff) @@ -616,6 +702,10 @@ void ARDOUR_UI::_auditioning_changed (bool onoff) { auditioning_alert_button.set_active (onoff); + auditioning_alert_button.set_sensitive (onoff); + if (!onoff) { + auditioning_alert_button.set_visual_state (Gtkmm2ext::NoVisualState); + } set_transport_sensitivity (!onoff); } @@ -625,19 +715,12 @@ ARDOUR_UI::auditioning_changed (bool onoff) UI::instance()->call_slot (MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::_auditioning_changed, this, onoff)); } -bool -ARDOUR_UI::audition_alert_press (GdkEventButton*) +void +ARDOUR_UI::audition_alert_clicked () { if (_session) { _session->cancel_audition(); } - return true; -} - -bool -ARDOUR_UI::feedback_alert_press (GdkEventButton *) -{ - return true; } bool @@ -660,6 +743,14 @@ ARDOUR_UI::error_alert_press (GdkEventButton* ev) return !do_toggle; } +void +ARDOUR_UI::layered_button_clicked () +{ + if (_session) { + _session->config.set_layered_record_mode (!_session->config.get_layered_record_mode ()); + } +} + void ARDOUR_UI::solo_blink (bool onoff) { @@ -757,13 +848,21 @@ ARDOUR_UI::error_blink (bool onoff) } } - +void +ARDOUR_UI::set_loop_sensitivity () +{ + if (!_session || _session->config.get_external_sync()) { + auto_loop_button.set_sensitive (false); + } else { + auto_loop_button.set_sensitive (_session && _session->locations()->auto_loop_location()); + } +} void ARDOUR_UI::set_transport_sensitivity (bool yn) { ActionManager::set_sensitive (ActionManager::transport_sensitive_actions, yn); - shuttle_box->set_sensitive (yn); + shuttle_box.set_sensitive (yn); } void @@ -775,14 +874,6 @@ ARDOUR_UI::editor_realized () UIConfiguration::instance().reset_dpi (); } -void -ARDOUR_UI::update_tearoff_visibility () -{ - if (editor) { - editor->update_tearoff_visibility (); - } -} - void ARDOUR_UI::maximise_editing_space () { @@ -802,11 +893,12 @@ ARDOUR_UI::restore_editing_space () void ARDOUR_UI::show_ui_prefs () { - tabs().set_current_page (2); - rc_option_editor->set_current_page (_("GUI")); + if (rc_option_editor) { + show_tabbable (rc_option_editor); + rc_option_editor->set_current_page (_("Appearance")); + } } - bool ARDOUR_UI::click_button_clicked (GdkEventButton* ev) { @@ -815,8 +907,44 @@ ARDOUR_UI::click_button_clicked (GdkEventButton* ev) return false; } - tabs().set_current_page (2); - rc_option_editor->set_current_page (_("Misc")); + show_tabbable (rc_option_editor); + rc_option_editor->set_current_page (_("Metronome")); + return true; +} + +bool +ARDOUR_UI::click_button_scroll (GdkEventScroll* ev) +{ + gain_t gain = Config->get_click_gain(); + float gain_db = accurate_coefficient_to_dB (gain); + + switch (ev->direction) { + case GDK_SCROLL_UP: + case GDK_SCROLL_LEFT: + gain_db += 1; + break; + case GDK_SCROLL_DOWN: + case GDK_SCROLL_RIGHT: + gain_db -= 1; + break; + } + gain_db = std::max (-60.f, gain_db); + gain = dB_to_coefficient (gain_db); + gain = std::min (gain, Config->get_max_gain()); + Config->set_click_gain (gain); + return true; +} + +bool +ARDOUR_UI::sync_button_clicked (GdkEventButton* ev) +{ + if (ev->button != 3) { + /* this handler is just for button-3 clicks */ + return false; + } + + show_tabbable (rc_option_editor); + rc_option_editor->set_current_page (_("Sync")); return true; } @@ -857,4 +985,5 @@ ARDOUR_UI::update_title () WindowTitle title (Glib::get_application_name()); _main_window.set_title (title.get_string()); } + }