X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftheme_manager.h;h=36e85e5dd9febc3447a99c8c4d7e4320d92f3afe;hb=e0846c6aee11853597fb6867b35a16f7a3b43479;hp=7c8d81fef9d9ec0a61687920b548b34669348c88;hpb=5e0e41e068a04603198a4e50464d794156f42c47;p=ardour.git

diff --git a/gtk2_ardour/theme_manager.h b/gtk2_ardour/theme_manager.h
index 7c8d81fef9..36e85e5dd9 100644
--- a/gtk2_ardour/theme_manager.h
+++ b/gtk2_ardour/theme_manager.h
@@ -28,53 +28,63 @@
 #include <gtkmm/button.h>
 #include <gtkmm/scale.h>
 #include <gtkmm/rc.h>
-#include "ardour_window.h"
+
+#include "canvas/types.h"
+#include "canvas/canvas.h"
+
 #include "ui_config.h"
 
-class ThemeManager : public ArdourWindow
+namespace ArdourCanvas {
+	class Container;
+	class ScrollGroup;
+}
+
+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;
+	Gtk::Notebook notebook;
+
+	struct BasicColorDisplayModelColumns : public Gtk::TreeModel::ColumnRecord {
+		BasicColorDisplayModelColumns() {
+			add (name);
+			add (gdkcolor);
+		}
+
+		Gtk::TreeModelColumn<std::string>  name;
+		Gtk::TreeModelColumn<Gdk::Color>   gdkcolor;
 	};
 
-	ColorDisplayModelColumns columns;
-	Gtk::TreeView color_display;
-	Glib::RefPtr<Gtk::TreeStore> color_list;
 	Gtk::ColorSelectionDialog color_dialog;
-	Gtk::ScrolledWindow scroller;
+	sigc::connection color_dialog_connection;
+
 	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,9 +92,87 @@ 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;
+
+	/* handls response from color dialog when it is used to
+	   edit a derived color.
+	*/
+	void palette_color_response (int, std::string);
+
+	Gtk::ScrolledWindow palette_scroller;
+	ArdourCanvas::GtkCanvasViewport palette_viewport;
+	ArdourCanvas::Container* palette_group;
+
+	/* these methods create and manage a canvas for use in either the
+	   palette tab or in a separate dialog. Different behaviour is
+	   accomplished by changing the event handler passed into the
+	   allocation handler. We do it there because we have to rebuild
+	   the canvas on allocation events, and during the rebuild, connect
+	   each rectangle to the event handler.
+
+	   the alternative is one event handler for the canvas and a map
+	   of where each color rectangle is. nothing wrong with this
+	   but the per-rect event setup is simpler and avoids building
+	   and looking up the map information.
+	*/
+	ArdourCanvas::Container* initialize_palette_canvas (ArdourCanvas::Canvas& canvas);
+	void build_palette_canvas (ArdourCanvas::Canvas&, ArdourCanvas::Container&, sigc::slot<bool,GdkEvent*,std::string> event_handler);
+	void palette_canvas_allocated (Gtk::Allocation& alloc, ArdourCanvas::Container* group, ArdourCanvas::Canvas* canvas, sigc::slot<bool,GdkEvent*,std::string> event_handler);
+	void palette_size_request (Gtk::Requisition*);
+
+	/* handles events from a palette canvas inside the palette (derived
+	   colors) tab
+	*/
+	bool palette_event (GdkEvent*, std::string name);
+	/* allows user to edit a named color (e.g. "color 3") after clicking
+	   on it inside the palette tab.
+	*/
+	void edit_palette_color (std::string);
+
+	struct ColorAliasModelColumns : public Gtk::TreeModel::ColumnRecord {
+		ColorAliasModelColumns() {
+			add (name);
+			add (alias);
+			add (color);
+			add (key);
+		}
+
+		Gtk::TreeModelColumn<std::string>  name;
+		Gtk::TreeModelColumn<std::string>  alias;
+		Gtk::TreeModelColumn<Gdk::Color>   color;
+		Gtk::TreeModelColumn<std::string>  key;
+	};
+
+	ColorAliasModelColumns       alias_columns;
+	Gtk::TreeView                alias_display;
+	Glib::RefPtr<Gtk::TreeStore> alias_list;
+	Gtk::ScrolledWindow          alias_scroller;
+
+	bool alias_button_press_event (GdkEventButton*);
+
+	ArdourDialog* palette_window;
+	sigc::connection palette_response_connection;
+
+	void choose_color_from_palette (std::string const &target_name);
+
+	bool alias_palette_event (GdkEvent*, std::string, std::string);
+	void alias_palette_response (int, std::string, std::string);
+
+	void setup_aliases ();
+	void setup_palette ();
+
+	Gtk::ScrolledWindow modifier_scroller;
+	Gtk::VBox modifier_vbox;
+
+	void setup_modifiers ();
+	void modifier_edited (Gtk::Range*, std::string);
 
-	bool button_press_event (GdkEventButton*);
+	void colors_changed ();
+	void set_ui_to_state ();
 };
 
 #endif /* __ardour_gtk_color_manager_h__ */