Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsertsmart.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsertsmart.cpp
index 0019e97..893a765 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsertsmart.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsertsmart.cpp
@@ -2,10 +2,11 @@
 /*!    \file valuenodedynamiclistinsertsmart.cpp
 **     \brief Template File
 **
-**     $Id: valuenodedynamiclistinsertsmart.cpp,v 1.3 2005/01/17 05:20:08 darco Exp $
+**     $Id$
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2007 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
@@ -33,6 +34,8 @@
 #include "valuenodedynamiclistinsert.h"
 #include <synfigapp/canvasinterface.h>
 
+#include <synfigapp/general.h>
+
 #endif
 
 using namespace std;
@@ -44,13 +47,13 @@ using namespace Action;
 /* === M A C R O S ========================================================= */
 
 ACTION_INIT(Action::ValueNodeDynamicListInsertSmart);
-ACTION_SET_NAME(Action::ValueNodeDynamicListInsertSmart,"value_node_dynamic_list_insert_smart");
-ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListInsertSmart,"Insert Item (Smart)");
+ACTION_SET_NAME(Action::ValueNodeDynamicListInsertSmart,"ValueNodeDynamicListInsertSmart");
+ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListInsertSmart,N_("Insert Item (Smart)"));
 ACTION_SET_TASK(Action::ValueNodeDynamicListInsertSmart,"insert");
 ACTION_SET_CATEGORY(Action::ValueNodeDynamicListInsertSmart,Action::CATEGORY_VALUEDESC|Action::CATEGORY_VALUENODE);
 ACTION_SET_PRIORITY(Action::ValueNodeDynamicListInsertSmart,-20);
 ACTION_SET_VERSION(Action::ValueNodeDynamicListInsertSmart,"0.0");
-ACTION_SET_CVS_ID(Action::ValueNodeDynamicListInsertSmart,"$Id: valuenodedynamiclistinsertsmart.cpp,v 1.3 2005/01/17 05:20:08 darco Exp $");
+ACTION_SET_CVS_ID(Action::ValueNodeDynamicListInsertSmart,"$Id$");
 
 /* === G L O B A L S ======================================================= */
 
@@ -89,15 +92,14 @@ Action::ValueNodeDynamicListInsertSmart::get_param_vocab()
 bool
 Action::ValueNodeDynamicListInsertSmart::is_candidate(const ParamList &x)
 {
-       if(candidate_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
@@ -161,10 +163,10 @@ Action::ValueNodeDynamicListInsertSmart::prepare()
                // turn on. If not, then we need to go ahead and create one.
                synfig::info("ValueNodeDynamicListInsertSmart: index=%d",index);
                synfig::info("ValueNodeDynamicListInsertSmart: value_node->list.size()=%d",value_node->list.size());
-               if(value_node->list.size()<=index && index>0)
+               if(int(value_node->list.size())<=index && index>0)
                        synfig::info("ValueNodeDynamicListInsertSmart: value_node->list[index-1].status_at_time(time)=%d",value_node->list[index-1].status_at_time(time));
 
-               if(value_node->list.size()>=index && index>0 && !value_node->list[index-1].status_at_time(time))
+               if(int(value_node->list.size())>=index && index>0 && !value_node->list[index-1].status_at_time(time))
                {
                        // Ok, we do not have to create a new
                        // entry in the dynamic list after all.
@@ -176,10 +178,10 @@ Action::ValueNodeDynamicListInsertSmart::prepare()
 
                        ValueDesc item_value_desc(value_node,index);
 
-                       Action::Handle action(Action::create("value_desc_set"));
+                       Action::Handle action(Action::create("ValueDescSet"));
 
                        if(!action)
-                               throw Error(_("Unable to find action value_desc_set (bug)"));
+                               throw Error(_("Unable to find action ValueDescSet (bug)"));
 
                        action->set_param("edit_mode",get_edit_mode());
                        action->set_param("canvas",get_canvas());
@@ -197,7 +199,7 @@ Action::ValueNodeDynamicListInsertSmart::prepare()
                {
                        // Ok, not a big deal, we just need to
                        // add a new item
-                       Action::Handle action(Action::create("value_node_dynamic_list_insert"));
+                       Action::Handle action(Action::create("ValueNodeDynamicListInsert"));
 
                        if(!action)
                                throw Error(_("Unable to find action (bug)"));
@@ -213,10 +215,10 @@ Action::ValueNodeDynamicListInsertSmart::prepare()
 
                        add_action(action);
 
-                       action=Action::create("activepoint_set_off");
+                       action=Action::create("ActivepointSetOff");
 
                        if(!action)
-                               throw Error(_("Unable to find action \"activepoint_set_off\""));
+                               throw Error(_("Unable to find action \"ActivepointSetOff\""));
 
                        action->set_param("edit_mode",MODE_ANIMATE);
                        action->set_param("canvas",get_canvas());
@@ -232,10 +234,10 @@ Action::ValueNodeDynamicListInsertSmart::prepare()
                }
 
                // Now we set the activepoint up and then we'll be done
-               Action::Handle action(Action::create("activepoint_set_on"));
+               Action::Handle action(Action::create("ActivepointSetOn"));
 
                if(!action)
-                       throw Error(_("Unable to find action \"activepoint_set_on\""));
+                       throw Error(_("Unable to find action \"ActivepointSetOn\""));
 
                action->set_param("edit_mode",get_edit_mode());
                action->set_param("canvas",get_canvas());
@@ -251,7 +253,7 @@ Action::ValueNodeDynamicListInsertSmart::prepare()
        }
        else
        {
-               Action::Handle action(Action::create("value_node_dynamic_list_insert"));
+               Action::Handle action(Action::create("ValueNodeDynamicListInsert"));
 
                if(!action)
                        throw Error(_("Unable to find action (bug)"));