X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftheme_manager.h;h=75a7d101ba1c31400f14eb8655ac3d52c5e96f78;hb=b8f5306d5bf59ddb237fabcdbab91a7d1e6fd612;hp=7c8d81fef9d9ec0a61687920b548b34669348c88;hpb=59631acc5f41153a294c97ab820a4b41a886e24c;p=ardour.git

diff --git a/gtk2_ardour/theme_manager.h b/gtk2_ardour/theme_manager.h
index 7c8d81fef9..75a7d101ba 100644
--- a/gtk2_ardour/theme_manager.h
+++ b/gtk2_ardour/theme_manager.h
@@ -17,64 +17,40 @@
 
 */
 
-#ifndef __ardour_gtk_color_manager_h__
-#define __ardour_gtk_color_manager_h__
+#ifndef __ardour_gtk_theme_manager_h__
+#define __ardour_gtk_theme_manager_h__
 
 #include <gtkmm/treeview.h>
 #include <gtkmm/treestore.h>
 #include <gtkmm/scrolledwindow.h>
-#include <gtkmm/colorselection.h>
 #include <gtkmm/radiobutton.h>
 #include <gtkmm/button.h>
 #include <gtkmm/scale.h>
 #include <gtkmm/rc.h>
-#include "ardour_window.h"
+
 #include "ui_config.h"
 
-class ThemeManager : public ArdourWindow
+class ArdourDialog;
+
+class ThemeManager : public Gtk::VBox
 {
   public:
 	ThemeManager();
-	~ThemeManager();
-
-	int save (std::string path);
-	void setup_theme ();
-	void reset_canvas_colors();
 
-	void on_dark_theme_button_toggled ();
-	void on_light_theme_button_toggled ();
 	void on_flat_buttons_toggled ();
+	void on_blink_rec_arm_toggled ();
         void on_region_color_toggled ();
         void on_show_clip_toggled ();
         void on_waveform_gradient_depth_change ();
         void on_timeline_item_gradient_depth_change ();
 	void on_all_dialogs_toggled ();
+	void on_transients_follow_front_toggled ();
+	void on_floating_monitor_section_toggled ();
+	void on_icon_set_changed ();
 
   private:
-	struct ColorDisplayModelColumns : public Gtk::TreeModel::ColumnRecord {
-	    ColorDisplayModelColumns() {
-		    add (name);
-		    add (gdkcolor);
-		    add (pVar);
-		    add (rgba);
-	    }
-
-	    Gtk::TreeModelColumn<std::string>  name;
-	    Gtk::TreeModelColumn<Gdk::Color>   gdkcolor;
-	    Gtk::TreeModelColumn<UIConfigVariable<uint32_t> *> pVar;
-	    Gtk::TreeModelColumn<uint32_t>     rgba;
-	};
-
-	ColorDisplayModelColumns columns;
-	Gtk::TreeView color_display;
-	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 blink_rec_button;
 	Gtk::CheckButton region_color_button;
 	Gtk::CheckButton show_clipping_button;
         Gtk::HScale waveform_gradient_depth;
@@ -82,10 +58,14 @@ class ThemeManager : public ArdourWindow
         Gtk::HScale timeline_item_gradient_depth;
         Gtk::Label timeline_item_gradient_depth_label;
 	Gtk::CheckButton all_dialogs;
+	Gtk::CheckButton transients_follow_front;
+	Gtk::CheckButton floating_monitor_section;
 	Gtk::CheckButton gradient_waveforms;
+	Gtk::Label icon_set_label;
+	Gtk::ComboBoxText icon_set_dropdown;
 
-	bool button_press_event (GdkEventButton*);
+	void colors_changed ();
+	void set_ui_to_state ();
 };
 
-#endif /* __ardour_gtk_color_manager_h__ */
-
+#endif /* __ardour_gtk_theme_manager_h__ */