X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftheme_manager.h;h=04aa3ed7701be838a9dbb6bf39edd15acb392270;hb=d697a31abf2fa1b0bedcab025188f03611920fdf;hp=ea617aee77e93d2e228d331a66ac90c54946a198;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/gtk2_ardour/theme_manager.h b/gtk2_ardour/theme_manager.h
index ea617aee77..04aa3ed770 100644
--- a/gtk2_ardour/theme_manager.h
+++ b/gtk2_ardour/theme_manager.h
@@ -21,16 +21,16 @@
 #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_dialog.h"
+#include "ardour_window.h"
 #include "ui_config.h"
 
-class ThemeManager : public ArdourDialog
+class ThemeManager : public ArdourWindow
 {
   public:
 	ThemeManager();
@@ -42,33 +42,37 @@ class ThemeManager : public ArdourDialog
 
 	void on_dark_theme_button_toggled ();
 	void on_light_theme_button_toggled ();
+	void on_flat_buttons_toggled ();
+	void on_all_dialogs_toggled ();
+	void on_gradient_waveforms_toggled ();
 
   private:
 	struct ColorDisplayModelColumns : public Gtk::TreeModel::ColumnRecord {
 	    ColorDisplayModelColumns() {
 		    add (name);
-		    add (color);
 		    add (gdkcolor);
-			add (pVar);
+		    add (pVar);
 		    add (rgba);
 	    }
 
-	    Gtk::TreeModelColumn<Glib::ustring>  name;
-	    Gtk::TreeModelColumn<Glib::ustring>  color;
-	    Gtk::TreeModelColumn<Gdk::Color>     gdkcolor;
+	    Gtk::TreeModelColumn<std::string>  name;
+	    Gtk::TreeModelColumn<Gdk::Color>   gdkcolor;
 	    Gtk::TreeModelColumn<UIConfigVariable<uint32_t> *> pVar;
-	    Gtk::TreeModelColumn<uint32_t>       rgba;
+	    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;
+	Gtk::CheckButton flat_buttons;
+	Gtk::CheckButton all_dialogs;
+	Gtk::CheckButton gradient_waveforms;
 
 	bool button_press_event (GdkEventButton*);
 };