X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fcanvasadd.cpp;h=b528e08cb40b56aaed45c6bcd72c671b6ba5e6fd;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=be986b3c12d448113e7ddfadb2dc18df60e22360;hpb=02252941b29de64037116f4d37991a38d9ff0d94;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/canvasadd.cpp b/synfig-studio/trunk/src/synfigapp/actions/canvasadd.cpp
index be986b3..b528e08 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/canvasadd.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/canvasadd.cpp
@@ -2,19 +2,20 @@
 /*!	\file canvasadd.cpp
 **	\brief Template File
 **
-**	$Id: canvasadd.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
 */
 /* ========================================================================= */
@@ -31,6 +32,8 @@
 #include "canvasadd.h"
 #include <synfigapp/canvasinterface.h>
 
+#include <synfigapp/general.h>
+
 #endif
 
 using namespace std;
@@ -42,13 +45,13 @@ using namespace Action;
 /* === M A C R O S ========================================================= */
 
 ACTION_INIT(Action::CanvasAdd);
-ACTION_SET_NAME(Action::CanvasAdd,"canvas_add");
-ACTION_SET_LOCAL_NAME(Action::CanvasAdd,"Add Child Canvas");
+ACTION_SET_NAME(Action::CanvasAdd,"CanvasAdd");
+ACTION_SET_LOCAL_NAME(Action::CanvasAdd,N_("Add Child Canvas"));
 ACTION_SET_TASK(Action::CanvasAdd,"add");
 ACTION_SET_CATEGORY(Action::CanvasAdd,Action::CATEGORY_CANVAS);
 ACTION_SET_PRIORITY(Action::CanvasAdd,0);
 ACTION_SET_VERSION(Action::CanvasAdd,"0.0");
-ACTION_SET_CVS_ID(Action::CanvasAdd,"$Id: canvasadd.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $");
+ACTION_SET_CVS_ID(Action::CanvasAdd,"$Id$");
 
 /* === G L O B A L S ======================================================= */
 
@@ -65,7 +68,7 @@ Action::ParamVocab
 Action::CanvasAdd::get_param_vocab()
 {
 	ParamVocab ret(Action::CanvasSpecific::get_param_vocab());
-	
+
 	ret.push_back(ParamDesc("src",Param::TYPE_CANVAS)
 		.set_local_name(_("New Canvas"))
 		.set_optional()
@@ -76,14 +79,14 @@ Action::CanvasAdd::get_param_vocab()
 		.set_desc(_("The name that you want this canvas to be"))
 		.set_user_supplied()
 	);
-	
+
 	return ret;
 }
 
 bool
-Action::CanvasAdd::is_canidate(const ParamList &x)
+Action::CanvasAdd::is_candidate(const ParamList &x)
 {
-	return canidate_check(get_param_vocab(),x);
+	return candidate_check(get_param_vocab(),x);
 }
 
 bool
@@ -92,13 +95,13 @@ Action::CanvasAdd::set_param(const synfig::String& name, const Action::Param &pa
 	if(name=="src" && param.get_type()==Param::TYPE_CANVAS)
 	{
 		new_canvas=param.get_canvas();
-		
+
 		return true;
 	}
 	if(name=="id" && param.get_type()==Param::TYPE_STRING)
 	{
 		id=param.get_string();
-		
+
 		return true;
 	}
 
@@ -140,8 +143,8 @@ Action::CanvasAdd::undo()
 	get_canvas()->remove_child_canvas(new_canvas);
 
 	if(inline_parent)
-		new_canvas->set_inline(inline_parent);		
-	
+		new_canvas->set_inline(inline_parent);
+
 	if(get_canvas_interface())
 	{
 		get_canvas_interface()->signal_canvas_removed()(new_canvas);