X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fvaluenodedynamiclistremovesmart.cpp;h=8615f9de20e1d03d6eb307bf3eb667377bb21802;hb=1e0ddeb566a2766b85bffc17e501721cc025d851;hp=9b853d8f34fa1c2d181e722a7784683c10675e0a;hpb=ce408de81ca266b1f334ee9bc6c8fb7ba1492ed4;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremovesmart.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremovesmart.cpp
index 9b853d8..8615f9d 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremovesmart.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremovesmart.cpp
@@ -2,10 +2,11 @@
 /*!	\file valuenodedynamiclistremovesmart.cpp
 **	\brief Template File
 **
-**	$Id: valuenodedynamiclistremovesmart.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
@@ -33,6 +34,8 @@
 #include "valuenodedynamiclistremove.h"
 #include <synfigapp/canvasinterface.h>
 
+#include <synfigapp/general.h>
+
 #endif
 
 using namespace std;
@@ -44,13 +47,13 @@ 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_LOCAL_NAME(Action::ValueNodeDynamicListRemoveSmart,"Remove Item (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);
 ACTION_SET_PRIORITY(Action::ValueNodeDynamicListRemoveSmart,-19);
 ACTION_SET_VERSION(Action::ValueNodeDynamicListRemoveSmart,"0.0");
-ACTION_SET_CVS_ID(Action::ValueNodeDynamicListRemoveSmart,"$Id: valuenodedynamiclistremovesmart.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $");
+ACTION_SET_CVS_ID(Action::ValueNodeDynamicListRemoveSmart,"$Id$");
 
 /* === G L O B A L S ======================================================= */
 
@@ -70,7 +73,7 @@ Action::ParamVocab
 Action::ValueNodeDynamicListRemoveSmart::get_param_vocab()
 {
 	ParamVocab ret(Action::CanvasSpecific::get_param_vocab());
-	
+
 	ret.push_back(ParamDesc("value_desc",Param::TYPE_VALUEDESC)
 		.set_local_name(_("ValueDesc"))
 	);
@@ -87,17 +90,16 @@ Action::ValueNodeDynamicListRemoveSmart::get_param_vocab()
 }
 
 bool
-Action::ValueNodeDynamicListRemoveSmart::is_canidate(const ParamList &x)
+Action::ValueNodeDynamicListRemoveSmart::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
@@ -106,29 +108,29 @@ Action::ValueNodeDynamicListRemoveSmart::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;
 
 		index=value_desc.get_index();
-				
+
 		return true;
 	}
 	if(name=="time" && param.get_type()==Param::TYPE_TIME)
 	{
 		time=param.get_time();
-		
+
 		return true;
 	}
 	if(name=="origin" && param.get_type()==Param::TYPE_REAL)
 	{
 		origin=param.get_real();
-		
+
 		return true;
 	}
 
@@ -145,23 +147,23 @@ Action::ValueNodeDynamicListRemoveSmart::is_ready()const
 
 void
 Action::ValueNodeDynamicListRemoveSmart::prepare()
-{	
+{
 	clear();
-	
+
 	// 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)"));
-		
+
 		action->set_param("canvas",get_canvas());
 		action->set_param("canvas_interface",get_canvas_interface());
 		action->set_param("time",time);
 		action->set_param("origin",origin);
 		action->set_param("value_desc",ValueDesc(value_node,index));
-		
+
 		if(!action->is_ready())
 			throw Error(Error::TYPE_NOTREADY);
 
@@ -169,17 +171,17 @@ 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)"));
-		
+
 		action->set_param("canvas",get_canvas());
 		action->set_param("canvas_interface",get_canvas_interface());
 		action->set_param("time",time);
 		action->set_param("origin",origin);
 		action->set_param("value_desc",ValueDesc(value_node,index));
-		
+
 		if(!action->is_ready())
 			throw Error(Error::TYPE_NOTREADY);