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

diff --git a/synfig-studio/trunk/src/synfigapp/actions/canvasremove.cpp b/synfig-studio/trunk/src/synfigapp/actions/canvasremove.cpp
index 70ebdb4..9f77390 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/canvasremove.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/canvasremove.cpp
@@ -2,19 +2,20 @@
 /*!	\file canvasremove.cpp
 **	\brief Template File
 **
-**	$Id: canvasremove.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 "canvasremove.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::CanvasRemove);
-ACTION_SET_NAME(Action::CanvasRemove,"canvas_remove");
-ACTION_SET_LOCAL_NAME(Action::CanvasRemove,"Remove Canvas");
+ACTION_SET_NAME(Action::CanvasRemove,"CanvasRemove");
+ACTION_SET_LOCAL_NAME(Action::CanvasRemove,N_("Remove Canvas"));
 ACTION_SET_TASK(Action::CanvasRemove,"remove");
 ACTION_SET_CATEGORY(Action::CanvasRemove,Action::CATEGORY_CANVAS);
 ACTION_SET_PRIORITY(Action::CanvasRemove,0);
 ACTION_SET_VERSION(Action::CanvasRemove,"0.0");
-ACTION_SET_CVS_ID(Action::CanvasRemove,"$Id: canvasremove.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $");
+ACTION_SET_CVS_ID(Action::CanvasRemove,"$Id$");
 
 /* === G L O B A L S ======================================================= */
 
@@ -64,21 +67,21 @@ Action::ParamVocab
 Action::CanvasRemove::get_param_vocab()
 {
 	ParamVocab ret(Action::CanvasSpecific::get_param_vocab());
-	
+
 	return ret;
 }
 
 bool
-Action::CanvasRemove::is_canidate(const ParamList &x)
+Action::CanvasRemove::is_candidate(const ParamList &x)
 {
-	if(canidate_check(get_param_vocab(),x))
+	if(candidate_check(get_param_vocab(),x))
 	{
 		Canvas::Handle canvas=x.find("canvas")->second.get_canvas();
 		assert(canvas);
 		// We cannot remove the root canvas.
 		if(canvas->is_root())
 			return false;
-		
+
 		return true;
 	}
 	return false;
@@ -105,14 +108,14 @@ Action::CanvasRemove::perform()
 
 	if(get_canvas()->is_inline())
 		throw Error(_("You cannot remove an inline canvas!"));
-	
+
 	parent_canvas=get_canvas()->parent();
 	canvas_id=get_canvas()->get_id();
-	
+
 	assert(parent_canvas);
-	
+
 	parent_canvas->remove_child_canvas(get_canvas());
-	
+
 	if(get_canvas_interface())
 	{
 		get_canvas_interface()->signal_canvas_removed()(get_canvas());