Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsert.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsert.cpp
index 92203ec..b4c0e20 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsert.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsert.cpp
@@ -2,10 +2,11 @@
 /*!    \file valuenodedynamiclistinsert.cpp
 **     \brief Template File
 **
-**     $Id: valuenodedynamiclistinsert.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 "valuenodedynamiclistinsert.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::ValueNodeDynamicListInsert);
-ACTION_SET_NAME(Action::ValueNodeDynamicListInsert,"value_node_dynamic_list_insert");
-ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListInsert,"Insert Item");
+ACTION_SET_NAME(Action::ValueNodeDynamicListInsert,"ValueNodeDynamicListInsert");
+ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListInsert,N_("Insert Item"));
 ACTION_SET_TASK(Action::ValueNodeDynamicListInsert,"insert");
 ACTION_SET_CATEGORY(Action::ValueNodeDynamicListInsert,Action::CATEGORY_VALUEDESC|Action::CATEGORY_VALUENODE|Action::CATEGORY_HIDDEN);
 ACTION_SET_PRIORITY(Action::ValueNodeDynamicListInsert,-20);
 ACTION_SET_VERSION(Action::ValueNodeDynamicListInsert,"0.0");
-ACTION_SET_CVS_ID(Action::ValueNodeDynamicListInsert,"$Id: valuenodedynamiclistinsert.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $");
+ACTION_SET_CVS_ID(Action::ValueNodeDynamicListInsert,"$Id$");
 
 /* === G L O B A L S ======================================================= */
 
@@ -69,7 +72,7 @@ Action::ParamVocab
 Action::ValueNodeDynamicListInsert::get_param_vocab()
 {
        ParamVocab ret(Action::CanvasSpecific::get_param_vocab());
-       
+
        ret.push_back(ParamDesc("value_desc",Param::TYPE_VALUEDESC)
                .set_local_name(_("ValueDesc"))
        );
@@ -90,17 +93,16 @@ Action::ValueNodeDynamicListInsert::get_param_vocab()
 }
 
 bool
-Action::ValueNodeDynamicListInsert::is_canidate(const ParamList &x)
+Action::ValueNodeDynamicListInsert::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
@@ -109,12 +111,12 @@ Action::ValueNodeDynamicListInsert::set_param(const synfig::String& name, const
        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;
 
@@ -125,15 +127,15 @@ Action::ValueNodeDynamicListInsert::set_param(const synfig::String& name, const
                list_entry=value_node->create_list_entry(index,time,origin);
                if(item)
                        list_entry.value_node=item;
-               
+
                assert(list_entry.value_node.rcount()==1);
-                               
+
                return true;
        }
        if(name=="time" && param.get_type()==Param::TYPE_TIME)
        {
                time=param.get_time();
-               
+
                return true;
        }
        if(name=="item" && param.get_type()==Param::TYPE_VALUENODE)
@@ -141,13 +143,13 @@ Action::ValueNodeDynamicListInsert::set_param(const synfig::String& name, const
                item=param.get_value_node();
                if(item)
                        list_entry.value_node=item;
-               
+
                return true;
        }
        if(name=="origin" && param.get_type()==Param::TYPE_REAL)
        {
                origin=param.get_real();
-               
+
                return true;
        }
 
@@ -164,13 +166,13 @@ Action::ValueNodeDynamicListInsert::is_ready()const
 
 void
 Action::ValueNodeDynamicListInsert::perform()
-{      
+{
        if(index>value_node->link_count())
                index=value_node->link_count();
-       
+
        value_node->add(list_entry,index);
        assert(list_entry.value_node.rcount()>=2);
-       
+
        // Signal that a layer has been inserted
        value_node->changed();
 /*_if(get_canvas_interface())
@@ -186,7 +188,7 @@ Action::ValueNodeDynamicListInsert::undo()
        assert(list_entry.value_node.rcount()>=2);
        value_node->erase((value_node->list.begin()+index)->value_node);
        assert(list_entry.value_node.rcount()>=1);
-       
+
        // Signal that a layer has been inserted
        value_node->changed();
 /*_if(get_canvas_interface())