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

diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointseton.cpp b/synfig-studio/trunk/src/synfigapp/actions/activepointseton.cpp
index 0304efd..f038448 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/activepointseton.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/activepointseton.cpp
@@ -2,10 +2,11 @@
 /*!	\file activepointseton.cpp
 **	\brief Template File
 **
-**	$Id: activepointseton.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
@@ -40,6 +41,8 @@
 #include "valuedescconnect.h"
 #include <synfigapp/canvasinterface.h>
 
+#include <synfigapp/general.h>
+
 #endif
 
 using namespace std;
@@ -51,13 +54,13 @@ using namespace Action;
 /* === M A C R O S ========================================================= */
 
 ACTION_INIT(Action::ActivepointSetOn);
-ACTION_SET_NAME(Action::ActivepointSetOn,"activepoint_set_on");
-ACTION_SET_LOCAL_NAME(Action::ActivepointSetOn,_("Mark Activepoint as \"On\""));
+ACTION_SET_NAME(Action::ActivepointSetOn,"ActivepointSetOn");
+ACTION_SET_LOCAL_NAME(Action::ActivepointSetOn,N_("Mark Activepoint as \"On\""));
 ACTION_SET_TASK(Action::ActivepointSetOn,"set_on");
 ACTION_SET_CATEGORY(Action::ActivepointSetOn,Action::CATEGORY_ACTIVEPOINT|Action::CATEGORY_VALUEDESC);
 ACTION_SET_PRIORITY(Action::ActivepointSetOn,-10);
 ACTION_SET_VERSION(Action::ActivepointSetOn,"0.0");
-ACTION_SET_CVS_ID(Action::ActivepointSetOn,"$Id: activepointseton.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $");
+ACTION_SET_CVS_ID(Action::ActivepointSetOn,"$Id$");
 
 /* === G L O B A L S ======================================================= */
 
@@ -97,22 +100,22 @@ Action::ActivepointSetOn::get_param_vocab()
 bool
 Action::ActivepointSetOn::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 are only a candidate if this canvas is animated.
-		Canvas::Handle canvas(x.find("canvas")->second.get_canvas());
-		if(canvas->rend_desc().get_time_start()==canvas->rend_desc().get_time_end())
-			return false;
+	ValueDesc value_desc(x.find("value_desc")->second.get_value_desc());
 
-		// We need either a activepoint or a time.
-		if(x.count("activepoint") || x.count("time"))
-			return true;
-	}
-	return false;
+	if (!(value_desc.parent_is_value_node() &&
+		  // We need a dynamic list.
+		  ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_parent_value_node())))
+		return false;
+
+	Canvas::Handle canvas(x.find("canvas")->second.get_canvas());
+
+	// We are only a candidate if this canvas is animated.
+	return (canvas->rend_desc().get_time_start() != canvas->rend_desc().get_time_end() &&
+			// We need either an activepoint or a time.
+			(x.count("activepoint") || x.count("time")));
 }
 
 bool