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

diff --git a/synfig-studio/trunk/src/synfigapp/actions/groupremove.cpp b/synfig-studio/trunk/src/synfigapp/actions/groupremove.cpp
index 53245f0..dc155d6 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/groupremove.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/groupremove.cpp
@@ -1,20 +1,21 @@
 /* === S Y N F I G ========================================================= */
-/*!	\file action_layerremove.cpp
+/*!	\file groupremove.cpp
 **	\brief Template File
 **
-**	$Id: groupremove.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 "groupremove.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::GroupRemove);
-ACTION_SET_NAME(Action::GroupRemove,"group_remove");
-ACTION_SET_LOCAL_NAME(Action::GroupRemove,"Remove Group");
+ACTION_SET_NAME(Action::GroupRemove,"GroupRemove");
+ACTION_SET_LOCAL_NAME(Action::GroupRemove,N_("Remove Group"));
 ACTION_SET_TASK(Action::GroupRemove,"remove");
 ACTION_SET_CATEGORY(Action::GroupRemove,Action::CATEGORY_GROUP);
 ACTION_SET_PRIORITY(Action::GroupRemove,0);
 ACTION_SET_VERSION(Action::GroupRemove,"0.0");
-ACTION_SET_CVS_ID(Action::GroupRemove,"$Id: groupremove.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $");
+ACTION_SET_CVS_ID(Action::GroupRemove,"$Id$");
 
 /* === G L O B A L S ======================================================= */
 
@@ -64,22 +67,22 @@ Action::ParamVocab
 Action::GroupRemove::get_param_vocab()
 {
 	ParamVocab ret(Action::CanvasSpecific::get_param_vocab());
-	
+
 	ret.push_back(ParamDesc("group",Param::TYPE_STRING)
 		.set_local_name(_("Group"))
 		.set_desc(_("Name of the Group to remove"))
 	);
-	
+
 	return ret;
 }
 
 bool
-Action::GroupRemove::is_canidate(const ParamList &x)
+Action::GroupRemove::is_candidate(const ParamList &x)
 {
-	bool ret(canidate_check(get_param_vocab(),x));
+	bool ret(candidate_check(get_param_vocab(),x));
 	if(!ret)
 	{
-		synfig::info("Action::GroupRemove::is_canidate(): failed canidate check");
+		synfig::info("Action::GroupRemove::is_candidate(): failed candidate check");
 		ParamList::const_iterator iter;
 		for(iter=x.begin();iter!=x.end();++iter)
 		{
@@ -95,7 +98,7 @@ Action::GroupRemove::set_param(const synfig::String& name, const Action::Param &
 	if(name=="group" && param.get_type()==Param::TYPE_STRING)
 	{
 		group=param.get_string();
-		
+
 		return true;
 	}
 
@@ -114,7 +117,7 @@ void
 Action::GroupRemove::perform()
 {
 	layer_list=get_canvas()->get_layers_in_group(group);
-	
+
 	std::set<synfig::Layer::Handle>::iterator iter;
 	for(iter=layer_list.begin();iter!=layer_list.end();++iter)
 	{