Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerparamdisconnect.cpp b/synfig-studio/trunk/src/synfigapp/actions/layerparamdisconnect.cpp
index d993ea3..8c3dc8f 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/actions/layerparamdisconnect.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/layerparamdisconnect.cpp
@@ -2,19 +2,20 @@
 /*!    \file layerparamdisconnect.cpp
 **     \brief Template File
 **
-**     $Id: layerparamdisconnect.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
 */
 /* ========================================================================= */
@@ -32,6 +33,8 @@
 #include <synfigapp/canvasinterface.h>
 #include <synfig/valuenode_dynamiclist.h>
 
+#include <synfigapp/general.h>
+
 #endif
 
 using namespace std;
@@ -43,13 +46,13 @@ using namespace Action;
 /* === M A C R O S ========================================================= */
 
 ACTION_INIT(Action::LayerParamDisconnect);
-ACTION_SET_NAME(Action::LayerParamDisconnect,"layer_param_disconnect");
-ACTION_SET_LOCAL_NAME(Action::LayerParamDisconnect,_("Disconnect Layer Parameter"));
+ACTION_SET_NAME(Action::LayerParamDisconnect,"LayerParamDisconnect");
+ACTION_SET_LOCAL_NAME(Action::LayerParamDisconnect,N_("Disconnect Layer Parameter"));
 ACTION_SET_TASK(Action::LayerParamDisconnect,"disconnect");
 ACTION_SET_CATEGORY(Action::LayerParamDisconnect,Action::CATEGORY_LAYER|Action::CATEGORY_VALUENODE);
 ACTION_SET_PRIORITY(Action::LayerParamDisconnect,0);
 ACTION_SET_VERSION(Action::LayerParamDisconnect,"0.0");
-ACTION_SET_CVS_ID(Action::LayerParamDisconnect,"$Id: layerparamdisconnect.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $");
+ACTION_SET_CVS_ID(Action::LayerParamDisconnect,"$Id$");
 
 /* === G L O B A L S ======================================================= */
 
@@ -60,14 +63,14 @@ ACTION_SET_CVS_ID(Action::LayerParamDisconnect,"$Id: layerparamdisconnect.cpp,v
 Action::LayerParamDisconnect::LayerParamDisconnect():
        time(0)
 {
-       
+
 }
 
 Action::ParamVocab
 Action::LayerParamDisconnect::get_param_vocab()
 {
        ParamVocab ret(Action::CanvasSpecific::get_param_vocab());
-       
+
        ret.push_back(ParamDesc("layer",Param::TYPE_LAYER)
                .set_local_name(_("Layer"))
        );
@@ -80,14 +83,14 @@ Action::LayerParamDisconnect::get_param_vocab()
                .set_local_name(_("Time"))
                .set_optional()
        );
-       
+
        return ret;
 }
 
 bool
-Action::LayerParamDisconnect::is_canidate(const ParamList &x)
+Action::LayerParamDisconnect::is_candidate(const ParamList &x)
 {
-       return canidate_check(get_param_vocab(),x);
+       return candidate_check(get_param_vocab(),x);
 }
 
 bool
@@ -96,21 +99,21 @@ Action::LayerParamDisconnect::set_param(const synfig::String& name, const Action
        if(name=="layer" && param.get_type()==Param::TYPE_LAYER)
        {
                layer=param.get_layer();
-               
+
                return true;
        }
 
        if(name=="param" && param.get_type()==Param::TYPE_STRING)
        {
                param_name=param.get_string();
-               
+
                return true;
        }
 
        if(name=="time" && param.get_type()==Param::TYPE_TIME)
        {
                time=param.get_time();
-               
+
                return true;
        }
 
@@ -133,7 +136,7 @@ Action::LayerParamDisconnect::perform()
 
        old_value_node=layer->dynamic_param_list().find(param_name)->second;
        layer->disconnect_dynamic_param(param_name);
-       
+
        if(new_value_node || ValueNode_DynamicList::Handle::cast_dynamic(old_value_node))
        {
                if(!new_value_node)
@@ -142,12 +145,12 @@ Action::LayerParamDisconnect::perform()
        }
        else
                layer->set_param(param_name,(*old_value_node)(time));
-       
+
        layer->changed();
        old_value_node->changed();
 
        set_dirty(false);
-       
+
        if(get_canvas_interface())
        {
                get_canvas_interface()->signal_layer_param_changed()(layer,param_name);
@@ -158,7 +161,7 @@ void
 Action::LayerParamDisconnect::undo()
 {
        layer->connect_dynamic_param(param_name,old_value_node);
-       
+
 /*     if(layer->active() && get_canvas()->get_time()!=time)
                set_dirty(true);
        else