Numerical sort patch from mantis #2654

[ardour.git] / gtk2_ardour / theme_manager.cc

diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc
index 13e370653b2bb90e40dbc1321447f17ebed9820d..d69d356cffb377f496b2d19f4164fb66b7b2a43e 100644 (file)
--- a/gtk2_ardour/theme_manager.cc
+++ b/gtk2_ardour/theme_manager.cc
@@ -26,6 +26,8 @@
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm/settings.h>
 
+#include <ardour/profile.h>
+
 #include "theme_manager.h"
 #include "rgb_macros.h"
 #include "ardour_ui.h"
@@ -44,7 +46,8 @@ sigc::signal<void,uint32_t> ColorChanged;
 ThemeManager::ThemeManager()
        : ArdourDialog ("ThemeManager"),
        dark_button ("Dark Theme"),
-       light_button ("Light Theme")
+       light_button ("Light Theme"),
+       reset_button ("Restore Defaults")
 {
        color_list = ListStore::create (columns);
        color_display.set_model (color_list);
@@ -71,6 +74,7 @@ ThemeManager::ThemeManager()
 
        get_vbox()->set_homogeneous(false);
        get_vbox()->pack_start (theme_selection_hbox, PACK_SHRINK);
+       get_vbox()->pack_start (reset_button, PACK_SHRINK);
        get_vbox()->pack_start (scroller);
 
        color_display.signal_button_press_event().connect (mem_fun (*this, &ThemeManager::button_press_event), false);
@@ -82,6 +86,7 @@ ThemeManager::ThemeManager()
        color_dialog.get_cancel_button()->signal_clicked().connect (bind (mem_fun (color_dialog, &Gtk::Dialog::response), RESPONSE_CANCEL));
        dark_button.signal_toggled().connect (mem_fun (*this, &ThemeManager::on_dark_theme_button_toggled));
        light_button.signal_toggled().connect (mem_fun (*this, &ThemeManager::on_light_theme_button_toggled));
+       reset_button.signal_clicked().connect (mem_fun (*this, &ThemeManager::reset_canvas_colors));
 
        set_size_request (-1, 400);
        setup_theme ();
@@ -183,17 +188,32 @@ load_rc_file (const string& filename, bool themechange)
                return;
        }
 
-       info << "Loading ui configuration file " << rcfile << endmsg;
+       cerr << "Loading ui configuration file " << rcfile << endl;
 
        Gtkmm2ext::UI::instance()->load_rcfile (rcfile, themechange);
 }
 
+/* hmm, this is a problem. the profile doesn't
+   exist when the theme manager is constructed
+   and toggles buttons during "normal" GTK setup.
+   
+   a better solution will be to make all Profile
+   methods static or something.
+
+   XXX FIX ME
+*/
+
+#define HACK_PROFILE_IS_SAE() (getenv("ARDOUR_SAE")!=0)
+
 void
 ThemeManager::on_dark_theme_button_toggled()
 {
        if (!dark_button.get_active()) return;
-
-       ARDOUR_UI::config()->ui_rc_file.set("ardour2_ui_dark.rc");
+       if (HACK_PROFILE_IS_SAE()){
+               ARDOUR_UI::config()->ui_rc_file.set("ardour2_ui_dark_sae.rc");
+       } else {
+               ARDOUR_UI::config()->ui_rc_file.set("ardour2_ui_dark.rc");
+       }
        load_rc_file (ARDOUR_UI::config()->ui_rc_file.get(), true);
 }
 
@@ -201,8 +221,11 @@ void
 ThemeManager::on_light_theme_button_toggled()
 {
        if (!light_button.get_active()) return;
-
-       ARDOUR_UI::config()->ui_rc_file.set("ardour2_ui_light.rc");
+       if (HACK_PROFILE_IS_SAE()){
+               ARDOUR_UI::config()->ui_rc_file.set("ardour2_ui_light_sae.rc");
+       } else {
+               ARDOUR_UI::config()->ui_rc_file.set("ardour2_ui_light.rc");
+       }
        load_rc_file (ARDOUR_UI::config()->ui_rc_file.get(), true);
 }
 
@@ -210,6 +233,8 @@ void
 ThemeManager::setup_theme ()
 {
        int r, g, b, a;
+       color_list->clear();
+
        for (std::vector<UIConfigVariable<uint32_t> *>::iterator i = ARDOUR_UI::config()->canvas_colors.begin(); i != ARDOUR_UI::config()->canvas_colors.end(); i++) {
                
                TreeModel::Row row = *(color_list->append());
@@ -237,12 +262,19 @@ ThemeManager::setup_theme ()
                rcfile = ARDOUR_UI::config()->ui_rc_file.get();
        }
 
-       if (rcfile == "ardour2_ui_dark.rc") {
+       if (rcfile == "ardour2_ui_dark.rc" || rcfile == "ardour2_ui_dark_sae.rc") {
                dark_button.set_active();
-       } else if (rcfile == "ardour2_ui_light.rc") {
+       } else if (rcfile == "ardour2_ui_light.rc" || "ardour2_ui_light_sae.rc") {
                light_button.set_active();
        }
 
        load_rc_file(rcfile, false);
 }
 
+void
+ThemeManager::reset_canvas_colors()
+{
+       ARDOUR_UI::config()->load_defaults();
+       setup_theme ();
+}
+