X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui2.cc;h=0d5a52ba13478bc4b1f282191d3f033c1b3f756f;hb=b44889a55b493e3ab7aaf520d8f45687677cfe81;hp=950cadc382c48198c438bf820e89107d3eaca991;hpb=83babb8a52a80b71d971817fd0a90df90c31045d;p=ardour.git diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 950cadc382..0d5a52ba13 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -29,34 +29,39 @@ #include #include +#include "canvas/canvas.h" + #include "pbd/error.h" #include "pbd/basename.h" #include "pbd/fastlog.h" -#include -#include -#include -#include + +#include "gtkmm2ext/cairocell.h" +#include "gtkmm2ext/utils.h" +#include "gtkmm2ext/click_box.h" +#include "gtkmm2ext/window_title.h" #include "ardour/profile.h" #include "ardour/session.h" #include "ardour/types.h" +#include "ardour_spacer.h" #include "ardour_ui.h" #include "keyboard.h" #include "public_editor.h" #include "audio_clock.h" #include "actions.h" #include "main_clock.h" +#include "mixer_ui.h" #include "utils.h" #include "theme_manager.h" #include "midi_tracer.h" +#include "mini_timeline.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; @@ -66,67 +71,11 @@ using namespace Gtk; using namespace Glib; using namespace ARDOUR_UI_UTILS; -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; - } - - /* all other dialogs are created conditionally */ - - we_have_dependents (); - -#ifdef TOP_MENUBAR - HBox* status_bar_packer = manage (new HBox); - 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_packer->pack_start (*status_bar_event_box, true, true, 6); - status_bar_packer->pack_start (error_alert_button, false, false); - - status_bar_label.show (); - status_bar_event_box->show (); - status_bar_packer->show (); - error_alert_button.show (); - - status_bar_event_box->signal_button_press_event().connect (mem_fun (*this, &ARDOUR_UI::status_bar_button_press)); - - editor->get_status_bar_packer().pack_start (*status_bar_packer, true, true); - editor->get_status_bar_packer().pack_start (menu_bar_base, false, false, 6); -#else - top_packer.pack_start (menu_bar_base, false, false); -#endif - - editor->add_toplevel_menu (top_packer); - - editor->add_transport_frame (transport_frame); - - setup_transport(); - - build_menu_bar (); - - setup_tooltips (); - - return 0; -} - 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")); @@ -136,15 +85,16 @@ 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 (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 (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.\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 All Peak Indicators")); + set_tip (error_alert_button, _("Show Error Log and acknowledge warnings")); synchronize_sync_source_and_video_pullup (); @@ -175,22 +125,24 @@ ARDOUR_UI::display_message (const char *prefix, gint prefix_len, RefPtr"; + ll = LogLevelError; } else if (strcmp (prefix, _("[WARNING]: ")) == 0) { text = ""; + ll = LogLevelWarning; } else if (strcmp (prefix, _("[INFO]: ")) == 0) { text = ""; + ll = LogLevelInfo; } else { text = "???"; } + _log_not_acknowledged = std::max(_log_not_acknowledged, ll); + +#ifdef TOP_MENUBAR text += prefix; text += ""; text += msg; @@ -215,75 +167,81 @@ ARDOUR_UI::tearoff_settings (const char* name) const return 0; } -void -ARDOUR_UI::setup_transport () -{ - RefPtr act; - - transport_tearoff_hbox.set_border_width (3); - transport_tearoff_hbox.set_spacing (3); +#define PX_SCALE(px) std::max((float)px, rintf((float)px * UIConfiguration::instance().get_ui_scale())) - 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); +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; +} - if (Profile->get_sae() || Profile->get_mixbus()) { - transport_tearoff->set_can_be_torn_off (false); +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; } - transport_hbox.pack_start (*transport_tearoff, true, false); + Cairo::RefPtr cr = transport_table.get_window()->create_cairo_context (); - transport_base.set_name ("TransportBase"); - transport_base.add (transport_hbox); + cr->rectangle (ev->area.x, ev->area.y, ev->area.width, ev->area.height); + cr->clip (); - transport_frame.set_shadow_type (SHADOW_OUT); - transport_frame.set_name ("BaseFrame"); - transport_frame.add (transport_base); + transport_table.translate_coordinates (*window_parent, 0, 0, x0, y0); - 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)); + 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 (); - auto_return_button.set_text(_("Auto Return")); + static const int xmargin = 2; + static const int ymargin = 1; - follow_edits_button.set_text(_("Follow Edits")); + /* draw box around record-options */ + int xx, ww, hh, uu; -// auto_input_button.set_text (_("Auto Input")); + 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_image (get_icon (X_("metronome"))); - 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); + 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 (); - auto_return_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 */ + /* 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; - click_button.set_name ("transport button"); - sync_button.set_name ("transport active option button"); + 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 (); - stop_button.set_active (true); + return false; +} - goto_start_button.set_image (get_icon (X_("transport_start"))); - goto_end_button.set_image (get_icon (X_("transport_end"))); - roll_button.set_image (get_icon (X_("transport_play"))); - stop_button.set_image (get_icon (X_("transport_stop"))); - play_selection_button.set_image (get_icon (X_("transport_range"))); - auto_loop_button.set_image (get_icon (X_("transport_loop"))); +void +ARDOUR_UI::setup_transport () +{ + RefPtr act; + /* setup actions */ - rec_button.set_elements ((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body|ArdourButton::RecButton)); + 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); - midi_panic_button.set_image (get_icon (X_("midi_panic"))); - /* the icon for this has an odd aspect ratio, so fatten up the button */ - midi_panic_button.set_size_request (25, -1); - act = ActionManager::get_action (X_("Transport"), X_("Stop")); stop_button.set_related_action (act); act = ActionManager::get_action (X_("Transport"), X_("Roll")); @@ -303,14 +261,22 @@ ARDOUR_UI::setup_transport () act = ActionManager::get_action (X_("Transport"), X_("ToggleExternalSync")); sync_button.set_related_action (act); - /* 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); @@ -319,179 +285,269 @@ 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 */ + /* 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"); + auto_input_button.set_name ("transport option button"); solo_alert_button.set_name ("rude solo"); - solo_alert_button.signal_button_press_event().connect (sigc::mem_fun(*this,&ARDOUR_UI::solo_alert_press), false); 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_press_event().connect (sigc::mem_fun(*this,&ARDOUR_UI::error_alert_press), false); - alert_box.set_homogeneous (true); - alert_box.set_spacing (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)); - /* all transport buttons should be the same size vertically and - * horizontally - */ + 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()); - 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); + 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")); - goto_start_button.set_size_request (-1, 40); + punch_in_button.set_name ("punch button"); + punch_out_button.set_name ("punch button"); + layered_button.set_name (("layered button")); - HBox* tbox1 = manage (new HBox); - HBox* tbox2 = manage (new HBox); - HBox* tbox = manage (new HBox); + click_button.set_name ("transport button"); + sync_button.set_name ("transport active option button"); - VBox* vbox1 = manage (new VBox); - VBox* vbox2 = manage (new VBox); + /* and widget text */ + auto_return_button.set_text(_("Auto Return")); + follow_edits_button.set_text(_("Follow Edits")); + //auto_input_button.set_text (_("Auto Input")); + punch_in_button.set_text (_("In")); + punch_out_button.set_text (_("Out")); + layered_button.set_text (_("Non-Layered")); - Alignment* a1 = manage (new Alignment); - Alignment* a2 = manage (new Alignment); + punch_label.set_text (_("Punch:")); + layered_label.set_text (_("Rec:")); - tbox1->set_spacing (2); - tbox2->set_spacing (2); - tbox->set_spacing (2); + /* and tooltips */ - if (!Profile->get_trx()) { - tbox1->pack_start (midi_panic_button, true, true, 5); - tbox1->pack_start (click_button, true, true, 5); - } + 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 put the window back, use the Window > %1 > Attach menu action"), editor->name())); - tbox1->pack_start (goto_start_button, true, true); - tbox1->pack_start (goto_end_button, true, true); - tbox1->pack_start (auto_loop_button, true, true); + 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 put the window back, use the Window > %1 > Attach menu action"), mixer->name())); - 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); + 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 put the window back, use the Window > %1 > Attach menu action"), rc_option_editor->name())); - vbox1->pack_start (*tbox1, true, true); - vbox2->pack_start (*tbox2, true, true); + 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")); - 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); + /* setup icons */ - tbox->pack_start (*a1, false, false); - tbox->pack_start (*a2, false, false); + 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); - HBox* clock_box = manage (new HBox); + /* transport control size-group */ - 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 (3); + 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 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); shuttle_box = manage (new ShuttleControl); - shuttle_box->show (); - - VBox* transport_vbox = manage (new VBox); - transport_vbox->set_name ("TransportBase"); - transport_vbox->set_border_width (0); - transport_vbox->set_spacing (3); - transport_vbox->pack_start (*tbox, true, true, 0); - - if (!Profile->get_trx()) { - transport_vbox->pack_start (*shuttle_box, false, false, 0); - } + mini_timeline = manage (new MiniTimeline); - time_info_box = manage (new TimeInfoBox); + /* and now the layout... */ - if (ARDOUR::Profile->get_trx()) { - transport_tearoff_hbox.pack_start (*time_info_box, false, false); - } - - transport_tearoff_hbox.pack_start (*transport_vbox, false, false); + /* top level packing */ + transport_table.set_spacings (0); + transport_table.set_row_spacings (4); + transport_table.set_border_width (2); + transport_frame.add (transport_table); + transport_frame.set_name ("BaseFrame"); + transport_frame.set_shadow_type (Gtk::SHADOW_NONE); - /* transport related toggle controls */ + transport_table.signal_expose_event().connect (sigc::mem_fun (*this, &ARDOUR_UI::transport_expose), false); - VBox* auto_box = manage (new VBox); - auto_box->set_homogeneous (true); - auto_box->set_spacing (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 controls sub-group */ + click_button.set_size_request (PX_SCALE(20), PX_SCALE(20)); - if (!ARDOUR::Profile->get_trx()) { - transport_tearoff_hbox.pack_start (*auto_box, false, false); - } - transport_tearoff_hbox.pack_start (*clock_box, true, true); + HBox* tbox = manage (new HBox); + tbox->set_spacing (PX_SCALE(2)); + + 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 (layered_button); + button_height_size_group->add_widget (auto_return_button); + button_height_size_group->add_widget (editor_visibility_button); + button_height_size_group->add_widget (mixer_visibility_button); + + Glib::RefPtr clock1_size_group = SizeGroup::create (SIZE_GROUP_BOTH); + clock1_size_group->add_widget (*primary_clock->left_btn()); + clock1_size_group->add_widget (*primary_clock->right_btn()); + + Glib::RefPtr clock2_size_group = SizeGroup::create (SIZE_GROUP_BOTH); + clock2_size_group->add_widget (*secondary_clock->left_btn()); + clock2_size_group->add_widget (*secondary_clock->right_btn()); + + /* 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, 3); + + + /* and the main table layout */ + + int col = 0; +#define TCOL col, col + 1 + + transport_table.attach (*tbox, TCOL, 0, 1 , SHRINK, SHRINK, 0, 0); + transport_table.attach (*ssbox, TCOL, 1, 2 , FILL, SHRINK, 0, 0); + ++col; + + transport_table.attach (*(manage (new ArdourVSpacer ())), TCOL, 0, 2 , SHRINK, EXPAND|FILL, 3, 0); + ++col; + + 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; + + transport_table.attach (punch_in_button, col, col + 1, 0, 1 , FILL, SHRINK, 0, 2); + transport_table.attach (*(manage (new Label (""))), col + 1, col + 2, 0, 1 , FILL, SHRINK, 2, 2); + transport_table.attach (punch_out_button, col + 2, col + 3, 0, 1 , FILL, SHRINK, 0, 2); + transport_table.attach (layered_button, col, col + 3, 1, 2 , FILL, SHRINK, 0, 2); + col += 3; + + transport_table.attach (*(manage (new ArdourVSpacer ())), TCOL, 0, 2 , SHRINK, EXPAND|FILL, 3, 0); + ++col; + + 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; + + transport_table.attach (*(manage (new ArdourVSpacer ())), TCOL, 0, 2 , SHRINK, EXPAND|FILL, 3, 0); + ++col; + + 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; + + transport_table.attach (*(manage (new ArdourVSpacer ())), TCOL, 0, 2 , SHRINK, EXPAND|FILL, 3, 0); + ++col; + + 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); + col += 2; + } + + 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 (*auto_box, false, false); - } + transport_table.attach (*alert_box, TCOL, 0, 2, SHRINK, EXPAND|FILL, 2, 0); + ++col; + + 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); - } + /* editor-meter is in transport_hbox */ + transport_hbox.set_spacing (PX_SCALE(1)); + transport_table.attach (transport_hbox, TCOL, 0, 2, SHRINK, EXPAND|FILL, 2, 0); + ++col; - if (ARDOUR::Profile->get_small_screen()) { - transport_tearoff_hbox.pack_start (_editor_transport_box, false, false); - } + transport_table.attach (*mini_timeline, TCOL, 0, 2, EXPAND|FILL, EXPAND|FILL, 1, 0); + ++col; - 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); - } + /* lua script action buttons */ + transport_table.attach (action_script_table, TCOL, 0, 2, SHRINK, EXPAND|FILL, 1, 0); + ++col; - if (Profile->get_sae()) { - Image* img = manage (new Image ((::get_icon (X_("sae"))))); - transport_tearoff_hbox.pack_end (*img, false, false); - } + 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; /* desensitize */ - set_transport_sensitivity (false); - - XMLNode* tnode = tearoff_settings ("transport"); - if (tnode) { - transport_tearoff->set_state (*tnode); - } -} - -void -ARDOUR_UI::detach_tearoff (Box* b, Widget* w) -{ -// editor->ensure_float (transport_tearoff->tearoff_window()); - b->remove (*w); -} + 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); -void -ARDOUR_UI::reattach_tearoff (Box* b, Widget* w, int32_t n) -{ - b->pack_start (*w); - b->reorder_child (*w, n); -} - -void -ARDOUR_UI::reattach_all_tearoffs () -{ - if (transport_tearoff) transport_tearoff->put_it_back(); - if (editor) editor->reattach_all_tearoffs (); + stop_button.set_active (true); + set_transport_sensitivity (false); } +#undef PX_SCALE +#undef TCOL void ARDOUR_UI::soloing_changed (bool onoff) @@ -505,6 +561,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); } @@ -514,40 +574,40 @@ 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::solo_alert_press (GdkEventButton*) +ARDOUR_UI::error_alert_press (GdkEventButton* ev) { - if (_session) { - if (_session->soloing()) { - _session->set_solo (_session->get_routes(), false); - } else if (_session->listening()) { - _session->set_listen (_session->get_routes(), false); + bool do_toggle = true; + if (ev->button == 1) { + if (_log_not_acknowledged == LogLevelError) { + // just acknowledge the error, don't hide the log if it's already visible + RefPtr act = ActionManager::get_action (X_("Editor"), X_("toggle-log-window")); + Glib::RefPtr tact = Glib::RefPtr::cast_dynamic (act); + if (tact && tact->get_active()) { + do_toggle = false; + } } + _log_not_acknowledged = LogLevelNone; + error_blink (false); // immediate acknowledge } - return true; -} - -bool -ARDOUR_UI::feedback_alert_press (GdkEventButton *) -{ - return true; + // maybe fall through to to button toggle + return !do_toggle; } -bool -ARDOUR_UI::error_alert_press (GdkEventButton*) +void +ARDOUR_UI::layered_button_clicked () { - _error_not_acknowledged = false; - UI::show_errors(); - return true; + if (_session) { + _session->config.set_layered_record_mode (!_session->config.get_layered_record_mode ()); + } } void @@ -626,14 +686,24 @@ ARDOUR_UI::feedback_blink (bool onoff) void ARDOUR_UI::error_blink (bool onoff) { - if (_error_not_acknowledged) { - if (onoff) { - error_alert_button.set_active (true); - } else { - error_alert_button.set_active (false); - } - } else { - error_alert_button.set_active (false); + switch (_log_not_acknowledged) { + case LogLevelError: + // blink + if (onoff) { + error_alert_button.set_custom_led_color(0xff0000ff); // bright red + } else { + error_alert_button.set_custom_led_color(0x880000ff); // dark red + } + break; + case LogLevelWarning: + error_alert_button.set_custom_led_color(0xccaa00ff); // yellow + break; + case LogLevelInfo: + error_alert_button.set_custom_led_color(0x88cc00ff); // lime green + break; + default: + error_alert_button.set_custom_led_color(0x333333ff); // gray + break; } } @@ -652,15 +722,7 @@ ARDOUR_UI::editor_realized () boost::function pc (boost::bind (&ARDOUR_UI::parameter_changed, this, _1)); Config->map_parameters (pc); - reset_dpi (); -} - -void -ARDOUR_UI::update_tearoff_visibility () -{ - if (editor) { - editor->update_tearoff_visibility (); - } + UIConfiguration::instance().reset_dpi (); } void @@ -682,15 +744,12 @@ ARDOUR_UI::restore_editing_space () void ARDOUR_UI::show_ui_prefs () { - RefPtr act = ActionManager::get_action (X_("Window"), X_("toggle-rc-options-editor")); - assert (act); - - act->activate(); - - rc_option_editor->set_current_page (_("GUI")); + if (rc_option_editor) { + show_tabbable (rc_option_editor); + rc_option_editor->set_current_page (_("GUI")); + } } - bool ARDOUR_UI::click_button_clicked (GdkEventButton* ev) { @@ -699,12 +758,8 @@ ARDOUR_UI::click_button_clicked (GdkEventButton* ev) return false; } - RefPtr act = ActionManager::get_action (X_("Window"), X_("toggle-rc-options-editor")); - assert (act); - - act->activate(); - - rc_option_editor->set_current_page (_("Misc")); + show_tabbable (rc_option_editor); + rc_option_editor->set_current_page (_("Misc/Click")); return true; } @@ -717,7 +772,33 @@ ARDOUR_UI::toggle_follow_edits () RefPtr tact = RefPtr::cast_dynamic (act); assert (tact); - ui_config->set_follow_edits (tact->get_active ()); + UIConfiguration::instance().set_follow_edits (tact->get_active ()); } - +void +ARDOUR_UI::update_title () +{ + if (_session) { + bool dirty = _session->dirty(); + + string session_name; + + if (_session->snap_name() != _session->name()) { + session_name = _session->snap_name(); + } else { + session_name = _session->name(); + } + + if (dirty) { + session_name = "*" + session_name; + } + + WindowTitle title (session_name); + title += Glib::get_application_name(); + _main_window.set_title (title.get_string()); + } else { + WindowTitle title (Glib::get_application_name()); + _main_window.set_title (title.get_string()); + } + +}