Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerparamconnect.cpp b/synfig-studio/trunk/src/synfigapp/actions/layerparamconnect.cpp
index 00ebfb1..a358079 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/actions/layerparamconnect.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/layerparamconnect.cpp
@@ -2,7 +2,7 @@
 /*!    \file layerparamconnect.cpp
 **     \brief Template File
 **
-**     $Id: layerparamconnect.cpp,v 1.2 2005/01/16 19:55:57 darco Exp $
+**     $Id$
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@ -32,6 +32,8 @@
 #include "layerparamconnect.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::LayerParamConnect);
-ACTION_SET_NAME(Action::LayerParamConnect,"layer_param_connect");
-ACTION_SET_LOCAL_NAME(Action::LayerParamConnect,_("Connect Layer Parameter"));
+ACTION_SET_NAME(Action::LayerParamConnect,"LayerParamConnect");
+ACTION_SET_LOCAL_NAME(Action::LayerParamConnect,N_("Connect Layer Parameter"));
 ACTION_SET_TASK(Action::LayerParamConnect,"connect");
 ACTION_SET_CATEGORY(Action::LayerParamConnect,Action::CATEGORY_LAYER|Action::CATEGORY_VALUENODE);
 ACTION_SET_PRIORITY(Action::LayerParamConnect,0);
 ACTION_SET_VERSION(Action::LayerParamConnect,"0.0");
-ACTION_SET_CVS_ID(Action::LayerParamConnect,"$Id: layerparamconnect.cpp,v 1.2 2005/01/16 19:55:57 darco Exp $");
+ACTION_SET_CVS_ID(Action::LayerParamConnect,"$Id$");
 
 /* === G L O B A L S ======================================================= */
 
@@ -65,7 +67,7 @@ Action::ParamVocab
 Action::LayerParamConnect::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::LayerParamConnect::get_param_vocab()
        ret.push_back(ParamDesc("value_node",Param::TYPE_VALUENODE)
                .set_local_name(_("ValueNode"))
        );
-       
+
        return ret;
 }
 
 bool
-Action::LayerParamConnect::is_canidate(const ParamList &x)
+Action::LayerParamConnect::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::LayerParamConnect::set_param(const synfig::String& name, const Action::P
        if(name=="layer" && param.get_type()==Param::TYPE_LAYER)
        {
                layer=param.get_layer();
-               
+
                return true;
        }
 
        if(name=="value_node" && param.get_type()==Param::TYPE_VALUENODE)
        {
                value_node=param.get_value_node();
-               
+
                return true;
        }
 
        if(name=="param" && param.get_type()==Param::TYPE_STRING)
        {
                param_name=param.get_string();
-               
+
                return true;
        }
 
@@ -123,7 +125,7 @@ Action::LayerParamConnect::is_ready()const
                synfig::warning("Action::LayerParamConnect: Missing \"value_node\"");
        if(param_name.empty())
                synfig::warning("Action::LayerParamConnect: Missing \"param\"");
-       
+
        if(!layer || !value_node || param_name.empty())
                return false;
        return Action::CanvasSpecific::is_ready();
@@ -142,11 +144,11 @@ Action::LayerParamConnect::perform()
 
        old_value=layer->get_param(param_name);
        if(!old_value.is_valid())
-               throw Error(_("Layer did not recognise parameter name"));               
+               throw Error(_("Layer did not recognize parameter name"));
 
        if(!layer->set_param(param_name,(*value_node)(0)))
                throw Error(_("Bad connection"));
-       
+
        layer->connect_dynamic_param(param_name,value_node);
 
        layer->changed();
@@ -169,7 +171,7 @@ Action::LayerParamConnect::undo()
                layer->disconnect_dynamic_param(param_name);
                layer->set_param(param_name,old_value);
        }
-       
+
        layer->changed();
        if(old_value_node)
                old_value_node->changed();
@@ -179,7 +181,7 @@ Action::LayerParamConnect::undo()
        else
                set_dirty(false);
        */
-       
+
        if(get_canvas_interface())
        {
                get_canvas_interface()->signal_layer_param_changed()(layer,param_name);