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

diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistloop.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistloop.cpp
index 2a8f5bd..abc4628 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistloop.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistloop.cpp
@@ -6,6 +6,7 @@
 **
 **	\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 "valuenodedynamiclistloop.h"
 #include <synfigapp/canvasinterface.h>
 
+#include <synfigapp/general.h>
+
 #endif
 
 using namespace std;
@@ -43,8 +46,8 @@ using namespace Action;
 /* === M A C R O S ========================================================= */
 
 ACTION_INIT(Action::ValueNodeDynamicListLoop);
-ACTION_SET_NAME(Action::ValueNodeDynamicListLoop,"value_node_dynamic_list_loop");
-ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListLoop,"Loop");
+ACTION_SET_NAME(Action::ValueNodeDynamicListLoop,"ValueNodeDynamicListLoop");
+ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListLoop,N_("Loop"));
 ACTION_SET_TASK(Action::ValueNodeDynamicListLoop,"loop");
 ACTION_SET_CATEGORY(Action::ValueNodeDynamicListLoop,Action::CATEGORY_VALUEDESC|Action::CATEGORY_VALUENODE);
 ACTION_SET_PRIORITY(Action::ValueNodeDynamicListLoop,0);
@@ -76,21 +79,21 @@ Action::ValueNodeDynamicListLoop::get_param_vocab()
 bool
 Action::ValueNodeDynamicListLoop::is_candidate(const ParamList &x)
 {
-	if(candidate_check(get_param_vocab(),x))
-	{
-		ValueNode::Handle value_node;
-		ValueDesc value_desc(x.find("value_desc")->second.get_value_desc());
-		if(value_desc.parent_is_value_node())
-			value_node = value_desc.get_parent_value_node();
-		else
-			value_node = x.find("value_node")->second.get_value_node();
-		if(!ValueNode_DynamicList::Handle::cast_dynamic(value_node))
-			return false;
-		if(ValueNode_DynamicList::Handle::cast_dynamic(value_node)->get_loop()==true)
-			return false;
-		return true;
-	}
-	return false;
+	if (!candidate_check(get_param_vocab(),x))
+		return false;
+
+	ValueNode::Handle value_node;
+	ValueDesc value_desc(x.find("value_desc")->second.get_value_desc());
+
+	if(value_desc.parent_is_value_node())
+		value_node = value_desc.get_parent_value_node();
+	else
+		value_node = x.find("value_node")->second.get_value_node();
+
+	// We need a dynamic list.
+	return (ValueNode_DynamicList::Handle::cast_dynamic(value_node) &&
+			// We need the list not to be looped.
+			!ValueNode_DynamicList::Handle::cast_dynamic(value_node)->get_loop());
 }
 
 bool