experiment with unicode circle for rec-en

fixes button-area width mismatch on track-headers
except for tape-tracks (which till use old fixed size icon)

diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc
index e0a1972d9e800eca9486f57a5bf4be0cdc3bbd98..5ac7138d80b58a5ab0d6c08f5c5ceaaf9adac692 100644 (file)
--- a/gtk2_ardour/meter_strip.cc
+++ b/gtk2_ardour/meter_strip.cc
@@ -355,7 +355,7 @@ void
 MeterStrip::set_button_names()
 {
        mute_button->set_text (_("M"));
-       rec_enable_button->set_text ("");
+       rec_enable_button->set_markup ("<span color=\"#cc0000\">\u25CF</span>");
 
        if (_route && _route->solo_safe()) {
                solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive));

diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 11f2b463243d91bdea600ca8d454f40034e9e009..a393b27d4f615ac7a1d3e7287145e50d70565879 100644 (file)
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -171,9 +171,11 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
                switch (track()->mode()) {
                case ARDOUR::Normal:
                case ARDOUR::NonLayered:
-                       rec_enable_button->set_image (::get_icon (X_("record_normal_red")));
+                       rec_enable_button->set_image (Glib::RefPtr<Gdk::Pixbuf>());
+                       rec_enable_button->set_markup ("<span color=\"#cc0000\">\u25CF</span>");
                        break;
                case ARDOUR::Destructive:
+                       rec_enable_button->set_text (string());
                        rec_enable_button->set_image (::get_icon (X_("record_tape_red")));
                        break;
                }
@@ -803,12 +805,12 @@ RouteTimeAxisView::set_track_mode (TrackMode mode, bool apply_to_selection)
                switch (mode) {
                case ARDOUR::NonLayered:
                case ARDOUR::Normal:
-                       rec_enable_button->set_image (::get_icon (X_("record_normal_red")));
-                       rec_enable_button->set_text (string());
+                       rec_enable_button->set_image (Glib::RefPtr<Gdk::Pixbuf>());
+                       rec_enable_button->set_markup ("<span color=\"#cc0000\">\u25CF</span>");
                        break;
                case ARDOUR::Destructive:
-                       rec_enable_button->set_image (::get_icon (X_("record_tape_red")));
                        rec_enable_button->set_text (string());
+                       rec_enable_button->set_image (::get_icon (X_("record_tape_red")));
                        break;
                }
 

diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index 0b0d1a66424d2ba3c342e0f9a3f64c809a39ee06..cf64258b0ba53167bd47817a50c26b03a45d07d9 100644 (file)
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -144,7 +144,7 @@ RouteUI::init ()
 
        rec_enable_button = manage (new ArdourButton);
        rec_enable_button->set_name ("record enable button");
-       rec_enable_button->set_image (::get_icon (X_("record_normal_red")));
+       rec_enable_button->set_markup ("<span weight=\"bold\" color=\"#cc0000\">\u2B24</span>");
        UI::instance()->set_tip (rec_enable_button, _("Enable recording on this track"), "");
 
        rec_blink_connection = ARDOUR_UI::instance()->Blink.connect (sigc::mem_fun (*this, &RouteUI::blink_rec_display));