Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointadd.cpp b/synfig-studio/trunk/src/synfigapp/actions/activepointadd.cpp
index 68ee18a..812d094 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/actions/activepointadd.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/activepointadd.cpp
@@ -1,11 +1,12 @@
 /* === S Y N F I G ========================================================= */
-/*!    \file acitvepointadd.cpp
+/*!    \file activepointadd.cpp
 **     \brief Template File
 **
-**     $Id: activepointadd.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
+**  Copyright (c) 2008 Chris Moore
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -32,6 +33,8 @@
 #include "activepointadd.h"
 #include <synfigapp/canvasinterface.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::ActivepointAdd);
-ACTION_SET_NAME(Action::ActivepointAdd,"activepoint_add");
-ACTION_SET_LOCAL_NAME(Action::ActivepointAdd,"Add Activepoint");
+ACTION_SET_NAME(Action::ActivepointAdd,"ActivepointAdd");
+ACTION_SET_LOCAL_NAME(Action::ActivepointAdd,N_("Add Activepoint"));
 ACTION_SET_TASK(Action::ActivepointAdd,"add");
 ACTION_SET_CATEGORY(Action::ActivepointAdd,Action::CATEGORY_ACTIVEPOINT);
 ACTION_SET_PRIORITY(Action::ActivepointAdd,0);
 ACTION_SET_VERSION(Action::ActivepointAdd,"0.0");
-ACTION_SET_CVS_ID(Action::ActivepointAdd,"$Id: activepointadd.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $");
+ACTION_SET_CVS_ID(Action::ActivepointAdd,"$Id$");
 
 /* === G L O B A L S ======================================================= */
 
@@ -68,7 +71,7 @@ Action::ParamVocab
 Action::ActivepointAdd::get_param_vocab()
 {
        ParamVocab ret(Action::CanvasSpecific::get_param_vocab());
-       
+
        ret.push_back(ParamDesc("value_desc",Param::TYPE_VALUEDESC)
                .set_local_name(_("ValueDesc"))
        );
@@ -89,19 +92,18 @@ Action::ActivepointAdd::get_param_vocab()
 }
 
 bool
-Action::ActivepointAdd::is_canidate(const ParamList &x)
+Action::ActivepointAdd::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;
 
-               // We need either a activepoint or a time.
-               if(x.count("activepoint") || x.count("time"))
-                       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()) &&
+                       // We need either an activepoint or a time.
+                       (x.count("activepoint") || x.count("time")));
 }
 
 bool
@@ -110,26 +112,26 @@ Action::ActivepointAdd::set_param(const synfig::String& name, const Action::Para
        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();
-               
+
                if(time_set)
                        calc_activepoint();
-               
+
                return true;
        }
        if(name=="activepoint" && param.get_type()==Param::TYPE_ACTIVEPOINT && !time_set)
        {
                activepoint=param.get_activepoint();
-               
+
                return true;
        }
        if(name=="time" && param.get_type()==Param::TYPE_TIME && activepoint.get_time()==Time::begin()-1)
@@ -139,7 +141,7 @@ Action::ActivepointAdd::set_param(const synfig::String& name, const Action::Para
 
                if(value_node)
                        calc_activepoint();
-               
+
                return true;
        }
 
@@ -154,16 +156,16 @@ Action::ActivepointAdd::is_ready()const
        return Action::CanvasSpecific::is_ready();
 }
 
-// This function is called if a time is specified, but not 
+// This function is called if a time is specified, but not
 // a activepoint. In this case, we need to calculate the value
 // of the activepoint
 void
 Action::ActivepointAdd::calc_activepoint()
-{      
+{
        const Time time(activepoint.get_time());
        activepoint.set_state(value_node->list[index].status_at_time(time));
        activepoint.set_priority(0);
-       
+
        // In this case, nothing is really changing, so there will be
        // no need to redraw the window
        set_dirty(false);
@@ -171,16 +173,16 @@ Action::ActivepointAdd::calc_activepoint()
 
 void
 Action::ActivepointAdd::perform()
-{      
+{
        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();
-       
+
        /*if(get_canvas_interface())
        {
                get_canvas_interface()->signal_value_node_changed()(value_node);