X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftheme_manager.h;h=37a451da0778499edb758e1afebda7c9b56448ff;hb=b998b8f761aaf1b8e61633f6054a6e9aa5d6c204;hp=cba3a9fd5519da253804ffc1e796accc2e7c4a8c;hpb=be26fa02ce6e742de057c9fd2f9e6502cb57cbdc;p=ardour.git

diff --git a/gtk2_ardour/theme_manager.h b/gtk2_ardour/theme_manager.h
index cba3a9fd55..37a451da07 100644
--- 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
@@ -21,14 +21,14 @@
 #define __ardour_gtk_color_manager_h__
 
 #include <gtkmm/treeview.h>
-#include <gtkmm/liststore.h>
+#include <gtkmm/treestore.h>
 #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,39 +38,40 @@ 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<std::string>  name;
+	    Gtk::TreeModelColumn<std::string>  color;
 	    Gtk::TreeModelColumn<Gdk::Color>     gdkcolor;
-	    Gtk::TreeModelColumn<ARDOUR::ConfigVariable<uint32_t> *> pVar;
+	    Gtk::TreeModelColumn<UIConfigVariable<uint32_t> *> pVar;
 	    Gtk::TreeModelColumn<uint32_t>       rgba;
 	};
 
 	ColorDisplayModelColumns columns;
 	Gtk::TreeView color_display;
-	Glib::RefPtr<Gtk::ListStore> color_list;
+	Glib::RefPtr<Gtk::TreeStore> color_list;
 	Gtk::ColorSelectionDialog color_dialog;
 	Gtk::ScrolledWindow scroller;
 	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__ */