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 All Peak Indicators"));
+ set_tip (editor_meter_peak_display, _("Reset All Peak Meters"));
set_tip (error_alert_button, _("Show Error Log and acknowledge warnings"));
synchronize_sync_source_and_video_pullup ();
}
void
-ARDOUR_UI::display_message (const char *prefix, gint prefix_len, RefPtr<TextBuffer::Tag> ptag, RefPtr<TextBuffer::Tag> mtag, const char *msg)
+ARDOUR_UI::display_message (const char* prefix, gint prefix_len, RefPtr<TextBuffer::Tag> ptag, RefPtr<TextBuffer::Tag> mtag, const char* msg)
{
- string text;
-
UI::display_message (prefix, prefix_len, ptag, mtag, msg);
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;
-
- status_bar_label.set_markup (text);
-#endif
}
XMLNode*
mini_timeline.show();
}
- if (dsp_load_indicator.get_parent()) {
- transport_hbox.remove (dsp_load_indicator);
- }
- if (UIConfiguration::instance().get_show_dsp_load_info ()) {
- transport_hbox.pack_start (dsp_load_indicator, false, false);
- dsp_load_indicator.show();
- }
-
- if (disk_space_indicator.get_parent()) {
- transport_hbox.remove (disk_space_indicator);
- }
- if (UIConfiguration::instance().get_show_disk_space_info ()) {
- transport_hbox.pack_start (disk_space_indicator, false, false);
- disk_space_indicator.show();
- }
-
if (editor_meter) {
- if (meter_box.get_parent()) {
- transport_hbox.remove (meter_box);
- transport_hbox.remove (editor_meter_peak_display);
+ if (editor_meter_table.get_parent()) {
+ transport_hbox.remove (editor_meter_table);
+ }
+ if (meterbox_spacer.get_parent()) {
+ transport_hbox.remove (meterbox_spacer);
+ transport_hbox.remove (meterbox_spacer2);
}
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_end (meterbox_spacer, false, false, 3);
+ transport_hbox.pack_end (editor_meter_table, false, false);
+ transport_hbox.pack_end (meterbox_spacer2, false, false, 3);
+ editor_meter_table.show();
+ meterbox_spacer.show();
+ meterbox_spacer2.show();
}
}
/* top level packing */
transport_table.set_spacings (0);
transport_table.set_row_spacings (4);
- transport_table.set_border_width (2);
+ transport_table.set_border_width (0);
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_sample actually draws a background. We
+ 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
transport_table.attach (*alert_box, TCOL, 0, 2, SHRINK, EXPAND|FILL, hpadding, 0);
++col;
- transport_table.attach (*(manage (new ArdourVSpacer ())), TCOL, 0, 2 , SHRINK, EXPAND|FILL, 3, 0);
- ++col;
-
/* 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, hpadding, 0);
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()) {
+ RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Editor"), X_("toggle-log-window"));
+ if (tact->get_active()) {
do_toggle = false;
}
}
void
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);
-
+ RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Transport"), X_("ToggleFollowEdits"));
UIConfiguration::instance().set_follow_edits (tact->get_active ());
}
}
}
+