markers are not allowed to have empty names, especially since it causes a crash in...

[ardour.git] / gtk2_ardour / theme_manager.h

diff --git a/gtk2_ardour/theme_manager.h b/gtk2_ardour/theme_manager.h
index cba3a9fd5519da253804ffc1e796accc2e7c4a8c..ea617aee77e93d2e228d331a66ac90c54946a198 100644 (file)
--- a/gtk2_ardour/theme_manager.h
+++ b/gtk2_ardour/theme_manager.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis 
+    Copyright (C) 2000-2007 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -25,10 +25,10 @@
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/colorselection.h>
 #include <gtkmm/radiobutton.h>
+#include <gtkmm/button.h>
 #include <gtkmm/rc.h>
-#include <ardour/configuration.h>
 #include "ardour_dialog.h"
-
+#include "ui_config.h"
 
 class ThemeManager : public ArdourDialog
 {
@@ -38,24 +38,25 @@ class ThemeManager : public ArdourDialog
 
        int save (std::string path);
        void setup_theme ();
-       
+       void reset_canvas_colors();
+
        void on_dark_theme_button_toggled ();
        void on_light_theme_button_toggled ();
 
   private:
        struct ColorDisplayModelColumns : public Gtk::TreeModel::ColumnRecord {
-           ColorDisplayModelColumns() { 
+           ColorDisplayModelColumns() {
                    add (name);
                    add (color);
                    add (gdkcolor);
                        add (pVar);
                    add (rgba);
            }
-           
+
            Gtk::TreeModelColumn<Glib::ustring>  name;
            Gtk::TreeModelColumn<Glib::ustring>  color;
            Gtk::TreeModelColumn<Gdk::Color>     gdkcolor;
-           Gtk::TreeModelColumn<ARDOUR::ConfigVariable<uint32_t> *> pVar;
+           Gtk::TreeModelColumn<UIConfigVariable<uint32_t> *> pVar;
            Gtk::TreeModelColumn<uint32_t>       rgba;
        };
 
@@ -67,10 +68,10 @@ class ThemeManager : public ArdourDialog
        Gtk::HBox theme_selection_hbox;
        Gtk::RadioButton dark_button;
        Gtk::RadioButton light_button;
+       Gtk::Button reset_button;
 
        bool button_press_event (GdkEventButton*);
 };
 
-
 #endif /* __ardour_gtk_color_manager_h__ */