Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-studio/trunk/src/synfigapp/actions/layersetdesc.cpp b/synfig-studio/trunk/src/synfigapp/actions/layersetdesc.cpp
index 6e42333..d62ec6f 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/actions/layersetdesc.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/layersetdesc.cpp
@@ -2,10 +2,11 @@
 /*!    \file layersetdesc.cpp
 **     \brief Template File
 **
-**     $Id: layersetdesc.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 "layersetdesc.h"
 #include <synfigapp/canvasinterface.h>
 
+#include <synfigapp/general.h>
+
 #endif
 
 using namespace std;
@@ -42,14 +45,14 @@ using namespace Action;
 
 /* === M A C R O S ========================================================= */
 
-ACTION_INIT(Action::LayerSetDesc);
-ACTION_SET_NAME(Action::LayerSetDesc,"layer_set_desc");
-ACTION_SET_LOCAL_NAME(Action::LayerSetDesc,_("Set Layer Description"));
+ACTION_INIT_NO_GET_LOCAL_NAME(Action::LayerSetDesc);
+ACTION_SET_NAME(Action::LayerSetDesc,"LayerSetDesc");
+ACTION_SET_LOCAL_NAME(Action::LayerSetDesc,N_("Set Layer Description"));
 ACTION_SET_TASK(Action::LayerSetDesc,"set_desc");
 ACTION_SET_CATEGORY(Action::LayerSetDesc,Action::CATEGORY_LAYER);
 ACTION_SET_PRIORITY(Action::LayerSetDesc,0);
 ACTION_SET_VERSION(Action::LayerSetDesc,"0.0");
-ACTION_SET_CVS_ID(Action::LayerSetDesc,"$Id: layersetdesc.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $");
+ACTION_SET_CVS_ID(Action::LayerSetDesc,"$Id$");
 
 /* === G L O B A L S ======================================================= */
 
@@ -63,11 +66,21 @@ Action::LayerSetDesc::LayerSetDesc()
 {
 }
 
+synfig::String
+Action::LayerSetDesc::get_local_name()const
+{
+       return strprintf("%s: '%s' -> '%s'",
+                                        _("Set Layer Description"),
+                                        /* TRANSLATORS: this is the string used in the history dialog when renaming a layer to/from its default name */
+                                        old_description.empty() ? _("[default]") : old_description.c_str(),
+                                        new_description.empty() ? _("[default]") : new_description.c_str());
+}
+
 Action::ParamVocab
 Action::LayerSetDesc::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 moved"))
@@ -78,14 +91,14 @@ Action::LayerSetDesc::get_param_vocab()
                .set_local_name(_("Enter a new description for this layer"))
                .set_user_supplied()
        );
-       
+
        return ret;
 }
 
 bool
-Action::LayerSetDesc::is_canidate(const ParamList &x)
+Action::LayerSetDesc::is_candidate(const ParamList &x)
 {
-       return canidate_check(get_param_vocab(),x);
+       return candidate_check(get_param_vocab(),x);
 }
 
 bool
@@ -94,14 +107,14 @@ Action::LayerSetDesc::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_description" && param.get_type()==Param::TYPE_STRING)
        {
                new_description=param.get_string();
-               
+
                return true;
        }