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

diff --git a/synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp b/synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp
index 7e29845..c7fbc30 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp
@@ -2,10 +2,11 @@
 /*!	\file layeractivate.cpp
 **	\brief Template File
 **
-**	$Id: layeractivate.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
@@ -32,6 +33,8 @@
 #include "layeractivate.h"
 #include <synfigapp/canvasinterface.h>
 
+#include <synfigapp/general.h>
+
 #endif
 
 using namespace std;
@@ -41,18 +44,15 @@ using namespace synfigapp;
 using namespace Action;
 
 /* === M A C R O S ========================================================= */
-#define ACTION_INIT2(class) \
-	Action::Base* class::create() { return new class(); }	\
-	synfig::String class::get_name()const { return name__; }	
 
-ACTION_INIT2(Action::LayerActivate);
+ACTION_INIT_NO_GET_LOCAL_NAME(Action::LayerActivate);
 ACTION_SET_NAME(Action::LayerActivate,"layer_activate");
-ACTION_SET_LOCAL_NAME(Action::LayerActivate,_("Activate Layer"));
+ACTION_SET_LOCAL_NAME(Action::LayerActivate,N_("Activate Layer"));
 ACTION_SET_TASK(Action::LayerActivate,"activate");
 ACTION_SET_CATEGORY(Action::LayerActivate,Action::CATEGORY_LAYER);
 ACTION_SET_PRIORITY(Action::LayerActivate,0);
 ACTION_SET_VERSION(Action::LayerActivate,"0.0");
-ACTION_SET_CVS_ID(Action::LayerActivate,"$Id: layeractivate.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $");
+ACTION_SET_CVS_ID(Action::LayerActivate,"$Id$");
 
 /* === G L O B A L S ======================================================= */
 
@@ -69,20 +69,19 @@ Action::LayerActivate::get_local_name()const
 {
 	if(!layer)
 		return _("Activate Layer");
-	String name;
-	if(layer->get_description().empty())
-		name=layer->get_local_name();
-	else
-		name=layer->get_description();
 
-	return (new_status?_("Activate "):_("Deactivate "))+name;
+	return strprintf("%s '%s'",
+					 new_status
+					 ? _("Activate Layer")
+					 : _("Deactivate Layer"),
+					 layer->get_non_empty_description().c_str());
 }
 
 Action::ParamVocab
 Action::LayerActivate::get_param_vocab()
 {
 	ParamVocab ret(Action::CanvasSpecific::get_param_vocab());
-	
+
 	ret.push_back(ParamDesc("layer",Param::TYPE_LAYER)
 		.set_local_name(_("Layer"))
 	);
@@ -91,7 +90,7 @@ Action::LayerActivate::get_param_vocab()
 		.set_local_name(_("New Status"))
 		.set_desc(_("The new status of the layer"))
 	);
-	
+
 	return ret;
 }
 
@@ -107,14 +106,14 @@ Action::LayerActivate::set_param(const synfig::String& name, const Action::Param
 	if(name=="layer" && param.get_type()==Param::TYPE_LAYER)
 	{
 		layer=param.get_layer();
-		
+
 		return true;
 	}
 
 	if(name=="new_status" && param.get_type()==Param::TYPE_BOOL)
 	{
 		new_status=param.get_bool();
-		
+
 		return true;
 	}
 
@@ -133,10 +132,10 @@ void
 Action::LayerActivate::perform()
 {
 	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."));
@@ -147,9 +146,9 @@ Action::LayerActivate::perform()
 	//if(get_canvas()!=subcanvas && !subcanvas->is_inline())
 	//if(get_canvas()->get_root()!=subcanvas->get_root())
 	//	throw Error(_("This layer doesn't belong to this composition"));
-	
+
 	old_status=layer->active();
-	
+
 	// If we are changing the status to what it already is,
 	// the go ahead and return
 	if(new_status==old_status)
@@ -159,7 +158,7 @@ Action::LayerActivate::perform()
 	}
 	else
 		set_dirty();
-	
+
 	if(new_status)
 		layer->enable();
 	else
@@ -190,7 +189,7 @@ Action::LayerActivate::undo()
 		layer->enable();
 	else
 		layer->disable();
-	
+
 	if(get_canvas_interface())
 	{
 		get_canvas_interface()->signal_layer_status_changed()(layer,old_status);