X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Flayerremove.cpp;h=d10e8386724541e4d220bb1c63084233911941b1;hb=4ba22fb51d97f1ecce04dcc5e40569a4354c1bae;hp=6ca5e8aba3c04722e807fd40f20531a18133b61a;hpb=71f558fb16eaaacd692807b902429e6a249c1540;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerremove.cpp b/synfig-studio/trunk/src/synfigapp/actions/layerremove.cpp
index 6ca5e8a..d10e838 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/layerremove.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/layerremove.cpp
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2008 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_NO_GET_LOCAL_NAME(Action::LayerRemove);
-ACTION_SET_NAME(Action::LayerRemove,"layer_remove");
+ACTION_SET_NAME(Action::LayerRemove,"LayerRemove");
 ACTION_SET_LOCAL_NAME(Action::LayerRemove,N_("Remove Layer"));
 ACTION_SET_TASK(Action::LayerRemove,"remove");
 ACTION_SET_CATEGORY(Action::LayerRemove,Action::CATEGORY_LAYER);
@@ -66,24 +67,7 @@ Action::LayerRemove::LayerRemove()
 synfig::String
 Action::LayerRemove::get_local_name()const
 {
-	String ret;
-
-	if (layer_list.empty())
-		return _("Remove Layer");
-
-	ret = strprintf("%s '%s'",
-					(layer_list.size() == 1
-					 ? _("Remove Layer")
-					 : _("Remove Layers")),
-					(layer_list.begin()->first->get_description().empty()
-					 ? layer_list.begin()->first->get_local_name()
-					 : layer_list.begin()->first->get_description()).c_str());
-
-	for(std::list<std::pair<synfig::Layer::Handle,int> >::const_iterator iter=++layer_list.begin(); iter!=layer_list.end(); ++iter)
-		ret += strprintf(", '%s'", (iter->first->get_description().empty()
-									? iter->first->get_local_name()
-									: iter->first->get_description()).c_str());
-	return ret;
+	return get_layer_descriptions(layer_list, _("Remove Layer"), _("Remove Layers"));
 }
 
 Action::ParamVocab