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

diff --git a/synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp b/synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp
index a051e01..c7fbc30 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/layeractivate.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
@@ -43,11 +44,8 @@ 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,N_("Activate Layer"));
 ACTION_SET_TASK(Action::LayerActivate,"activate");
@@ -71,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