X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftags%2Fstable%2Fsrc%2Fsynfigapp%2Factions%2Factivepointseton.cpp;h=71a963a54c133d3932b9c805629994c62fc4baa9;hb=47fce282611fbba1044921d22ca887f9b53ad91a;hp=b5e3ac418b433ce4277b78bb216fb14630db93a3;hpb=4cb5360f578f79e5d9e234570018d762ea0a964f;p=synfig.git

diff --git a/synfig-studio/tags/stable/src/synfigapp/actions/activepointseton.cpp b/synfig-studio/tags/stable/src/synfigapp/actions/activepointseton.cpp
index b5e3ac4..71a963a 100644
--- a/synfig-studio/tags/stable/src/synfigapp/actions/activepointseton.cpp
+++ b/synfig-studio/tags/stable/src/synfigapp/actions/activepointseton.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
@@ -40,6 +41,8 @@
 #include "valuedescconnect.h"
 #include <synfigapp/canvasinterface.h>
 
+#include <synfigapp/general.h>
+
 #endif
 
 using namespace std;
@@ -52,7 +55,7 @@ using namespace Action;
 
 ACTION_INIT(Action::ActivepointSetOn);
 ACTION_SET_NAME(Action::ActivepointSetOn,"activepoint_set_on");
-ACTION_SET_LOCAL_NAME(Action::ActivepointSetOn,_("Mark Activepoint as \"On\""));
+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);
@@ -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