X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Factivepointsetsmart.cpp;h=51de04002c863a58ad387dcdf14faac456a2e240;hb=7c3682a6d1bb940fd74e9e327bbc2dd3a8fdb504;hp=2503dcc2a84363e36d25e0285b29101914ca6efc;hpb=c34eaa5441242b3e9a7b7645e9ee4983d14eae85;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointsetsmart.cpp b/synfig-studio/trunk/src/synfigapp/actions/activepointsetsmart.cpp
index 2503dcc..51de040 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/activepointsetsmart.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/activepointsetsmart.cpp
@@ -2,10 +2,11 @@
 /*!	\file activepointsetsmart.cpp
 **	\brief Template File
 **
-**	$Id: activepointsetsmart.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
@@ -39,6 +40,8 @@
 #include "valuedescconnect.h"
 #include <synfigapp/canvasinterface.h>
 
+#include <synfigapp/general.h>
+
 #endif
 
 using namespace std;
@@ -51,12 +54,12 @@ using namespace Action;
 
 ACTION_INIT(Action::ActivepointSetSmart);
 ACTION_SET_NAME(Action::ActivepointSetSmart,"activepoint_set_smart");
-ACTION_SET_LOCAL_NAME(Action::ActivepointSetSmart,_("Set Activepoint (Smart)"));
+ACTION_SET_LOCAL_NAME(Action::ActivepointSetSmart,N_("Set Activepoint (Smart)"));
 ACTION_SET_TASK(Action::ActivepointSetSmart,"set");
 ACTION_SET_CATEGORY(Action::ActivepointSetSmart,Action::CATEGORY_ACTIVEPOINT);
 ACTION_SET_PRIORITY(Action::ActivepointSetSmart,0);
 ACTION_SET_VERSION(Action::ActivepointSetSmart,"0.0");
-ACTION_SET_CVS_ID(Action::ActivepointSetSmart,"$Id: activepointsetsmart.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $");
+ACTION_SET_CVS_ID(Action::ActivepointSetSmart,"$Id$");
 
 /* === G L O B A L S ======================================================= */
 
@@ -98,17 +101,16 @@ Action::ActivepointSetSmart::get_param_vocab()
 bool
 Action::ActivepointSetSmart::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;
 
-		// We need either a activepoint or a time.
-		if(x.count("activepoint") || x.count("time"))
-			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()) &&
+			// We need either an activepoint or a time.
+			(x.count("activepoint") || x.count("time")));
 }
 
 bool
@@ -284,7 +286,7 @@ Action::ActivepointSetSmart::prepare()
 	clear();
 	times.clear();
 
-	// First, we need to to add any activepoints necessary to
+	// First, we need to add any activepoints necessary to
 	// maintain the integrity of the keyframes.
 	enclose_activepoint(activepoint);
 
@@ -293,7 +295,7 @@ Action::ActivepointSetSmart::prepare()
 		if(value_node->list[index].find(activepoint)==value_node->list[index].timing_info.end())
 			throw int();
 
-		// Then, lets try to replace the old activepoint, if it exists
+		// Then, let's try to replace the old activepoint, if it exists
 		enclose_activepoint(*value_node->list[index].find(activepoint));
 
 		Action::Handle action(ActivepointSet::create());
@@ -361,5 +363,5 @@ Action::ActivepointSetSmart::prepare()
 	catch(int){}
 	catch(Exception::NotFound){}
 
-	throw Error(_("Unable to determine how to procede. This is a bug."));
+	throw Error(_("Unable to determine how to proceed. This is a bug."));
 }