X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmono_panner.cc;h=ce8b55eacf689b66a4a48d765d6cdced61964cb9;hb=c9f9bb263fc3f96e383216d515c62ac6706b56da;hp=e136c05153bd7eef3d14585537ad6b16abbcee2a;hpb=1745340c67d66d8dd92e5b3a377e935ed5eea973;p=ardour.git

diff --git a/gtk2_ardour/mono_panner.cc b/gtk2_ardour/mono_panner.cc
index e136c05153..ce8b55eacf 100644
--- a/gtk2_ardour/mono_panner.cc
+++ b/gtk2_ardour/mono_panner.cc
@@ -50,6 +50,7 @@
 using namespace std;
 using namespace Gtk;
 using namespace Gtkmm2ext;
+using namespace ARDOUR_UI_UTILS;
 
 static const int pos_box_size = 9;
 static const int lr_box_size = 15;
@@ -80,9 +81,7 @@ MonoPanner::MonoPanner (boost::shared_ptr<ARDOUR::PannerShell> p)
 	if (!have_font) {
 		Pango::FontDescription font;
 		Pango::AttrFontDesc* font_attr;
-		font = Pango::FontDescription ("ArdourMono");
-		font.set_weight (Pango::WEIGHT_BOLD);
-		font.set_size(9 * PANGO_SCALE);
+		font = Pango::FontDescription (ARDOUR_UI::config()->get_SmallBoldMonospaceFont());
 		font_attr = new Pango::AttrFontDesc (Pango::Attribute::create_attr_font_desc (font));
 		panner_font_attributes.change(*font_attr);
 		delete font_attr;
@@ -158,6 +157,9 @@ MonoPanner::on_expose_event (GdkEventExpose*)
 		t  = 0x606060ff;
 	}
 
+	if (_send_mode) {
+		b = ARDOUR_UI::config()->color ("send bg");
+	}
 	/* background */
 	context->set_source_rgba (UINT_RGBA_R_FLT(b), UINT_RGBA_G_FLT(b), UINT_RGBA_B_FLT(b), UINT_RGBA_A_FLT(b));
 	context->rectangle (0, 0, width, height);
@@ -198,7 +200,7 @@ MonoPanner::on_expose_event (GdkEventExpose*)
 	Glib::RefPtr<Pango::Layout> layout = Pango::Layout::create(get_pango_context());
 	layout->set_attributes (panner_font_attributes);
 
-	layout->set_text (_("L"));
+	layout->set_text (S_("Panner|L"));
 	layout->get_pixel_size(tw, th);
 	context->move_to (rint(left - tw/2), rint(lr_box_size + step_down - th/2));
 	context->set_source_rgba (UINT_RGBA_R_FLT(t), UINT_RGBA_G_FLT(t), UINT_RGBA_B_FLT(t), UINT_RGBA_A_FLT(t));
@@ -215,7 +217,7 @@ MonoPanner::on_expose_event (GdkEventExpose*)
 	context->stroke();
 
 	/* add text */
-	layout->set_text (_("R"));
+	layout->set_text (S_("Panner|R"));
 	layout->get_pixel_size(tw, th);
 	context->move_to (rint(right - tw/2), rint(lr_box_size + step_down - th/2));
 	context->set_source_rgba (UINT_RGBA_R_FLT(t), UINT_RGBA_G_FLT(t), UINT_RGBA_B_FLT(t), UINT_RGBA_A_FLT(t));
@@ -485,12 +487,12 @@ MonoPanner::on_key_press_event (GdkEventKey* ev)
 void
 MonoPanner::set_colors ()
 {
-        colors.fill = ARDOUR_UI::config()->get_canvasvar_MonoPannerFill();
-        colors.outline = ARDOUR_UI::config()->get_canvasvar_MonoPannerOutline();
-        colors.text = ARDOUR_UI::config()->get_canvasvar_MonoPannerText();
-        colors.background = ARDOUR_UI::config()->get_canvasvar_MonoPannerBackground();
-        colors.pos_outline = ARDOUR_UI::config()->get_canvasvar_MonoPannerPositionOutline();
-        colors.pos_fill = ARDOUR_UI::config()->get_canvasvar_MonoPannerPositionFill();
+        colors.fill = ARDOUR_UI::config()->color_mod ("mono panner fill", "panner fill");
+        colors.outline = ARDOUR_UI::config()->color ("mono panner outline");
+        colors.text = ARDOUR_UI::config()->color ("mono panner text");
+        colors.background = ARDOUR_UI::config()->color ("mono panner bg");
+        colors.pos_outline = ARDOUR_UI::config()->color ("mono panner position outline");
+        colors.pos_fill = ARDOUR_UI::config()->color_mod ("mono panner position fill", "mono panner position fill");
 }
 
 void