new color management design starts to take shape (canvas color only for now)

git-svn-id: svn://localhost/trunk/ardour2@326 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 12 insertions, 1 deletions

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index eb084fb5ea..b66d481682 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -72,6 +72,7 @@
 #include "utils.h"
 #include "gui_thread.h"
 #include "meter_xpms.h"
+#include "color_manager.h"
 
 #include "i18n.h"
 
@@ -141,7 +142,17 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], string rcfile)
 	}
 
 	ActionManager::init ();
-	
+
+	/* load colors */
+
+	color_manager = new ColorManager();
+
+	std::string color_file = Glib::getenv(X_("ARDOUR_COLORS"));
+	if(!Glib::file_test(color_file, Glib::FILE_TEST_EXISTS)) {
+		color_file = ARDOUR::find_config_file("ardour.colors");
+	}
+	color_manager->load (color_file);
+
 	m_new_session_dialog = 0;
 	m_new_session_dialog_ref = NewSessionDialogFactory::create();
 	m_new_session_dialog_ref->get_widget_derived (NewSessionDialogFactory::top_level_widget_name(), m_new_session_dialog);