X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fdialog_color.h;h=ee350cf3b4967b2dfca5224e79b3e9f198c3b9c5;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=960f414caa1ae0c3779b07bb551fd874e51476cb;hpb=67b41b7fefe54700fa382d715ac94ab0c7f383e4;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/dialog_color.h b/synfig-studio/trunk/src/gtkmm/dialog_color.h
index 960f414..ee350cf 100644
--- a/synfig-studio/trunk/src/gtkmm/dialog_color.h
+++ b/synfig-studio/trunk/src/gtkmm/dialog_color.h
@@ -28,23 +28,11 @@
 /* === H E A D E R S ======================================================= */
 
 #include <gtk/gtk.h>
-#include <gtkmm/adjustment.h>
-#include <gtkmm/table.h>
-#include <gtkmm/button.h>
 #include <gtkmm/dialog.h>
-#include <gtkmm/drawingarea.h>
-#include <gtkmm/optionmenu.h>
-#include <gtkmm/checkbutton.h>
 #include <gtkmm/tooltips.h>
-
-#include <synfig/gamma.h>
-#include <synfig/time.h>
+#include <sigc++/functors/slot.h>
 
 #include "widget_coloredit.h"
-
-#include <synfigapp/value_desc.h>
-#include <synfig/time.h>
-
 #include "dialogsettings.h"
 
 /* === M A C R O S ========================================================= */
@@ -53,12 +41,6 @@
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
-namespace Gtk { class Menu; class SpinButton; class Adjustment; };
-
-namespace synfigapp {
-class CanvasInterface;
-};
-
 namespace studio {
 
 class Widget_Color;
@@ -68,37 +50,35 @@ class Dialog_Color : public Gtk::Dialog
 	DialogSettings dialog_settings;
 	Gtk::Tooltips tooltips;
 
+	Widget_ColorEdit* color_edit_widget;
+
 	sigc::signal<void,synfig::Color> signal_edited_;
-	//sigc::signal<void,synfig::Color> signal_apply_;
 
-	bool on_close_pressed();
-	void on_apply_pressed();
-	void on_set_fg_pressed();
-	void on_set_bg_pressed();
-	void on_color_changed();
+	bool busy_;
 
-	Widget_ColorEdit* widget_color;
+	void create_color_edit_widget();
+	void create_set_color_button(const char *stock_id,
+			const Glib::ustring& tip_text, int index,
+			const sigc::slot0<void>& callback);
+	void create_close_button();
 
-	bool busy_;
+	void on_color_changed();
+	void on_set_oc_pressed();
+	void on_set_fc_pressed();
+	bool on_close_pressed();
 
 public:
-	bool busy()const { return busy_; }
+	Dialog_Color();
+	~Dialog_Color();
 
 	sigc::signal<void,synfig::Color>& signal_edited() { return signal_edited_; }
 
-	//sigc::signal<void,synfig::Color>& signal_apply() { return signal_apply_; }
-
-	void set_color(const synfig::Color& x) { widget_color->set_value(x); }
-
-	synfig::Color get_color()const { return widget_color->get_value(); }
-
+	void set_color(const synfig::Color& x) { color_edit_widget->set_value(x); }
+	synfig::Color get_color() const { return color_edit_widget->get_value(); }
 	void reset();
 
+	bool busy() const { return busy_; }
 
-	Dialog_Color();
-	~Dialog_Color();
-
-//	void edit(const synfigapp::ValueDesc &x, etl::handle<synfigapp::CanvasInterface> canvas_interface, synfig::Time x=0);
 }; // END of Dialog_Color
 
 }; // END of namespace studio