X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fwidget_coloredit.h;h=63dcfa6002f356d68927b694c449c12d0b4b62c8;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=2689638d1b5c25825474a43745a2c559b7df379d;hpb=02252941b29de64037116f4d37991a38d9ff0d94;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/widget_coloredit.h b/synfig-studio/trunk/src/gtkmm/widget_coloredit.h
index 2689638..63dcfa6 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_coloredit.h
+++ b/synfig-studio/trunk/src/gtkmm/widget_coloredit.h
@@ -2,19 +2,20 @@
 /*!	\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 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**	This software and associated documentation
-**	are CONFIDENTIAL and PROPRIETARY property of
-**	the above-mentioned copyright holder.
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
 **
-**	You may not copy, print, publish, or in any
-**	other way distribute this software without
-**	a prior written agreement with
-**	the copyright holder.
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
 **	\endlegal
 */
 /* ========================================================================= */
@@ -60,10 +61,10 @@ public:
 		TYPE_HUE,
 		TYPE_SAT,
 		TYPE_A,
-		
+
 		TYPE_END
 	};
-	
+
 private:
 
 	sigc::signal<void,Type,float> signal_slider_moved_;
@@ -106,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_;
@@ -122,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;
@@ -144,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:
@@ -160,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);
@@ -175,7 +180,7 @@ public:
 	Widget_ColorEdit();
 	~Widget_ColorEdit();
 }; // END of class Widget_ColorEdit
-	
+
 }; // END of namespace studio
 
 /* === E N D =============================================================== */