X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fgroupremovelayers.cpp;h=dc2140c1ad96f155fc89ce474771f9d2ddaed64c;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=11bbe18271928d3d443789d187030df093423b01;hpb=8ef042c40521681cea99944097c4f90a5ac6cf74;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/groupremovelayers.cpp b/synfig-studio/trunk/src/synfigapp/actions/groupremovelayers.cpp
index 11bbe18..dc2140c 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/groupremovelayers.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/groupremovelayers.cpp
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -45,7 +46,7 @@ using namespace Action;
 /* === M A C R O S ========================================================= */
 
 ACTION_INIT(Action::GroupRemoveLayers);
-ACTION_SET_NAME(Action::GroupRemoveLayers,"group_remove_layers");
+ACTION_SET_NAME(Action::GroupRemoveLayers,"GroupRemoveLayers");
 ACTION_SET_LOCAL_NAME(Action::GroupRemoveLayers,N_("Remove Layers from a Group"));
 ACTION_SET_TASK(Action::GroupRemoveLayers,"remove");
 ACTION_SET_CATEGORY(Action::GroupRemoveLayers,Action::CATEGORY_LAYER|Action::CATEGORY_GROUP);
@@ -70,16 +71,10 @@ Action::GroupRemoveLayers::get_param_vocab()
 
 	ret.push_back(ParamDesc("layer",Param::TYPE_LAYER)
 		.set_local_name(_("Layer"))
-		.set_desc(_("Layer to be added to group"))
+		.set_desc(_("Layer to be removed from group"))
 		.set_supports_multiple()
 	);
 
-	ret.push_back(ParamDesc("group",Param::TYPE_STRING)
-		.set_local_name(_("Group"))
-		.set_desc(_("Name of the Group to add the Layers to"))
-		.set_user_supplied()
-	);
-
 	return ret;
 }
 
@@ -101,20 +96,13 @@ Action::GroupRemoveLayers::set_param(const synfig::String& name, const Action::P
 		return true;
 	}
 
-	if(name=="group" && param.get_type()==Param::TYPE_STRING)
-	{
-		group=param.get_string();
-
-		return true;
-	}
-
 	return Action::CanvasSpecific::set_param(name,param);
 }
 
 bool
 Action::GroupRemoveLayers::is_ready()const
 {
-	if(layer_list.empty() || group.empty())
+	if(layer_list.empty())
 		return false;
 	return Action::CanvasSpecific::is_ready();
 }
@@ -126,9 +114,7 @@ Action::GroupRemoveLayers::perform()
 	for(iter=layer_list.begin();iter!=layer_list.end();++iter)
 	{
 		Layer::Handle layer(iter->first);
-		iter->second=layer->get_group();
-
-		layer->remove_from_group(group);
+		layer->remove_from_group(iter->second=layer->get_group());
 	}
 }