X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Factivepointsetoff.cpp;h=15bfe14eaf335167f6dc9ecc55d617d59eb9b6e9;hb=72f3f5287dc9b9988217d0fe2024e3b23d2f9f4c;hp=cea48cd5591542898c428233e9946825287ec4c4;hpb=837b63e9fb829d66d43f4f169861f8979f76820d;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointsetoff.cpp b/synfig-studio/trunk/src/synfigapp/actions/activepointsetoff.cpp
index cea48cd..15bfe14 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/activepointsetoff.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/activepointsetoff.cpp
@@ -40,6 +40,8 @@
 #include "valuedescconnect.h"
 #include <synfigapp/canvasinterface.h>
 
+#include <synfigapp/general.h>
+
 #endif
 
 using namespace std;
@@ -52,7 +54,7 @@ using namespace Action;
 
 ACTION_INIT(Action::ActivepointSetOff);
 ACTION_SET_NAME(Action::ActivepointSetOff,"activepoint_set_off");
-ACTION_SET_LOCAL_NAME(Action::ActivepointSetOff,_("Mark Activepoint as \"Off\""));
+ACTION_SET_LOCAL_NAME(Action::ActivepointSetOff,N_("Mark Activepoint as \"Off\""));
 ACTION_SET_TASK(Action::ActivepointSetOff,"set_off");
 ACTION_SET_CATEGORY(Action::ActivepointSetOff,Action::CATEGORY_ACTIVEPOINT|Action::CATEGORY_VALUEDESC);
 ACTION_SET_PRIORITY(Action::ActivepointSetOff,-9);
@@ -97,22 +99,22 @@ Action::ActivepointSetOff::get_param_vocab()
 bool
 Action::ActivepointSetOff::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