X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fvaluenodedynamiclistinsertsmart.cpp;h=893a765f9cbcfdcc210748c8b446360b9d163a43;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=58c89647de33c64631b0e9fc49311876edbfd0a7;hpb=837b63e9fb829d66d43f4f169861f8979f76820d;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsertsmart.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsertsmart.cpp
index 58c8964..893a765 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsertsmart.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsertsmart.cpp
@@ -6,6 +6,7 @@
 **
 **	\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,8 +47,8 @@ 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);
@@ -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)"));