When encapsulating layers, show which layers were encapsulated in the History dialog.

[synfig.git] / synfig-studio / trunk / src / synfigapp / actions / layeractivate.cpp

diff --git a/synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp b/synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp
index a051e01..948bc6f 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp
@@ -43,11 +43,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 +68,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