diff --git a/gtk2_ardour/ardour3_ui_default.conf b/gtk2_ardour/ardour3_ui_default.conf
index ac6f7c0c45..1248e72ea4 100644
--- a/gtk2_ardour/ardour3_ui_default.conf
+++ b/gtk2_ardour/ardour3_ui_default.conf
@@ -143,389 +143,389 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gtk2_ardour/ardour_button.cc b/gtk2_ardour/ardour_button.cc
index f034fef618..9d7d3aa728 100644
--- a/gtk2_ardour/ardour_button.cc
+++ b/gtk2_ardour/ardour_button.cc
@@ -338,11 +338,11 @@ ArdourButton::set_colors ()
edge_pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, _height);
if (visual_state() & Gtkmm2ext::Selected) {
- start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 border start selected", get_name()));
- end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 border end selected", get_name()));
+ start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: border start selected", get_name()));
+ end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: border end selected", get_name()));
} else {
- start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 border start", get_name()));
- end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 border end", get_name()));
+ start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: border start", get_name()));
+ end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: border end", get_name()));
}
UINT_TO_RGBA (start_color, &r, &g, &b, &a);
cairo_pattern_add_color_stop_rgba (edge_pattern, 0, r/255.0,g/255.0,b/255.0, 0.7);
@@ -362,14 +362,14 @@ ArdourButton::set_colors ()
fill_pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, _height);
if (active_state() == Gtkmm2ext::Mid) {
- start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 fill start mid", get_name()));
- end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 fill end mid", get_name()));
+ start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill start mid", get_name()));
+ end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill end mid", get_name()));
} else if (active_state() == Gtkmm2ext::Active) {
- start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 fill start active", get_name()));
- end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 fill end active", get_name()));
+ start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill start active", get_name()));
+ end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill end active", get_name()));
} else {
- start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 fill start", get_name()));
- end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 fill end", get_name()));
+ start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill start", get_name()));
+ end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill end", get_name()));
}
UINT_TO_RGBA (start_color, &r, &g, &b, &a);
cairo_pattern_add_color_stop_rgba (fill_pattern, 0, r/255.0,g/255.0,b/255.0, a/255.0);
@@ -398,14 +398,14 @@ ArdourButton::set_colors ()
/* text and LED colors depend on Active/Normal/Mid */
if (active_state() == Gtkmm2ext::Active) {
- text_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 text active", get_name()));
- led_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 led active", get_name()));
+ text_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: text active", get_name()));
+ led_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: led active", get_name()));
} else if (active_state() == Gtkmm2ext::Mid) {
- text_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 text mid", get_name()));
- led_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 led mid", get_name()));
+ text_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: text mid", get_name()));
+ led_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: led mid", get_name()));
} else {
- text_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 text", get_name()));
- led_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 led", get_name()));
+ text_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: text", get_name()));
+ led_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: led", get_name()));
}
UINT_TO_RGBA (text_color, &r, &g, &b, &a);
diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index e663b149de..8dc25f0004 100644
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -212,6 +212,9 @@ ARDOUR_UI::setup_transport ()
{
RefPtr act;
+ transport_tearoff_hbox.set_border_width (3);
+ transport_tearoff_hbox.set_spacing (3);
+
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);
@@ -313,22 +316,18 @@ ARDOUR_UI::setup_transport ()
auditioning_alert_button.set_name ("TransportAuditioningAlert");
auditioning_alert_button.signal_button_press_event().connect (sigc::mem_fun(*this,&ARDOUR_UI::audition_alert_press), false);
- alert_box.pack_start (solo_alert_button, false, false);
- alert_box.pack_start (auditioning_alert_button, false, false);
+ alert_box.pack_start (solo_alert_button, true, false);
+ alert_box.pack_start (auditioning_alert_button, true, false);
HBox* tbox = manage (new HBox);
tbox->set_spacing (2);
- transport_tearoff_hbox.set_border_width (3);
-
tbox->pack_start (goto_start_button, false, false);
tbox->pack_start (goto_end_button, false, false);
/* translators: Egternal is "External" with a descender character */
set_size_request_to_display_given_text (sync_button, X_("Egternal"), 4, 10);
- // transport_tearoff_hbox.pack_start (*svbox, false, false, 3);
-
Glib::RefPtr transport_button_size_group1 = SizeGroup::create (SIZE_GROUP_HORIZONTAL);
transport_button_size_group1->add_widget (goto_start_button);
transport_button_size_group1->add_widget (goto_end_button);
@@ -386,7 +385,7 @@ ARDOUR_UI::setup_transport ()
transport_vbox->pack_start (*tbox, true, true, 0);
transport_vbox->pack_start (*shuttle_box, false, false, 0);
- transport_tearoff_hbox.pack_start (*transport_vbox, false, false, 0);
+ transport_tearoff_hbox.pack_start (*transport_vbox, false, false);
/* transport related toggle controls */
@@ -401,13 +400,7 @@ ARDOUR_UI::setup_transport ()
if (!Profile->get_small_screen()) {
toggle_box->pack_start (*auto_box, false, false);
}
- //VBox* io_box = manage (new VBox);
- //io_box->pack_start (auto_input_button, false, false);
- //io_box->pack_start (click_button, false, false);
- //if (!Profile->get_small_screen()) {
- // toggle_box->pack_start (*io_box, false, false);
- //}
- transport_tearoff_hbox.pack_start (*toggle_box, false, false, 4);
+ transport_tearoff_hbox.pack_start (*toggle_box, false, false);
Table* time_controls_table = manage (new Table (2, 2));
time_controls_table->set_col_spacings (6);
@@ -417,20 +410,20 @@ ARDOUR_UI::setup_transport ()
time_controls_table->attach (click_button, 1, 2, 0, 2, Gtk::AttachOptions(FILL|EXPAND), FILL);
transport_tearoff_hbox.pack_start (*clock_box, false, false);
- transport_tearoff_hbox.pack_start (*time_controls_table, false, false, 4);
+ transport_tearoff_hbox.pack_start (*time_controls_table, false, false);
time_info_box = manage (new TimeInfoBox);
transport_tearoff_hbox.pack_start (*time_info_box, false, false);
if (Profile->get_small_screen()) {
- transport_tearoff_hbox.pack_start (_editor_transport_box, false, false, 4);
+ transport_tearoff_hbox.pack_start (_editor_transport_box, false, false);
}
transport_tearoff_hbox.pack_start (alert_box, false, false);
if (Profile->get_sae()) {
Image* img = manage (new Image ((::get_icon (X_("sae")))));
- transport_tearoff_hbox.pack_end (*img, false, false, 6);
+ transport_tearoff_hbox.pack_end (*img, false, false);
}
/* desensitize */
diff --git a/gtk2_ardour/canvas_vars.h b/gtk2_ardour/canvas_vars.h
index d9ff718639..77eb02f9ce 100644
--- a/gtk2_ardour/canvas_vars.h
+++ b/gtk2_ardour/canvas_vars.h
@@ -139,22 +139,22 @@ CANVAS_VARIABLE(canvasvar_ZoomRect, "zoom rect")
CANVAS_VARIABLE(canvasvar_MonitorSectionKnob, "monitor knob")
#define BUTTON_VARS(root,name) \
-CANVAS_VARIABLE(canvasvar_ ## root ## BorderStart, name " border start") \
-CANVAS_VARIABLE(canvasvar_ ## root ## BorderEnd, name " border end") \
-CANVAS_VARIABLE(canvasvar_ ## root ## BorderStartSelected, name " border start selected") \
-CANVAS_VARIABLE(canvasvar_ ## root ## BorderEndSelected, name " border end selected") \
-CANVAS_VARIABLE(canvasvar_ ## root ## FillStart, name " fill start") \
-CANVAS_VARIABLE(canvasvar_ ## root ## FillEnd, name " fill end") \
-CANVAS_VARIABLE(canvasvar_ ## root ## FillStartActive, name " fill start active") \
-CANVAS_VARIABLE(canvasvar_ ## root ## FillEndActive, name " fill end active") \
-CANVAS_VARIABLE(canvasvar_ ## root ## FillStartMid, name " fill start mid") \
-CANVAS_VARIABLE(canvasvar_ ## root ## FillEndMid, name " fill end mid") \
-CANVAS_VARIABLE(canvasvar_ ## root ## LED, name " led") \
-CANVAS_VARIABLE(canvasvar_ ## root ## LEDActive, name " led active") \
-CANVAS_VARIABLE(canvasvar_ ## root ## LEDMid, name " led mid") \
-CANVAS_VARIABLE(canvasvar_ ## root ## Text, name " text") \
-CANVAS_VARIABLE(canvasvar_ ## root ## TextActive, name " text active") \
-CANVAS_VARIABLE(canvasvar_ ## root ## TextMid, name " text mid")
+CANVAS_VARIABLE(canvasvar_ ## root ## BorderStart, name ": border start") \
+CANVAS_VARIABLE(canvasvar_ ## root ## BorderEnd, name ": border end") \
+CANVAS_VARIABLE(canvasvar_ ## root ## BorderStartSelected, name ": border start selected") \
+CANVAS_VARIABLE(canvasvar_ ## root ## BorderEndSelected, name ": border end selected") \
+CANVAS_VARIABLE(canvasvar_ ## root ## FillStart, name ": fill start") \
+CANVAS_VARIABLE(canvasvar_ ## root ## FillEnd, name ": fill end") \
+CANVAS_VARIABLE(canvasvar_ ## root ## FillStartActive, name ": fill start active") \
+CANVAS_VARIABLE(canvasvar_ ## root ## FillEndActive, name ": fill end active") \
+CANVAS_VARIABLE(canvasvar_ ## root ## FillStartMid, name ": fill start mid") \
+CANVAS_VARIABLE(canvasvar_ ## root ## FillEndMid, name ": fill end mid") \
+CANVAS_VARIABLE(canvasvar_ ## root ## LED, name ": led") \
+CANVAS_VARIABLE(canvasvar_ ## root ## LEDActive, name ": led active") \
+CANVAS_VARIABLE(canvasvar_ ## root ## LEDMid, name ": led mid") \
+CANVAS_VARIABLE(canvasvar_ ## root ## Text, name ": text") \
+CANVAS_VARIABLE(canvasvar_ ## root ## TextActive, name ": text active") \
+CANVAS_VARIABLE(canvasvar_ ## root ## TextMid, name ": text mid")
BUTTON_VARS(ProcessorPreFader, "processor prefader")
BUTTON_VARS(ProcessorFader, "processor fader")