Revert some theme tweaks. Left-justify gauge text.

diff --git a/gtk2_ardour/ardour_gauge.cc b/gtk2_ardour/ardour_gauge.cc
index e299f069080cf96ed9e05e7c9e60256ed561c51c..d93d2d15d66037be79162a40377940788e99b080 100644 (file)
--- a/gtk2_ardour/ardour_gauge.cc
+++ b/gtk2_ardour/ardour_gauge.cc
@@ -118,17 +118,9 @@ ArdourGauge::render (Cairo::RefPtr<Cairo::Context> const& ctx, cairo_rectangle_t
        _layout->get_pixel_size (w, h);
 
        cairo_save (cr);
-       cairo_new_path (cr);
-       cairo_translate (cr, width * .5, height * .5);
 
-       cairo_move_to (cr, w * -.5, h * -.5);
-       pango_cairo_update_layout (cr, _layout->gobj());
-       Gtkmm2ext::set_source_rgb_a (cr, base, 0.5);
-       pango_cairo_layout_path (cr, _layout->gobj());
-       cairo_set_line_width (cr, 1.5);
-       cairo_stroke (cr);
-
-       cairo_move_to (cr, w * -.5, h * -.5);
+       cairo_translate (cr, 2+PADDING, height * .5);
+       cairo_move_to (cr, 0, h * -.5);  //vertically center the text
        pango_cairo_update_layout (cr, _layout->gobj());
        Gtkmm2ext::set_source_rgba (cr, text);
        pango_cairo_show_layout (cr, _layout->gobj());

diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index f9c10a777eef4d3305ada06487d60e8e933ca346..d799ce0a25e5f4e40de6c9f3249edca7b1432059 100644 (file)
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -666,12 +666,12 @@ void
 ARDOUR_UI::build_menu_bar ()
 {
        menu_bar = dynamic_cast<MenuBar*> (ActionManager::get_widget (X_("/Main")));
-       menu_bar->set_name ("gtk_background");
+       menu_bar->set_name ("MainMenuBar");
 
        EventBox* ev = manage (new EventBox);
        ev->show ();
        CairoHPacker* hbox = manage (new CairoHPacker);
-       hbox->set_name (X_("gtk_background"));
+       hbox->set_name (X_("StatusBarBox"));
        hbox->show ();
        hbox->set_border_width (2);
 
@@ -708,7 +708,7 @@ ARDOUR_UI::build_menu_bar ()
 
        menu_hbox.pack_end (*ev, false, false, 2);
 
-       menu_bar_base.set_name ("gtk_background");
+       menu_bar_base.set_name ("MainMenuBar");
        menu_bar_base.add (menu_hbox);
 
 #ifndef __APPLE__

diff --git a/gtk2_ardour/clearlooks.rc.in b/gtk2_ardour/clearlooks.rc.in
index f7311a793ec3da5f07cd8728e340c482534fb3e4..a73249656994298d656c04a742673d264c806386 100644 (file)
--- a/gtk2_ardour/clearlooks.rc.in
+++ b/gtk2_ardour/clearlooks.rc.in
@@ -277,7 +277,7 @@ style "time_info_box"
 
 style "status_bar_box"
 {
-        bg[NORMAL] = @darkest
+        bg[NORMAL] = @background
 }
 
 style "very_small_text"
@@ -1219,6 +1219,7 @@ widget "*ChannelCountSelector" style:highest "medium_bold_entry"
 widget "*RegionListWholeFile" style:highest "treeview_parent_node"
 widget "*ProcessorList*" style:highest "processor_list"
 widget "*PortMatrixLabel*" style:highest "small_text"
+widget "*MainMenuBar" style:highest "status_bar_box"
 widget "*midi device" style:highest "midi_device"
 widget "*MidiTracerTextView" style:highest "midi_tracer_textview"
 widget "*meterbridge label" style:highest "meterbridge_label"

diff --git a/gtk2_ardour/disk_io_gauge.cc b/gtk2_ardour/disk_io_gauge.cc
index 7cced28cca8d9c94fc381fc0a763e400b2ae29ef..240cd4f079613f71b20d051bdbaaf13171ea2ffa 100644 (file)
--- a/gtk2_ardour/disk_io_gauge.cc
+++ b/gtk2_ardour/disk_io_gauge.cc
@@ -26,7 +26,7 @@
 #define PADDING 3
 
 DiskIoGauge::DiskIoGauge ()
-       : ArdourGauge ("00.0%")
+       : ArdourGauge (" ")
        , _disk_play (0)
        , _disk_capture (0)
 {

diff --git a/gtk2_ardour/dsp_load_gauge.cc b/gtk2_ardour/dsp_load_gauge.cc
index 6e3b0d382a74ffeacee4c5dae73bf7ebf15014b0..fc7023121f6e209cf9c710399d7da7ab431d6f87 100644 (file)
--- a/gtk2_ardour/dsp_load_gauge.cc
+++ b/gtk2_ardour/dsp_load_gauge.cc
@@ -26,7 +26,7 @@
 #define PADDING 3
 
 DspLoadGauge::DspLoadGauge ()
-       : ArdourGauge ("00.0%")
+       : ArdourGauge (" ")
        , _dsp_load (0)
        , _xrun_count (0)
        , _xrun_while_recording (false)