X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Flayerraise.cpp;h=ef163695f59c57c31f8dbc43086392cc7ad843ec;hb=756c0d29ac1742f231e6615f9a577e574e35a4af;hp=1efbb8ee9eb986e6a8e0f6bd462589637dc4b162;hpb=dee84efa006428fdfbf0e84b66ee94eb23113ad9;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerraise.cpp b/synfig-studio/trunk/src/synfigapp/actions/layerraise.cpp
index 1efbb8e..ef16369 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/layerraise.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/layerraise.cpp
@@ -2,10 +2,11 @@
 /*!	\file layerraise.cpp
 **	\brief Template File
 **
-**	$Id: layerraise.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $
+**	$Id$
 **
 **	\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
@@ -33,6 +34,8 @@
 #include "layermove.h"
 #include <synfigapp/canvasinterface.h>
 
+#include <synfigapp/general.h>
+
 #endif
 
 using namespace std;
@@ -43,14 +46,14 @@ using namespace Action;
 
 /* === M A C R O S ========================================================= */
 
-ACTION_INIT(Action::LayerRaise);
+ACTION_INIT_NO_GET_LOCAL_NAME(Action::LayerRaise);
 ACTION_SET_NAME(Action::LayerRaise,"layer_raise");
-ACTION_SET_LOCAL_NAME(Action::LayerRaise,"Raise Layer");
+ACTION_SET_LOCAL_NAME(Action::LayerRaise,N_("Raise Layer"));
 ACTION_SET_TASK(Action::LayerRaise,"raise");
 ACTION_SET_CATEGORY(Action::LayerRaise,Action::CATEGORY_LAYER);
 ACTION_SET_PRIORITY(Action::LayerRaise,9);
 ACTION_SET_VERSION(Action::LayerRaise,"0.0");
-ACTION_SET_CVS_ID(Action::LayerRaise,"$Id: layerraise.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $");
+ACTION_SET_CVS_ID(Action::LayerRaise,"$Id$");
 
 /* === G L O B A L S ======================================================= */
 
@@ -62,17 +65,23 @@ Action::LayerRaise::LayerRaise()
 {
 }
 
+synfig::String
+Action::LayerRaise::get_local_name()const
+{
+	return get_layer_descriptions(layers, _("Raise Layer"), _("Raise Layers"));
+}
+
 Action::ParamVocab
 Action::LayerRaise::get_param_vocab()
 {
 	ParamVocab ret(Action::CanvasSpecific::get_param_vocab());
-	
+
 	ret.push_back(ParamDesc("layer",Param::TYPE_LAYER)
 		.set_local_name(_("Layer"))
 		.set_desc(_("Layer to be raised"))
 		.set_supports_multiple()
 	);
-	
+
 	return ret;
 }
 
@@ -92,7 +101,7 @@ Action::LayerRaise::set_param(const synfig::String& name, const Action::Param &p
 	if(name=="layer" && param.get_type()==Param::TYPE_LAYER)
 	{
 		layers.push_back(param.get_layer());
-		
+
 		return true;
 	}
 
@@ -113,40 +122,40 @@ Action::LayerRaise::prepare()
 	std::list<synfig::Layer::Handle>::reverse_iterator iter;
 
 	clear();
-	
+
 	for(iter=layers.rbegin();!(iter==layers.rend());++iter)
 	{
 		Layer::Handle layer(*iter);
-		
+
 		Canvas::Handle subcanvas(layer->get_canvas());
-		
+
 		// Find the iterator for the layer
 		Canvas::iterator iter=find(subcanvas->begin(),subcanvas->end(),layer);
-		
+
 		// If we couldn't find the layer in the canvas, then bail
 		if(*iter!=layer)
 			throw Error(_("This layer doesn't exist anymore."));
-	
+
 		// If the subcanvas isn't the same as the canvas,
 		// then it had better be an inline canvas. If not,
 		// bail
 		//if(get_canvas()!=subcanvas && !subcanvas->is_inline())
 		//	throw Error(_("This layer doesn't belong to this canvas anymore"));
-		
+
 		int new_index=iter-subcanvas->begin();
-		
+
 		if(new_index==0)
 			continue;
-		
+
 		new_index--;
-		
+
 		Action::Handle layer_move(LayerMove::create());
-		
+
 		layer_move->set_param("canvas",get_canvas());
 		layer_move->set_param("canvas_interface",get_canvas_interface());
 		layer_move->set_param("layer",layer);
 		layer_move->set_param("new_index",new_index);
-		
+
 		add_action_front(layer_move);
 	}
 }