Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkconnect.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkconnect.cpp
index 8f1e9e1..3f3c34b 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkconnect.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkconnect.cpp
@@ -2,19 +2,20 @@
 /*!    \file valuenodelinkconnect.cpp
 **     \brief Template File
 **
-**     $Id: valuenodelinkconnect.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $
+**     $Id$
 **
 **     \legal
-**     Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**     This software and associated documentation
-**     are CONFIDENTIAL and PROPRIETARY property of
-**     the above-mentioned copyright holder.
+**     This package is free software; you can redistribute it and/or
+**     modify it under the terms of the GNU General Public License as
+**     published by the Free Software Foundation; either version 2 of
+**     the License, or (at your option) any later version.
 **
-**     You may not copy, print, publish, or in any
-**     other way distribute this software without
-**     a prior written agreement with
-**     the copyright holder.
+**     This package is distributed in the hope that it will be useful,
+**     but WITHOUT ANY WARRANTY; without even the implied warranty of
+**     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**     General Public License for more details.
 **     \endlegal
 */
 /* ========================================================================= */
@@ -31,6 +32,8 @@
 #include "valuenodelinkconnect.h"
 #include <synfigapp/canvasinterface.h>
 
+#include <synfigapp/general.h>
+
 #endif
 
 using namespace std;
@@ -42,13 +45,13 @@ using namespace Action;
 /* === M A C R O S ========================================================= */
 
 ACTION_INIT(Action::ValueNodeLinkConnect);
-ACTION_SET_NAME(Action::ValueNodeLinkConnect,"value_node_link_connect");
-ACTION_SET_LOCAL_NAME(Action::ValueNodeLinkConnect,_("Connect ValueNode Link"));
+ACTION_SET_NAME(Action::ValueNodeLinkConnect,"ValueNodeLinkConnect");
+ACTION_SET_LOCAL_NAME(Action::ValueNodeLinkConnect,N_("Connect ValueNode Link"));
 ACTION_SET_TASK(Action::ValueNodeLinkConnect,"connect");
 ACTION_SET_CATEGORY(Action::ValueNodeLinkConnect,Action::CATEGORY_LAYER|Action::CATEGORY_VALUENODE);
 ACTION_SET_PRIORITY(Action::ValueNodeLinkConnect,0);
 ACTION_SET_VERSION(Action::ValueNodeLinkConnect,"0.0");
-ACTION_SET_CVS_ID(Action::ValueNodeLinkConnect,"$Id: valuenodelinkconnect.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $");
+ACTION_SET_CVS_ID(Action::ValueNodeLinkConnect,"$Id$");
 
 /* === G L O B A L S ======================================================= */
 
@@ -65,7 +68,7 @@ Action::ParamVocab
 Action::ValueNodeLinkConnect::get_param_vocab()
 {
        ParamVocab ret(Action::CanvasSpecific::get_param_vocab());
-       
+
        ret.push_back(ParamDesc("parent_value_node",Param::TYPE_VALUENODE)
                .set_local_name(_("Parent ValueNode"))
        );
@@ -82,9 +85,9 @@ Action::ValueNodeLinkConnect::get_param_vocab()
 }
 
 bool
-Action::ValueNodeLinkConnect::is_canidate(const ParamList &x)
+Action::ValueNodeLinkConnect::is_candidate(const ParamList &x)
 {
-       return canidate_check(get_param_vocab(),x);
+       return candidate_check(get_param_vocab(),x);
 }
 
 bool
@@ -93,21 +96,21 @@ Action::ValueNodeLinkConnect::set_param(const synfig::String& name, const Action
        if(name=="parent_value_node" && param.get_type()==Param::TYPE_VALUENODE)
        {
                parent_value_node=LinkableValueNode::Handle::cast_dynamic(param.get_value_node());
-               
+
                return static_cast<bool>(parent_value_node);
        }
 
        if(name=="value_node" && param.get_type()==Param::TYPE_VALUENODE)
        {
                new_value_node=param.get_value_node();
-               
+
                return true;
        }
 
        if(name=="index" && param.get_type()==Param::TYPE_INTEGER)
        {
                index=param.get_integer();
-               
+
                return true;
        }
 
@@ -126,15 +129,15 @@ void
 Action::ValueNodeLinkConnect::perform()
 {
        if(parent_value_node->link_count()<=index)
-               throw Error(_("Bad index, too big. LinkCount=%d, Index=%d"),parent_value_node->link_count(),index);             
-               
+               throw Error(_("Bad index, too big. LinkCount=%d, Index=%d"),parent_value_node->link_count(),index);
+
        old_value_node=parent_value_node->get_link(index);
 
        if(!parent_value_node->set_link(index,new_value_node))
                throw Error(_("Parent would not accept link"));
-       
+
        /*set_dirty(true);
-       
+
        if(get_canvas_interface())
        {
                get_canvas_interface()->signal_value_node_changed()(parent_value_node);
@@ -145,13 +148,13 @@ void
 Action::ValueNodeLinkConnect::undo()
 {
        if(parent_value_node->link_count()<=index)
-               throw Error(_("Bad index, too big. LinkCount=%d, Index=%d"),parent_value_node->link_count(),index);             
-               
+               throw Error(_("Bad index, too big. LinkCount=%d, Index=%d"),parent_value_node->link_count(),index);
+
        if(!parent_value_node->set_link(index,old_value_node))
                throw Error(_("Parent would not accept old link"));
-       
+
        /*set_dirty(true);
-       
+
        if(get_canvas_interface())
        {
                get_canvas_interface()->signal_value_node_changed()(parent_value_node);