Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointremove.cpp b/synfig-studio/trunk/src/synfigapp/actions/activepointremove.cpp
index bff1bd9..13812d4 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/actions/activepointremove.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/activepointremove.cpp
@@ -2,19 +2,21 @@
 /*!    \file activepointremove.cpp
 **     \brief Template File
 **
-**     $Id: activepointremove.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
+**  Copyright (c) 2008 Chris Moore
 **
-**     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 +33,8 @@
 #include "activepointremove.h"
 #include <synfigapp/canvasinterface.h>
 
+#include <synfigapp/general.h>
+
 #endif
 
 using namespace std;
@@ -42,13 +46,13 @@ using namespace Action;
 /* === M A C R O S ========================================================= */
 
 ACTION_INIT(Action::ActivepointRemove);
-ACTION_SET_NAME(Action::ActivepointRemove,"activepoint_remove");
-ACTION_SET_LOCAL_NAME(Action::ActivepointRemove,"Remove Activepoint");
+ACTION_SET_NAME(Action::ActivepointRemove,"ActivepointRemove");
+ACTION_SET_LOCAL_NAME(Action::ActivepointRemove,N_("Remove Activepoint"));
 ACTION_SET_TASK(Action::ActivepointRemove,"remove");
 ACTION_SET_CATEGORY(Action::ActivepointRemove,Action::CATEGORY_ACTIVEPOINT);
 ACTION_SET_PRIORITY(Action::ActivepointRemove,0);
 ACTION_SET_VERSION(Action::ActivepointRemove,"0.0");
-ACTION_SET_CVS_ID(Action::ActivepointRemove,"$Id: activepointremove.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $");
+ACTION_SET_CVS_ID(Action::ActivepointRemove,"$Id$");
 
 /* === G L O B A L S ======================================================= */
 
@@ -66,7 +70,7 @@ Action::ParamVocab
 Action::ActivepointRemove::get_param_vocab()
 {
        ParamVocab ret(Action::CanvasSpecific::get_param_vocab());
-       
+
        ret.push_back(ParamDesc("value_desc",Param::TYPE_VALUEDESC)
                .set_local_name(_("ValueDesc"))
        );
@@ -80,17 +84,16 @@ Action::ActivepointRemove::get_param_vocab()
 }
 
 bool
-Action::ActivepointRemove::is_canidate(const ParamList &x)
+Action::ActivepointRemove::is_candidate(const ParamList &x)
 {
-       if(canidate_check(get_param_vocab(),x))
-       {
-               ValueDesc value_desc(x.find("value_desc")->second.get_value_desc());
-               if(!value_desc.parent_is_value_node() || !ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_parent_value_node()))
-                       return false;
+       if (!candidate_check(get_param_vocab(),x))
+               return false;
 
-               return true;
-       }
-       return false;
+       ValueDesc value_desc(x.find("value_desc")->second.get_value_desc());
+
+       return (value_desc.parent_is_value_node() &&
+                       // We need a dynamic list.
+                       ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_parent_value_node()));
 }
 
 bool
@@ -99,23 +102,23 @@ Action::ActivepointRemove::set_param(const synfig::String& name, const Action::P
        if(name=="value_desc" && param.get_type()==Param::TYPE_VALUEDESC)
        {
                ValueDesc value_desc(param.get_value_desc());
-               
+
                if(!value_desc.parent_is_value_node())
                        return false;
-               
+
                value_node=ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_parent_value_node());
-               
+
                if(!value_node)
                        return false;
-               
+
                index=value_desc.get_index();
-               
+
                return true;
        }
        if(name=="activepoint" && param.get_type()==Param::TYPE_ACTIVEPOINT)
        {
                activepoint=param.get_activepoint();
-               
+
                return true;
        }
 
@@ -132,18 +135,18 @@ Action::ActivepointRemove::is_ready()const
 
 void
 Action::ActivepointRemove::perform()
-{      
+{
        ValueNode_DynamicList::ListEntry::ActivepointList::iterator iter;
-       
+
        try { iter=value_node->list[index].find(activepoint); }
        catch(synfig::Exception::NotFound)
        {
                throw Error(_("Unable to find activepoint"));
-       }       
+       }
 
        value_node->list[index].erase(activepoint);
        value_node->changed();
-       
+
        /*
        // Signal that a layer has been inserted
        if(get_canvas_interface())
@@ -158,11 +161,11 @@ void
 Action::ActivepointRemove::undo()
 {
        try { value_node->list[index].find(activepoint.get_time()); throw Error(_("A Activepoint already exists at this point in time"));}
-       catch(synfig::Exception::NotFound) { }  
+       catch(synfig::Exception::NotFound) { }
 
        try { if(value_node->list[index].find(activepoint)!=value_node->list[index].timing_info.end()) throw Error(_("This activepoint is already in the ValueNode"));}
-       catch(synfig::Exception::NotFound) { }  
-       
+       catch(synfig::Exception::NotFound) { }
+
        value_node->list[index].add(activepoint);
        value_node->changed();
        /*