AU: install latency listener

[ardour.git] / gtk2_ardour / ui_config.cc

diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc
index f43b4eac33a8de967c716208bde03e1de804cadd..301ed5740dd6ad0fb83e354284840cbbd74e1822 100644 (file)
--- a/gtk2_ardour/ui_config.cc
+++ b/gtk2_ardour/ui_config.cc
@@ -32,30 +32,30 @@
 #include <pango/pangoft2.h> // for fontmap resolution control for GnomeCanvas
 #include <pango/pangocairo.h> // for fontmap resolution control for GnomeCanvas
 
-#include "pbd/gstdio_compat.h"
-#include "pbd/unwind.h"
 #include <glibmm/miscutils.h>
 
 #include <gtkmm/settings.h>
 
 #include "pbd/convert.h"
+#include "pbd/error.h"
 #include "pbd/failed_constructor.h"
-#include "pbd/xml++.h"
 #include "pbd/file_utils.h"
+#include "pbd/gstdio_compat.h"
 #include "pbd/locale_guard.h"
-#include "pbd/error.h"
-#include "pbd/stacktrace.h"
-
-#include "gtkmm2ext/rgb_macros.h"
-#include "gtkmm2ext/gtk_ui.h"
+#include "pbd/unwind.h"
+#include "pbd/xml++.h"
 
 #include "ardour/filesystem_paths.h"
 #include "ardour/search_paths.h"
+#include "ardour/revision.h"
 #include "ardour/utils.h"
 
+#include "gtkmm2ext/rgb_macros.h"
+#include "gtkmm2ext/gtk_ui.h"
+
 #include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace PBD;
@@ -136,6 +136,7 @@ UIConfiguration::parameter_changed (string param)
 void
 UIConfiguration::reset_gtk_theme ()
 {
+       LocaleGuard lg;
        stringstream ss;
 
        ss << "gtk_color_scheme = \"" << hex;
@@ -256,56 +257,97 @@ UIConfiguration::load_defaults ()
        return ret;
 }
 
+std::string
+UIConfiguration::color_file_name (bool use_my, bool with_program_name, bool with_version) const
+{
+       string basename;
+
+       if (use_my) {
+               basename += "my-";
+       }
+
+       basename += color_file.get();  //this is the overall theme file, e.g. "dark"
+
+       if (with_program_name) {
+               basename += '-';
+               basename += downcase (PROGRAM_NAME);
+       }
+
+       std::string rev (revision);
+       std::size_t pos = rev.find_first_of("-");
+
+       if (with_version && pos != string::npos && pos > 0) {
+               basename += "-";
+               basename += rev.substr (0, pos); // COLORFILE_VERSION - program major.minor
+       }
+
+       basename += color_file_suffix;
+
+       return basename;
+}
+
 int
 UIConfiguration::load_color_theme (bool allow_own)
 {
        std::string cfile;
-       string basename;
        bool found = false;
        /* ColorsChanged() will trigger a  parameter_changed () which
         * in turn calls save_state()
         */
        PBD::Unwinder<uint32_t> uw (block_save, block_save + 1);
+       const bool running_from_source = ARDOUR_UI_UTILS::running_from_source_tree ();
 
        if (allow_own) {
-               basename = "my-";
-               basename += color_file.get();
-               basename += color_file_suffix;
 
-               if (find_file (theme_search_path(), basename, cfile)) {
+               PBD::Searchpath sp (user_config_directory());
+
+               /* user's own color files never have the program name in them */
+
+               if (find_file (sp, color_file_name (true, false, true), cfile)) {
                        found = true;
                }
+
+               if (!found) {
+                       if (find_file (sp, color_file_name (true, false, false), cfile)) {
+                               found = true;
+                       }
+               }
+
        }
 
        if (!found) {
-               basename = color_file.get();
-               basename += color_file_suffix;
-
-               if (find_file (theme_search_path(), basename, cfile)) {
+               if (find_file (theme_search_path(), color_file_name (false, running_from_source, true), cfile)) {
                        found = true;
                }
+
+               if (!found) {
+                       if (find_file (theme_search_path(), color_file_name (false, running_from_source, false), cfile)) {
+                               found = true;
+                       }
+               }
        }
 
-       if (found) {
+       if (!found) {
+               warning << string_compose (_("Color file for %1 not found along %2"), color_file.get(), theme_search_path().to_string()) << endmsg;
+               return -1;
+       }
 
-               XMLTree tree;
 
-               info << string_compose (_("Loading color file %1"), cfile) << endmsg;
+       XMLTree tree;
 
-               if (!tree.read (cfile.c_str())) {
-                       error << string_compose(_("cannot read color file \"%1\""), cfile) << endmsg;
-                       return -1;
-               }
+       info << string_compose (_("Loading color file %1"), cfile) << endmsg;
 
-               if (set_state (*tree.root(), Stateful::loading_state_version)) {
-                       error << string_compose(_("color file \"%1\" not loaded successfully."), cfile) << endmsg;
-                       return -1;
+       if (!tree.read (cfile.c_str())) {
+               error << string_compose(_("cannot read color file \"%1\""), cfile) << endmsg;
+               return -1;
+       }
+
+       if (set_state (*tree.root(), Stateful::loading_state_version)) {
+               error << string_compose(_("color file \"%1\" not loaded successfully."), cfile) << endmsg;
+               return -1;
                }
 
-               ColorsChanged ();
-       } else {
-               warning << string_compose (_("Color file %1 not found"), basename) << endmsg;
-       }
+       ColorsChanged ();
 
        return 0;
 }
@@ -348,7 +390,7 @@ UIConfiguration::store_color_theme ()
        root->add_child_nocopy (*parent);
 
        XMLTree tree;
-       std::string colorfile = Glib::build_filename (user_config_directory(), (string ("my-") + color_file.get() + color_file_suffix));
+       std::string colorfile = Glib::build_filename (user_config_directory(), color_file_name (true, false, true));;
 
        tree.set_root (root);