X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fwidget_value.cpp;h=76fe1bb1c8d7fd809e1b96299b7c066dbe9667d4;hb=c17ff8c0593a678801a38e3dc400ace6bc57a4bb;hp=ddf28fae56752409d3ed4c0e2335e7eccdd662e7;hpb=3a3c4bca3a17137bec5d7960560934b91ef4146e;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/widget_value.cpp b/synfig-studio/trunk/src/gtkmm/widget_value.cpp
index ddf28fa..76fe1bb 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_value.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_value.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file widget_value.cpp
 **	\brief Template File
 **
 **	$Id: widget_value.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $
 **
 **	\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
 */
 /* ========================================================================= */
@@ -50,7 +51,7 @@
 
 #endif
 
-using namespace sinfg;
+using namespace synfig;
 using namespace etl;
 using namespace std;
 using namespace studio;
@@ -193,7 +194,7 @@ Widget_ValueBase::set_sensitive(bool x)
 }
 
 void
-Widget_ValueBase::set_value(const sinfg::ValueBase &data)
+Widget_ValueBase::set_value(const synfig::ValueBase &data)
 {
 	label->hide();
 	vector_widget->hide();
@@ -257,7 +258,7 @@ Widget_ValueBase::set_value(const sinfg::ValueBase &data)
 	case ValueBase::TYPE_CANVAS:
 		assert(canvas);
 		canvas_widget->set_parent_canvas(canvas);
-		canvas_widget->set_value(value.get(etl::loose_handle<sinfg::Canvas>()));
+		canvas_widget->set_value(value.get(etl::loose_handle<synfig::Canvas>()));
 		canvas_widget->show();
 		break;
 	case ValueBase::TYPE_BOOL:
@@ -278,11 +279,11 @@ Widget_ValueBase::set_value(const sinfg::ValueBase &data)
 		break;
 	case ValueBase::TYPE_COLOR:
         {
-		color_widget->set_value(value.get(sinfg::Color()));
+		color_widget->set_value(value.get(synfig::Color()));
 		color_widget->show();
 /*
 			Gdk::Color gdkcolor;
-			sinfg::Color color=value.get(sinfg::Color());
+			synfig::Color color=value.get(synfig::Color());
 			gdkcolor.set_rgb_p(color.get_r(),color.get_g(),color.get_b());
 			color_widget->set_current_color(gdkcolor);
 			color_widget->set_has_opacity_control(true);
@@ -295,10 +296,10 @@ Widget_ValueBase::set_value(const sinfg::ValueBase &data)
 		label->show();
 		break;
 	}
-	}catch(...) { sinfg::error(__FILE__":%d: Caught something that was thrown",__LINE__); }
+	}catch(...) { synfig::error(__FILE__":%d: Caught something that was thrown",__LINE__); }
 }
 
-const sinfg::ValueBase &
+const synfig::ValueBase &
 Widget_ValueBase::get_value()
 {
 	switch(value.get_type())
@@ -350,7 +351,7 @@ Widget_ValueBase::get_value()
 			value=color_widget->get_value();
 /*
 			Gdk::Color gdkcolor;
-			sinfg::Color color;
+			synfig::Color color;
 			gdkcolor=color_widget->get_current_color();
 			color.set_r(gdkcolor.get_red_p());
             color.set_g(gdkcolor.get_green_p());