X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fwidget_coloredit.h;h=63dcfa6002f356d68927b694c449c12d0b4b62c8;hb=197d6d1c81c6dec1b762af182cadcfc7404823e6;hp=ad97ee8d0c06a505ee61ca3c3cc6c4b32b3f6a46;hpb=ce408de81ca266b1f334ee9bc6c8fb7ba1492ed4;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/widget_coloredit.h b/synfig-studio/trunk/src/gtkmm/widget_coloredit.h
index ad97ee8..63dcfa6 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_coloredit.h
+++ b/synfig-studio/trunk/src/gtkmm/widget_coloredit.h
@@ -2,7 +2,7 @@
 /*!	\file widget_coloredit.h
 **	\brief Template Header
 **
-**	$Id: widget_coloredit.h,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@ -61,10 +61,10 @@ public:
 		TYPE_HUE,
 		TYPE_SAT,
 		TYPE_A,
-		
+
 		TYPE_END
 	};
-	
+
 private:
 
 	sigc::signal<void,Type,float> signal_slider_moved_;
@@ -107,14 +107,14 @@ private:
 	static void slider_color_TYPE_HUE(synfig::Color &color, float amount);
 	static void slider_color_TYPE_SAT(synfig::Color &color, float amount);
 	static void slider_color_TYPE_A(synfig::Color &color, float amount);
-	
+
 
 	bool
 	redraw(GdkEventExpose*bleh);
 	bool on_event(GdkEvent *event);
 }; // END of class ColorSlider
 
-	
+
 class Widget_ColorEdit : public Gtk::Table
 {
 	sigc::signal<void> signal_activated_;
@@ -123,19 +123,22 @@ class Widget_ColorEdit : public Gtk::Table
 	ColorSlider *slider_R;
 	ColorSlider *slider_G;
 	ColorSlider *slider_B;
+	Gtk::Label *hex_color_label;
+	Gtk::Entry *hex_color;
+
 	ColorSlider *slider_A;
 	ColorSlider *slider_Y;
 	ColorSlider *slider_U;
 	ColorSlider *slider_V;
 	ColorSlider *slider_SAT;
 	ColorSlider *slider_HUE;
-	
+
 	Widget_Color widget_color;
-	
+
 	bool hold_signals;
-	
+
 	bool clamp_;
-	
+
 	Gtk::SpinButton *spinbutton_R;
 	Gtk::SpinButton *spinbutton_G;
 	Gtk::SpinButton *spinbutton_B;
@@ -145,13 +148,13 @@ class Widget_ColorEdit : public Gtk::Table
 	Gtk::Adjustment G_adjustment;
 	Gtk::Adjustment B_adjustment;
 	Gtk::Adjustment A_adjustment;
-	
+
 	synfig::Color color;
 
 	Gtk::Notebook* notebook;
 
 protected:
-	
+
 	void on_value_changed();
 
 public:
@@ -161,11 +164,12 @@ public:
 	sigc::signal<void>& signal_activate() { return signal_activated_; }
 
 	void on_slider_moved(ColorSlider::Type type, float amount);
+	void on_hex_edited();
 
 	//Glib::SignalProxy0<void> signal_activate() { return spinbutton_A->signal_activate(); }
-	
+
 	sigc::signal<void>& signal_value_changed() { return signal_value_changed_; }
-	
+
 	void activated() { signal_activated_(); }
 	void activate() { signal_activated_(); }
 	void set_value(const synfig::Color &data);
@@ -176,7 +180,7 @@ public:
 	Widget_ColorEdit();
 	~Widget_ColorEdit();
 }; // END of class Widget_ColorEdit
-	
+
 }; // END of namespace studio
 
 /* === E N D =============================================================== */