X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Flayeractivate.cpp;h=d41b36c4cf44e3e5104c63e027e7ce275265780e;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=e7f6ee1c310498442143766c1b23e884b6cd059f;hpb=c34eaa5441242b3e9a7b7645e9ee4983d14eae85;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp b/synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp
index e7f6ee1..d41b36c 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_SET_NAME(Action::LayerActivate,"layer_activate");
-ACTION_SET_LOCAL_NAME(Action::LayerActivate,_("Activate Layer"));
+ACTION_INIT_NO_GET_LOCAL_NAME(Action::LayerActivate);
+ACTION_SET_NAME(Action::LayerActivate,"LayerActivate");
+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,13 +69,12 @@ 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