New theme manager from trunk, backported to 2.0-ongoing

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2110 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 7 insertions, 22 deletions

diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index 356d4d8987..8b3727b7fa 100644
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -74,11 +74,11 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
 	base_rect->property_x1() = 0.0;
 	base_rect->property_y1() = 0.0;
 	base_rect->property_x2() = editor.frame_to_pixel (max_frames);
-	base_rect->property_outline_color_rgba() = color_map[cAutomationTrackOutline];
+	base_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_AutomationTrackOutline.get();
 	/* outline ends and bottom */
 	base_rect->property_outline_what() = (guint32) (0x1|0x2|0x8);
-	base_rect->property_fill_color_rgba() = color_map[cAutomationTrackFill];
-	//base_rect->property_fill_color_rgba() = color_map[cEnteredControlPoint];
+	base_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_AutomationTrackFill.get();
+	//base_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_EnteredControlPoint.get();
 	
 	base_rect->set_data ("trackview", this);
 
@@ -182,7 +182,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
 	/* make sure labels etc. are correct */
 
 	automation_state_changed ();
-	ColorChanged.connect (mem_fun (*this, &AutomationTimeAxisView::color_handler));
+	ColorsChanged.connect (mem_fun (*this, &AutomationTimeAxisView::color_handler));
 }
 
 AutomationTimeAxisView::~AutomationTimeAxisView ()
@@ -821,24 +821,9 @@ AutomationTimeAxisView::set_colors () {
 }
 
 void
-AutomationTimeAxisView::color_handler (ColorID id, uint32_t val) {
-    
-	switch (id) {
-	case cGhostTrackWave:
-	case cGhostTrackWaveClip:
-	case cGhostTrackZeroLine:
-
-	case cControlPoint:
-	case cControlPointFill:
-	case cControlPointOutline:
-	case cAutomationLine:
-		set_colors ();
-
-		break;
-
-	default: 
-		break;
-	}
+AutomationTimeAxisView::color_handler () 
+{
+    set_colors();
 }