X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fcolorset.cpp;h=76689973ab3d0e6a90537d353bb1a7b66dfcec17;hb=343b52e397572ae6630ad0f128de1290f89b8f81;hp=b2dff022a62178deeb726784c2408f33a746586a;hpb=02252941b29de64037116f4d37991a38d9ff0d94;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/colorset.cpp b/synfig-studio/trunk/src/synfigapp/actions/colorset.cpp
index b2dff02..7668997 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/colorset.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/colorset.cpp
@@ -2,19 +2,20 @@
 /*!	\file colorset.cpp
 **	\brief Template File
 **
-**	$Id: colorset.cpp,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
 */
 /* ========================================================================= */
@@ -37,6 +38,8 @@
 #include <synfigapp/canvasinterface.h>
 #include <synfigapp/main.h>
 
+#include <synfigapp/general.h>
+
 #endif
 
 using namespace std;
@@ -49,12 +52,12 @@ using namespace Action;
 
 ACTION_INIT(Action::ColorSet);
 ACTION_SET_NAME(Action::ColorSet,"color_set");
-ACTION_SET_LOCAL_NAME(Action::ColorSet,"Apply Default Color");
+ACTION_SET_LOCAL_NAME(Action::ColorSet,N_("Apply Default Color"));
 ACTION_SET_TASK(Action::ColorSet,"set");
 ACTION_SET_CATEGORY(Action::ColorSet,Action::CATEGORY_VALUEDESC);
 ACTION_SET_PRIORITY(Action::ColorSet,0);
 ACTION_SET_VERSION(Action::ColorSet,"0.0");
-ACTION_SET_CVS_ID(Action::ColorSet,"$Id: colorset.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $");
+ACTION_SET_CVS_ID(Action::ColorSet,"$Id$");
 
 /* === G L O B A L S ======================================================= */
 
@@ -71,7 +74,7 @@ Action::ParamVocab
 Action::ColorSet::get_param_vocab()
 {
 	ParamVocab ret(Action::CanvasSpecific::get_param_vocab());
-	
+
 	ret.push_back(ParamDesc("value_desc",Param::TYPE_VALUEDESC)
 		.set_local_name(_("ValueDesc"))
 	);
@@ -80,14 +83,14 @@ Action::ColorSet::get_param_vocab()
 		.set_local_name(_("Time"))
 		.set_optional()
 	);
-	
+
 	return ret;
 }
 
 bool
-Action::ColorSet::is_canidate(const ParamList &x)
+Action::ColorSet::is_candidate(const ParamList &x)
 {
-	if(!canidate_check(get_param_vocab(),x))
+	if(!candidate_check(get_param_vocab(),x))
 		return false;
 	return x.find("value_desc")->second.get_value_desc().get_value_type()==ValueBase::TYPE_COLOR;
 }
@@ -99,17 +102,17 @@ Action::ColorSet::set_param(const synfig::String& name, const Action::Param &par
 	{
 		// Grab the value_desc
 		value_desc=param.get_value_desc();
-		
+
 		// Grab the current color
 		color=synfigapp::Main::get_foreground_color();
-		
+
 		return value_desc.get_value_type()==ValueBase::TYPE_COLOR;
 	}
 
 	if(name=="time" && param.get_type()==Param::TYPE_TIME)
 	{
 		time=param.get_time();
-		
+
 		return true;
 	}
 
@@ -128,16 +131,16 @@ void
 Action::ColorSet::prepare()
 {
 	clear();
-	
+
 	Action::Handle action;
 	action=Action::create("value_desc_set");
-		
+
 	action->set_param("canvas",get_canvas());
 	action->set_param("canvas_interface",get_canvas_interface());
 	action->set_param("value_desc",value_desc);
 	action->set_param("new_value",ValueBase(color));
 	action->set_param("time",time);
-	
+
 	if(!action->is_ready())
 		throw Error(Error::TYPE_NOTREADY);