}
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*
}
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);
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);