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

diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistloop.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistloop.cpp
index 66f147c..abc4628 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistloop.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistloop.cpp
@@ -2,10 +2,11 @@
 /*!	\file valuenodedynamiclistloop.cpp
 **	\brief Template File
 **
-**	$Id: valuenodedynamiclistloop.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 "valuenodedynamiclistloop.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::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);
 ACTION_SET_VERSION(Action::ValueNodeDynamicListLoop,"0.0");
-ACTION_SET_CVS_ID(Action::ValueNodeDynamicListLoop,"$Id: valuenodedynamiclistloop.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $");
+ACTION_SET_CVS_ID(Action::ValueNodeDynamicListLoop,"$Id$");
 
 /* === G L O B A L S ======================================================= */
 
@@ -65,7 +68,7 @@ Action::ParamVocab
 Action::ValueNodeDynamicListLoop::get_param_vocab()
 {
 	ParamVocab ret(Action::CanvasSpecific::get_param_vocab());
-	
+
 	ret.push_back(ParamDesc("value_node",Param::TYPE_VALUENODE)
 		.set_local_name(_("ValueNode"))
 	);
@@ -74,27 +77,47 @@ Action::ValueNodeDynamicListLoop::get_param_vocab()
 }
 
 bool
-Action::ValueNodeDynamicListLoop::is_canidate(const ParamList &x)
+Action::ValueNodeDynamicListLoop::is_candidate(const ParamList &x)
 {
-	if(canidate_check(get_param_vocab(),x))
+	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
+Action::ValueNodeDynamicListLoop::set_param(const synfig::String& name, const Action::Param &param)
+{
+	if(!value_node && name=="value_desc" && param.get_type()==Param::TYPE_VALUEDESC)
 	{
-		ValueNode::Handle value_node(x.find("value_node")->second.get_value_node());
-		if(!ValueNode_DynamicList::Handle::cast_dynamic(value_node))
+		ValueDesc value_desc(param.get_value_desc());
+
+		if(!value_desc.parent_is_value_node())
 			return false;
-		if(ValueNode_DynamicList::Handle::cast_dynamic(value_node)->get_loop()==true)
+
+		value_node=ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_parent_value_node());
+
+		if (!value_node)
 			return false;
+
 		return true;
 	}
-	return false;
-}
 
-bool
-Action::ValueNodeDynamicListLoop::set_param(const synfig::String& name, const Action::Param &param)
-{
-	if(name=="value_node" && param.get_type()==Param::TYPE_VALUENODE)
-	{		
+	if(!value_node && name=="value_node" && param.get_type()==Param::TYPE_VALUENODE)
+	{
 		value_node=ValueNode_DynamicList::Handle::cast_dynamic(param.get_value_node());
-		
+
 		if(!value_node)
 			return false;
 
@@ -114,9 +137,9 @@ Action::ValueNodeDynamicListLoop::is_ready()const
 
 void
 Action::ValueNodeDynamicListLoop::perform()
-{	
+{
 	old_loop_value=value_node->get_loop();
-	
+
 	if(old_loop_value==true)
 	{
 		set_dirty(false);
@@ -124,7 +147,7 @@ Action::ValueNodeDynamicListLoop::perform()
 	}
 	set_dirty(true);
 	value_node->set_loop(true);
-		
+
 	value_node->changed();
 /*_if(get_canvas_interface())
 	{
@@ -143,7 +166,7 @@ Action::ValueNodeDynamicListLoop::undo()
 	}
 	set_dirty(true);
 	value_node->set_loop(old_loop_value);
-		
+
 	value_node->changed();
 /*_if(get_canvas_interface())
 	{