diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-07-18 11:50:21 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-07-18 11:50:38 -0400 |
| commit | 56c4b3c9b05ec22a89ba594061ba4ec4cb7c5da1 (patch) | |
| tree | a71554f0096297cfc1e726dd115877e50de3c6ea /gtk2_ardour/color_theme_manager.cc | |
| parent | 8c944c08eacf8372fc714c9c00257ec13a263ae8 (diff) | |
turn back towards color theme files ALWAYS including the program name. also load both default and user colors (if present)
Diffstat (limited to 'gtk2_ardour/color_theme_manager.cc')
| -rw-r--r-- | gtk2_ardour/color_theme_manager.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/gtk2_ardour/color_theme_manager.cc b/gtk2_ardour/color_theme_manager.cc index e038493c96..be0278ef9b 100644 --- a/gtk2_ardour/color_theme_manager.cc +++ b/gtk2_ardour/color_theme_manager.cc @@ -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")); |