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

diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistrotateorder.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistrotateorder.cpp
index a9d1ff6..8e633ca 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistrotateorder.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistrotateorder.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
@@ -45,7 +46,7 @@ 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_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);
@@ -80,15 +81,14 @@ Action::ValueNodeDynamicListRotateOrder::get_param_vocab()
 bool
 Action::ValueNodeDynamicListRotateOrder::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
@@ -133,7 +133,7 @@ Action::ValueNodeDynamicListRotateOrder::prepare()
 		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());
@@ -146,7 +146,7 @@ Action::ValueNodeDynamicListRotateOrder::prepare()
 		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());