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_log_button, false, false);
status_bar_label.show ();
status_bar_event_box->show ();
status_bar_packer->show ();
- error_log_button.show ();
- error_log_button.signal_clicked().connect (mem_fun (*this, &UI::toggle_errors));
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);
+ editor->get_status_bar_packer().pack_start (menu_bar_base, false, false, 2);
#else
top_packer.pack_start (menu_bar_base, false, false);
#endif
- top_packer.pack_start (transport_frame, false, false);
+ editor->add_toplevel_menu (top_packer);
- editor->add_toplevel_controls (top_packer);
+ editor->add_transport_frame (transport_frame);
setup_transport();
set_tip (feedback_alert_button, _("When active, there is a feedback loop."));
set_tip (primary_clock, _("<b>Primary Clock</b> 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 <tt>Esc</tt>: cancel; <tt>Enter</tt>: confirm; postfix the edit with '+' or '-' to enter delta times.\n"));
set_tip (secondary_clock, _("<b>Secondary Clock</b> 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 <tt>Esc</tt>: cancel; <tt>Enter</tt>: confirm; postfix the edit with '+' or '-' to enter delta times.\n"));
- set_tip (editor_meter_peak_display, _("Reset Level Meter"));
+ 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 ();
string text;
UI::display_message (prefix, prefix_len, ptag, mtag, msg);
-#ifdef TOP_MENUBAR
+
+ ArdourLogLevel ll = LogLevelNone;
if (strcmp (prefix, _("[ERROR]: ")) == 0) {
text = "<span color=\"red\" weight=\"bold\">";
+ ll = LogLevelError;
} else if (strcmp (prefix, _("[WARNING]: ")) == 0) {
text = "<span color=\"yellow\" weight=\"bold\">";
+ ll = LogLevelWarning;
} else if (strcmp (prefix, _("[INFO]: ")) == 0) {
text = "<span color=\"green\" weight=\"bold\">";
+ ll = LogLevelInfo;
} else {
text = "<span color=\"white\" weight=\"bold\">???";
}
+ _log_not_acknowledged = std::max(_log_not_acknowledged, ll);
+
+#ifdef TOP_MENUBAR
text += prefix;
text += "</span>";
text += msg;
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);
}
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")));
- 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")));
- rec_button.set_image (get_icon (X_("transport_record")));
+ goto_start_button.set_elements ((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
+ goto_start_button.set_icon (ArdourButton::BtnStart);
+ goto_end_button.set_elements ((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
+ goto_end_button.set_icon (ArdourButton::BtnEnd);
+ roll_button.set_elements ((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
+ roll_button.set_icon (ArdourButton::BtnPlay);
+ stop_button.set_elements ((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
+ stop_button.set_icon (ArdourButton::BtnStop);
+ play_selection_button.set_elements ((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
+ play_selection_button.set_icon (ArdourButton::BtnRange);
+
auto_loop_button.set_image (get_icon (X_("transport_loop")));
- midi_panic_button.set_image (get_icon (X_("midi_panic")));
+ rec_button.set_elements ((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
+ rec_button.set_icon (ArdourButton::RecButton);
+
+ midi_panic_button.set_elements ((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
+ midi_panic_button.set_icon (ArdourButton::BtnPanic);
+
/* the icon for this has an odd aspect ratio, so fatten up the button */
midi_panic_button.set_size_request (25, -1);
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);
-
- alert_box.pack_start (solo_alert_button, true, false);
- alert_box.pack_start (auditioning_alert_button, true, false);
- alert_box.pack_start (feedback_alert_button, true, 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 (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);
/* all transport buttons should be the same size vertically and
* horizontally
tbox->set_spacing (2);
if (!Profile->get_trx()) {
- tbox1->pack_start (midi_panic_button, false, false, 5);
- tbox1->pack_start (click_button, false, false, 5);
+ tbox1->pack_start (midi_panic_button, true, true, 5);
+ tbox1->pack_start (click_button, true, true, 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);
+ tbox1->pack_start (goto_start_button, true, true);
+ tbox1->pack_start (goto_end_button, true, true);
+ tbox1->pack_start (auto_loop_button, true, true);
if (!Profile->get_trx()) {
- tbox2->pack_start (play_selection_button, false, false);
+ tbox2->pack_start (play_selection_button, true, true);
}
- tbox2->pack_start (roll_button, false, false);
- tbox2->pack_start (stop_button, false, false);
- tbox2->pack_start (rec_button, false, false, 5);
+ tbox2->pack_start (roll_button, true, true);
+ tbox2->pack_start (stop_button, true, true);
+ tbox2->pack_start (rec_button, true, true, 5);
- vbox1->pack_start (*tbox1, false, false);
- vbox2->pack_start (*tbox2, false, false);
+ vbox1->pack_start (*tbox1, true, true);
+ vbox2->pack_start (*tbox2, true, true);
a1->add (*vbox1);
- a1->set (0.5, 1.0, 0.0, 0.0);
+ a1->set (0.5, 0.5, 0.0, 1.0);
a2->add (*vbox2);
- a2->set (0.5, 1.0, 0.0, 0.0);
+ a2->set (0.5, 0.5, 0.0, 1.0);
tbox->pack_start (*a1, false, false);
tbox->pack_start (*a2, false, false);
}
clock_box->set_spacing (3);
- shuttle_box = new ShuttleControl;
+ shuttle_box = manage (new ShuttleControl);
shuttle_box->show ();
VBox* transport_vbox = manage (new VBox);
VBox* auto_box = manage (new VBox);
auto_box->set_homogeneous (true);
auto_box->set_spacing (2);
- auto_box->pack_start (sync_button, false, false);
+ auto_box->pack_start (sync_button, true, true);
if (!ARDOUR::Profile->get_trx()) {
- auto_box->pack_start (follow_edits_button, false, false);
- auto_box->pack_start (auto_return_button, false, false);
+ auto_box->pack_start (follow_edits_button, true, true);
+ auto_box->pack_start (auto_return_button, true, true);
}
if (!ARDOUR::Profile->get_trx()) {
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 ();
+}
+
void
ARDOUR_UI::soloing_changed (bool onoff)
{
return true;
}
+bool
+ARDOUR_UI::error_alert_press (GdkEventButton* ev)
+{
+ 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<Action> act = ActionManager::get_action (X_("Editor"), X_("toggle-log-window"));
+ Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
+ if (tact && tact->get_active()) {
+ do_toggle = false;
+ }
+ }
+ _log_not_acknowledged = LogLevelNone;
+ error_blink (false); // immediate acknowledge
+ }
+ // maybe fall through to to button toggle
+ return !do_toggle;
+}
+
void
ARDOUR_UI::solo_blink (bool onoff)
{
}
}
+void
+ARDOUR_UI::error_blink (bool onoff)
+{
+ 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;
+ }
+}
+
+
+
void
ARDOUR_UI::set_transport_sensitivity (bool yn)
{
}
}
+void
+ARDOUR_UI::show_ui_prefs ()
+{
+ RefPtr<Action> act = ActionManager::get_action (X_("Window"), X_("toggle-rc-options-editor"));
+ assert (act);
+
+ act->activate();
+
+ rc_option_editor->set_current_page (_("GUI"));
+}
+
+
bool
ARDOUR_UI::click_button_clicked (GdkEventButton* ev)
{
}
void
-ARDOUR_UI::toggle_always_play_range ()
+ARDOUR_UI::toggle_follow_edits ()
{
RefPtr<Action> act = ActionManager::get_action (X_("Transport"), X_("ToggleFollowEdits"));
assert (act);
RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic (act);
assert (tact);
- Config->set_always_play_range (tact->get_active ());
+ ui_config->set_follow_edits (tact->get_active ());
}
projects / ardour.git / blobdiff