X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fparamdesc.cpp;h=8947f1943d6bc1a4c6a92ae7dc57ba3593cb89c1;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=07347826ea3b5ce40e1856b64b61411687a0a6ce;hpb=e3acc0b267b14fda5db3c7bbb2f218b993ef84b3;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/paramdesc.cpp b/synfig-core/trunk/src/synfig/paramdesc.cpp
index 0734782..8947f19 100644
--- a/synfig-core/trunk/src/synfig/paramdesc.cpp
+++ b/synfig-core/trunk/src/synfig/paramdesc.cpp
@@ -1,20 +1,22 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file paramdesc.cpp
 **	\brief Template File
 **
-**	$Id: paramdesc.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $
+**	$Id$
 **
 **	\legal
-**	Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2008 Chris Moore
 **
-**	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
 */
 /* ========================================================================= */
@@ -37,7 +39,7 @@
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 
 /* === M A C R O S ========================================================= */
 
@@ -47,42 +49,42 @@ using namespace sinfg;
 
 /* === M E T H O D S ======================================================= */
 
-ParamDesc::ParamDesc(sinfg::Color::BlendMethod, const String &a):
+ParamDesc::ParamDesc(synfig::Color::BlendMethod, const String &a):
 	name_			(a),
 	local_name_		(a),
 	scalar_			(1.0),
 	critical_		(true),
 	hidden_			(false),
 	invisible_duck_	(false),
-		is_distance_	(false),
-		animation_only_	(false)
+	is_distance_	(false),
+	animation_only_	(false)
 {
 	set_local_name(_("Blend Method"))
-	.set_hint("enum")
-	.add_enum_value(Color::BLEND_COMPOSITE,"composite",_("Composite"))
-	.add_enum_value(Color::BLEND_STRAIGHT,"straight",_("Straight"))
-	.add_enum_value(Color::BLEND_ONTO,"onto",_("Onto"))
-	.add_enum_value(Color::BLEND_STRAIGHT_ONTO,"straightonto",_("StraightOnto"))
-	.add_enum_value(Color::BLEND_BEHIND,"behind",_("Behind"))
-	.add_enum_value(Color::BLEND_SCREEN,"screen",_("Screen"))
-	.add_enum_value(Color::BLEND_OVERLAY,"overlay",_("Overlay"))
-	.add_enum_value(Color::BLEND_HARD_LIGHT,"hard_light",_("Hard Light"))
-	.add_enum_value(Color::BLEND_MULTIPLY,"multiply",_("Multiply"))
-	.add_enum_value(Color::BLEND_DIVIDE,"divide",_("Divide"))
-	.add_enum_value(Color::BLEND_ADD,"add",_("Add"))
-	.add_enum_value(Color::BLEND_SUBTRACT,"subtract",_("Subtract"))
-	.add_enum_value(Color::BLEND_DIFFERENCE,"difference",_("Difference"))
-	.add_enum_value(Color::BLEND_BRIGHTEN,"brighten",_("Brighten"))
-	.add_enum_value(Color::BLEND_DARKEN,"darken",_("Darken"))
-	.add_enum_value(Color::BLEND_COLOR,"color",_("Color"))
-	.add_enum_value(Color::BLEND_HUE,"hue",_("Hue"))
-	.add_enum_value(Color::BLEND_SATURATION,"saturation",_("Saturation"))
-	.add_enum_value(Color::BLEND_LUMINANCE,"luminance",_("Luminance"))
-// These are deprecated
-	.add_enum_value(Color::BLEND_ALPHA_OVER,"alphaover",_("Alpha Over"))
-//	.add_enum_value(Color::BLEND_ALPHA_BRIGHTEN,"alphabrighten",_("Alpha Brighten"))
-//	.add_enum_value(Color::BLEND_ALPHA_DARKEN,"alphadarken",_("Alpha Darken"))
-	; // end of enums
+		.set_hint("enum")		// used shortcuts: A B C D E F G H I K L M N O P R S T U V Y; free: J Q W X Z
+		.add_enum_value(Color::BLEND_COMPOSITE,			"composite",		_("_Composite"		))
+		.add_enum_value(Color::BLEND_STRAIGHT,			"straight",			_("_Straight"		))
+		.add_enum_value(Color::BLEND_ONTO,				"onto",				_("_Onto"			))
+		.add_enum_value(Color::BLEND_STRAIGHT_ONTO,		"straightonto",		_("S_traight Onto"	))
+		.add_enum_value(Color::BLEND_BEHIND,			"behind",			_("_Behind"			))
+		.add_enum_value(Color::BLEND_SCREEN,			"screen",			_("Sc_reen"			))
+		.add_enum_value(Color::BLEND_OVERLAY,			"overlay",			_("Overla_y"		))
+		.add_enum_value(Color::BLEND_HARD_LIGHT,		"hard_light",		_("_Hard Light"		))
+		.add_enum_value(Color::BLEND_MULTIPLY,			"multiply",			_("_Multiply"		))
+		.add_enum_value(Color::BLEND_DIVIDE,			"divide",			_("_Divide"			))
+		.add_enum_value(Color::BLEND_ADD,				"add",				_("_Add"			))
+		.add_enum_value(Color::BLEND_SUBTRACT,			"subtract",			_("S_ubtract"		))
+		.add_enum_value(Color::BLEND_DIFFERENCE,		"difference",		_("Di_fference"		))
+		.add_enum_value(Color::BLEND_BRIGHTEN,			"brighten",			_("Bri_ghten"		))
+		.add_enum_value(Color::BLEND_DARKEN,			"darken",			_("Dar_ken"			))
+		.add_enum_value(Color::BLEND_COLOR,				"color",			_("Co_lor"			))
+		.add_enum_value(Color::BLEND_HUE,				"hue",				_("Hu_e"			))
+		.add_enum_value(Color::BLEND_SATURATION,		"saturation",		_("Saturatio_n"		))
+		.add_enum_value(Color::BLEND_LUMINANCE,			"luminance",		_("Lum_inance"		))
+		// These are deprecated
+		.add_enum_value(Color::BLEND_ALPHA_OVER,		"alphaover",		_("Alpha O_ver"		))
+		.add_enum_value(Color::BLEND_ALPHA_BRIGHTEN,	"alphabrighten",	_("Al_pha Brighten"	))
+		.add_enum_value(Color::BLEND_ALPHA_DARKEN,		"alphadarken",		_("Al_pha Darken"	))
+		; // end of enums
 }
 
 ParamDesc::ParamDesc(const ValueBase&, const String &a):