Fix ruler scale on initial view (apply patch from nick_m).

[ardour.git] / gtk2_ardour / theme_manager.cc

diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc
index c1e662d0169fb6419240e55b51bbd7cded59a4e7..9968fa9ea0ac629ba6aa039ca6155245072f8673 100644 (file)
--- a/gtk2_ardour/theme_manager.cc
+++ b/gtk2_ardour/theme_manager.cc
@@ -24,6 +24,7 @@
 
 #include <gtkmm/stock.h>
 #include <gtkmm2ext/gtk_ui.h>
+#include <gtkmm2ext/window_title.h>
 #include <gtkmm/settings.h>
 
 #include <pbd/file_utils.h>
@@ -49,8 +50,13 @@ 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")
 {
+       Gtkmm2ext::WindowTitle title (Glib::get_application_name ());
+       title += _("Theme Manager");
+       set_title (title.get_string ());
+  
        color_list = ListStore::create (columns);
        color_display.set_model (color_list);
        color_display.append_column (_("Object"), columns.name);
@@ -76,6 +82,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);
@@ -87,6 +94,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 ();
@@ -194,7 +202,7 @@ load_rc_file (const string& filename, bool themechange)
                return;
        }
 
-       info << "Loading ui configuration file " << rc_file_path.to_string() << endmsg;
+       cerr << "Loading ui configuration file " << rc_file_path.to_string() << endmsg;
 
        Gtkmm2ext::UI::instance()->load_rcfile (rc_file_path.to_string(), themechange);
 }
@@ -204,7 +212,7 @@ ThemeManager::on_dark_theme_button_toggled()
 {
        if (!dark_button.get_active()) return;
 
-       ARDOUR_UI::config()->ui_rc_file.set("ardour2_ui_dark.rc");
+       ARDOUR_UI::config()->ui_rc_file.set("ardour3_ui_dark.rc");
        load_rc_file (ARDOUR_UI::config()->ui_rc_file.get(), true);
 }
 
@@ -213,7 +221,7 @@ ThemeManager::on_light_theme_button_toggled()
 {
        if (!light_button.get_active()) return;
 
-       ARDOUR_UI::config()->ui_rc_file.set("ardour2_ui_light.rc");
+       ARDOUR_UI::config()->ui_rc_file.set("ardour3_ui_light.rc");
        load_rc_file (ARDOUR_UI::config()->ui_rc_file.get(), true);
 }
 
@@ -221,6 +229,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());
@@ -248,12 +258,19 @@ ThemeManager::setup_theme ()
                rcfile = ARDOUR_UI::config()->ui_rc_file.get();
        }
 
-       if (rcfile == "ardour2_ui_dark.rc") {
+       if (rcfile == "ardour3_ui_dark.rc") {
                dark_button.set_active();
-       } else if (rcfile == "ardour2_ui_light.rc") {
+       } else if (rcfile == "ardour3_ui_light.rc") {
                light_button.set_active();
        }
 
        load_rc_file(rcfile, false);
 }
 
+void
+ThemeManager::reset_canvas_colors()
+{
+       ARDOUR_UI::config()->load_defaults();
+       setup_theme ();
+}
+