X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fvaluenodedynamiclistunloop.cpp;h=9b1daf5ae00f3c8eaf5751368ff34a2dcd8997d8;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=a1ee55db7a6d2806d86de6db9e077cc910542daf;hpb=c34eaa5441242b3e9a7b7645e9ee4983d14eae85;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistunloop.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistunloop.cpp
index a1ee55d..9b1daf5 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistunloop.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistunloop.cpp
@@ -2,10 +2,11 @@
 /*!	\file valuenodedynamiclistunloop.cpp
 **	\brief Template File
 **
-**	$Id: valuenodedynamiclistunloop.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 "valuenodedynamiclistunloop.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::ValueNodeDynamicListUnLoop);
-ACTION_SET_NAME(Action::ValueNodeDynamicListUnLoop,"value_node_dynamic_list_unloop");
-ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListUnLoop,"Unloop");
+ACTION_SET_NAME(Action::ValueNodeDynamicListUnLoop,"ValueNodeDynamicListUnLoop");
+ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListUnLoop,N_("Unloop"));
 ACTION_SET_TASK(Action::ValueNodeDynamicListUnLoop,"unloop");
 ACTION_SET_CATEGORY(Action::ValueNodeDynamicListUnLoop,Action::CATEGORY_VALUEDESC|Action::CATEGORY_VALUENODE);
 ACTION_SET_PRIORITY(Action::ValueNodeDynamicListUnLoop,0);
 ACTION_SET_VERSION(Action::ValueNodeDynamicListUnLoop,"0.0");
-ACTION_SET_CVS_ID(Action::ValueNodeDynamicListUnLoop,"$Id: valuenodedynamiclistunloop.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $");
+ACTION_SET_CVS_ID(Action::ValueNodeDynamicListUnLoop,"$Id$");
 
 /* === G L O B A L S ======================================================= */
 
@@ -76,21 +79,21 @@ Action::ValueNodeDynamicListUnLoop::get_param_vocab()
 bool
 Action::ValueNodeDynamicListUnLoop::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()==false)
-			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 to be looped.
+			ValueNode_DynamicList::Handle::cast_dynamic(value_node)->get_loop());
 }
 
 bool