Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerparamset.cpp b/synfig-studio/trunk/src/synfigapp/actions/layerparamset.cpp
index f249191..74ff99a 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/actions/layerparamset.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/layerparamset.cpp
@@ -2,7 +2,7 @@
 /*!    \file layerparamset.cpp
 **     \brief Template File
 **
-**     $Id: layerparamset.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
@@ -32,6 +32,8 @@
 #include "layerparamset.h"
 #include <synfigapp/canvasinterface.h>
 
+#include <synfigapp/general.h>
+
 #endif
 
 using namespace std;
@@ -43,13 +45,13 @@ using namespace Action;
 /* === M A C R O S ========================================================= */
 
 ACTION_INIT(Action::LayerParamSet);
-ACTION_SET_NAME(Action::LayerParamSet,"layer_param_set");
-ACTION_SET_LOCAL_NAME(Action::LayerParamSet,_("Set Layer Parameter"));
+ACTION_SET_NAME(Action::LayerParamSet,"LayerParamSet");
+ACTION_SET_LOCAL_NAME(Action::LayerParamSet,N_("Set Layer Parameter"));
 ACTION_SET_TASK(Action::LayerParamSet,"set");
 ACTION_SET_CATEGORY(Action::LayerParamSet,Action::CATEGORY_LAYER);
 ACTION_SET_PRIORITY(Action::LayerParamSet,0);
 ACTION_SET_VERSION(Action::LayerParamSet,"0.0");
-ACTION_SET_CVS_ID(Action::LayerParamSet,"$Id: layerparamset.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $");
+ACTION_SET_CVS_ID(Action::LayerParamSet,"$Id$");
 
 /* === G L O B A L S ======================================================= */
 
@@ -65,7 +67,7 @@ Action::ParamVocab
 Action::LayerParamSet::get_param_vocab()
 {
        ParamVocab ret(Action::CanvasSpecific::get_param_vocab());
-       
+
        ret.push_back(ParamDesc("layer",Param::TYPE_LAYER)
                .set_local_name(_("Layer"))
        );
@@ -77,14 +79,14 @@ Action::LayerParamSet::get_param_vocab()
        ret.push_back(ParamDesc("new_value",Param::TYPE_VALUE)
                .set_local_name(_("ValueBase"))
        );
-       
+
        return ret;
 }
 
 bool
-Action::LayerParamSet::is_canidate(const ParamList &x)
+Action::LayerParamSet::is_candidate(const ParamList &x)
 {
-       return canidate_check(get_param_vocab(),x);
+       return candidate_check(get_param_vocab(),x);
 }
 
 bool
@@ -93,21 +95,21 @@ Action::LayerParamSet::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_value" && param.get_type()==Param::TYPE_VALUE)
        {
                new_value=param.get_value();
-               
+
                return true;
        }
 
        if(name=="param" && param.get_type()==Param::TYPE_STRING)
        {
                param_name=param.get_string();
-               
+
                return true;
        }
 
@@ -130,7 +132,7 @@ Action::LayerParamSet::perform()
                throw Error(_("ValueNode attached to Parameter."));
 
        old_value=layer->get_param(param_name);
-       
+
        if(!layer->set_param(param_name,new_value))
                throw Error(_("Layer did not accept parameter."));
 
@@ -140,7 +142,7 @@ Action::LayerParamSet::perform()
                set_dirty(false);
        */
        layer->changed();
-       
+
        // Signal that a layer has been inserted
        if(get_canvas_interface())
        {
@@ -160,9 +162,9 @@ Action::LayerParamSet::undo()
        else
                set_dirty(false);
        */
-       
+
        layer->changed();
-       
+
        // Signal that a layer has been inserted
        if(get_canvas_interface())
        {