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

diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistrotateorder.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistrotateorder.cpp
index fa3adb6..8e633ca 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistrotateorder.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistrotateorder.cpp
@@ -1,11 +1,12 @@
 /* === S Y N F I G ========================================================= */
-/*!	\file valuenodedynamiclistinsert.cpp
+/*!	\file valuenodedynamiclistrotateorder.cpp
 **	\brief Template File
 **
-**	$Id: valuenodedynamiclistrotateorder.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 "valuenodedynamiclistrotateorder.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::ValueNodeDynamicListRotateOrder);
-ACTION_SET_NAME(Action::ValueNodeDynamicListRotateOrder,"value_node_dynamic_list_rotate_order");
-ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListRotateOrder,"Rotate Order");
+ACTION_SET_NAME(Action::ValueNodeDynamicListRotateOrder,"ValueNodeDynamicListRotateOrder");
+ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListRotateOrder,N_("Rotate Order"));
 ACTION_SET_TASK(Action::ValueNodeDynamicListRotateOrder,"rotate");
 ACTION_SET_CATEGORY(Action::ValueNodeDynamicListRotateOrder,Action::CATEGORY_VALUEDESC|Action::CATEGORY_VALUENODE);
 ACTION_SET_PRIORITY(Action::ValueNodeDynamicListRotateOrder,0);
 ACTION_SET_VERSION(Action::ValueNodeDynamicListRotateOrder,"0.0");
-ACTION_SET_CVS_ID(Action::ValueNodeDynamicListRotateOrder,"$Id: valuenodedynamiclistrotateorder.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $");
+ACTION_SET_CVS_ID(Action::ValueNodeDynamicListRotateOrder,"$Id$");
 
 /* === G L O B A L S ======================================================= */
 
@@ -67,7 +70,7 @@ Action::ParamVocab
 Action::ValueNodeDynamicListRotateOrder::get_param_vocab()
 {
 	ParamVocab ret(Action::CanvasSpecific::get_param_vocab());
-	
+
 	ret.push_back(ParamDesc("value_desc",Param::TYPE_VALUEDESC)
 		.set_local_name(_("ValueDesc"))
 	);
@@ -76,17 +79,16 @@ Action::ValueNodeDynamicListRotateOrder::get_param_vocab()
 }
 
 bool
-Action::ValueNodeDynamicListRotateOrder::is_canidate(const ParamList &x)
+Action::ValueNodeDynamicListRotateOrder::is_candidate(const ParamList &x)
 {
-	if(canidate_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
@@ -95,12 +97,12 @@ Action::ValueNodeDynamicListRotateOrder::set_param(const synfig::String& name, c
 	if(name=="value_desc" && param.get_type()==Param::TYPE_VALUEDESC)
 	{
 		ValueDesc value_desc(param.get_value_desc());
-		
+
 		if(!value_desc.parent_is_value_node())
 			return false;
-		
+
 		value_node=ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_parent_value_node());
-		
+
 		if(!value_node)
 			return false;
 
@@ -124,41 +126,41 @@ void
 Action::ValueNodeDynamicListRotateOrder::prepare()
 {
 	clear();
-	
+
 	for(int i(0);i<(value_node->link_count()-index)%value_node->link_count();++i)
 	{
 		ValueDesc value_desc(value_node,value_node->link_count()-1-i);
 		ValueNode::Handle child(value_desc.get_value_node());
 
 
-		Action::Handle action(Action::create("value_node_dynamic_list_remove"));
-		
+		Action::Handle action(Action::create("ValueNodeDynamicListRemove"));
+
 		action->set_param("canvas",get_canvas());
 		action->set_param("canvas_interface",get_canvas_interface());
 		action->set_param("value_desc",ValueDesc(value_node,value_node->link_count()-1));
-		
+
 		assert(action->is_ready());
 		if(!action->is_ready())
 			throw Error(Error::TYPE_NOTREADY);
-	
+
 		add_action(action);
-		
-		
-		action=Action::create("value_node_dynamic_list_insert");
-		
+
+
+		action=Action::create("ValueNodeDynamicListInsert");
+
 		action->set_param("canvas",get_canvas());
 		action->set_param("canvas_interface",get_canvas_interface());
 		action->set_param("value_desc",ValueDesc(value_node,0));
 		action->set_param("item",child);
-	
+
 		assert(action->is_ready());
 		if(!action->is_ready())
 			throw Error(Error::TYPE_NOTREADY);
-	
+
 		add_action(action);
 
-		
-		
-	
+
+
+
 	}
 }