X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fvaluenodedynamiclistremovesmart.cpp;h=8615f9de20e1d03d6eb307bf3eb667377bb21802;hb=6989d1403b14b5b27dbf81b2c1cf6889511adf97;hp=e7b315c4002a5667a99a43217ab04d92206e2c24;hpb=8ef042c40521681cea99944097c4f90a5ac6cf74;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremovesmart.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremovesmart.cpp
index e7b315c..8615f9d 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremovesmart.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremovesmart.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
@@ -46,7 +47,7 @@ using namespace Action;
 /* === M A C R O S ========================================================= */
 
 ACTION_INIT(Action::ValueNodeDynamicListRemoveSmart);
-ACTION_SET_NAME(Action::ValueNodeDynamicListRemoveSmart,"value_node_dynamic_list_remove_smart");
+ACTION_SET_NAME(Action::ValueNodeDynamicListRemoveSmart,"ValueNodeDynamicListRemoveSmart");
 ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListRemoveSmart,N_("Remove Item (Smart)"));
 ACTION_SET_TASK(Action::ValueNodeDynamicListRemoveSmart,"remove");
 ACTION_SET_CATEGORY(Action::ValueNodeDynamicListRemoveSmart,Action::CATEGORY_VALUEDESC|Action::CATEGORY_VALUENODE);
@@ -91,15 +92,14 @@ Action::ValueNodeDynamicListRemoveSmart::get_param_vocab()
 bool
 Action::ValueNodeDynamicListRemoveSmart::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
@@ -153,7 +153,7 @@ Action::ValueNodeDynamicListRemoveSmart::prepare()
 	// If we are in animate editing mode
 	if(get_edit_mode()&MODE_ANIMATE)
 	{
-		Action::Handle action(Action::create("activepoint_set_off"));
+		Action::Handle action(Action::create("ActivepointSetOff"));
 
 		if(!action)
 			throw Error(_("Unable to find action (bug)"));
@@ -171,7 +171,7 @@ Action::ValueNodeDynamicListRemoveSmart::prepare()
 	}
 	else
 	{
-		Action::Handle action(Action::create("value_node_dynamic_list_remove"));
+		Action::Handle action(Action::create("ValueNodeDynamicListRemove"));
 
 		if(!action)
 			throw Error(_("Unable to find action (bug)"));