X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fwaypointadd.cpp;h=5b03edfd34113a4890eed9003324e72c98365ea5;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=fc1bb1151e6b73ba38b552f14a83d728930584a9;hpb=c34eaa5441242b3e9a7b7645e9ee4983d14eae85;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/waypointadd.cpp b/synfig-studio/trunk/src/synfigapp/actions/waypointadd.cpp
index fc1bb11..5b03edf 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/waypointadd.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/waypointadd.cpp
@@ -2,10 +2,11 @@
 /*!	\file waypointadd.cpp
 **	\brief Template File
 **
-**	$Id: waypointadd.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 <synfigapp/canvasinterface.h>
 #include <synfigapp/main.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::WaypointAdd);
-ACTION_SET_NAME(Action::WaypointAdd,"waypoint_add");
-ACTION_SET_LOCAL_NAME(Action::WaypointAdd,"Add Waypoint");
+ACTION_SET_NAME(Action::WaypointAdd,"WaypointAdd");
+ACTION_SET_LOCAL_NAME(Action::WaypointAdd,N_("Add Waypoint"));
 ACTION_SET_TASK(Action::WaypointAdd,"add");
 ACTION_SET_CATEGORY(Action::WaypointAdd,Action::CATEGORY_WAYPOINT);
 ACTION_SET_PRIORITY(Action::WaypointAdd,0);
 ACTION_SET_VERSION(Action::WaypointAdd,"0.0");
-ACTION_SET_CVS_ID(Action::WaypointAdd,"$Id: waypointadd.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $");
+ACTION_SET_CVS_ID(Action::WaypointAdd,"$Id$");
 
 /* === G L O B A L S ======================================================= */
 
@@ -92,16 +95,11 @@ Action::WaypointAdd::get_param_vocab()
 bool
 Action::WaypointAdd::is_candidate(const ParamList &x)
 {
-	if(candidate_check(get_param_vocab(),x))
-	{
-		if(!ValueNode_Animated::Handle::cast_dynamic(x.find("value_node")->second.get_value_node()))
-			return false;
-
-		// We need either a waypoint or a time.
-		if(x.count("waypoint") || x.count("time"))
-			return true;
-	}
-	return false;
+	return (candidate_check(get_param_vocab(),x) &&
+			// We need an animated valuenode.
+			ValueNode_Animated::Handle::cast_dynamic(x.find("value_node")->second.get_value_node()) &&
+			// We need either a waypoint or a time.
+			(x.count("waypoint") || x.count("time")));
 }
 
 bool