add canvas-based Meter object

[ardour.git] / gtk2_ardour / color_theme_manager.cc

diff --git a/gtk2_ardour/color_theme_manager.cc b/gtk2_ardour/color_theme_manager.cc
index df0a0ddd4cf5f3db62850fee0999bcd5422c1d55..be0278ef9b4746779f0552f879c2511aba708b43 100644 (file)
--- a/gtk2_ardour/color_theme_manager.cc
+++ b/gtk2_ardour/color_theme_manager.cc
@@ -46,7 +46,7 @@
 #include "ui_config.h"
 #include "utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;
@@ -71,7 +71,6 @@ ColorThemeManager::ColorThemeManager ()
                theme_list = TreeStore::create (color_theme_columns);
 
                TreeModel::iterator selected_iter = theme_list->children().end();
-               const bool running_from_source = running_from_source_tree();
 
                for (std::map<string,string>::iterator c = color_themes.begin(); c != color_themes.end(); ++c) {
                        TreeModel::Row row;
@@ -81,13 +80,6 @@ ColorThemeManager::ColorThemeManager ()
 
                        string color_file_name = c->second;
 
-                       if (running_from_source) {
-                               /* color themes from within the source tree are
-                                  suffixed by "-PROGRAM-NAME" (lowercased)
-                               */
-                               replace_all (color_file_name, string_compose ("-%1", downcase (PROGRAM_NAME)), "");
-                       }
-
                        row[color_theme_columns.path] = color_file_name;
 
                        /* match second (path; really basename) since that is
@@ -233,7 +225,7 @@ ColorThemeManager::reset_canvas_colors()
 
        /* look for a versioned user-owned color file, and try to rename it */
 
-       basename = UIConfiguration::instance().color_file_name (true, false, true);
+       basename = UIConfiguration::instance().color_file_name (true, true);
 
        if (find_file (ardour_config_search_path(), basename, cfile)) {
                string backup = cfile + string (X_(".old"));