X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fvaluedescdisconnect.cpp;h=091ab9abc09869483a57e0e7ec7b1c53fae3caae;hb=e50f313599a0e9ed2294093394c42b3b0fc329e1;hp=2efc2e61122e8e276835f1e79028ed351ec82e2d;hpb=c34eaa5441242b3e9a7b7645e9ee4983d14eae85;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp
index 2efc2e6..091ab9a 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp
@@ -2,7 +2,7 @@
 /*!	\file valuedescdisconnect.cpp
 **	\brief Template File
 **
-**	$Id: valuedescdisconnect.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
@@ -36,6 +36,9 @@
 #include "valuedescdisconnect.h"
 #include <synfigapp/canvasinterface.h>
 #include <synfig/valuenode_const.h>
+#include <synfig/valuenode_duplicate.h>
+
+#include <synfigapp/general.h>
 
 #endif
 
@@ -49,12 +52,12 @@ using namespace Action;
 
 ACTION_INIT(Action::ValueDescDisconnect);
 ACTION_SET_NAME(Action::ValueDescDisconnect,"value_desc_disconnect");
-ACTION_SET_LOCAL_NAME(Action::ValueDescDisconnect,"Disconnect");
+ACTION_SET_LOCAL_NAME(Action::ValueDescDisconnect,N_("Disconnect"));
 ACTION_SET_TASK(Action::ValueDescDisconnect,"disconnect");
 ACTION_SET_CATEGORY(Action::ValueDescDisconnect,Action::CATEGORY_VALUEDESC);
 ACTION_SET_PRIORITY(Action::ValueDescDisconnect,-100);
 ACTION_SET_VERSION(Action::ValueDescDisconnect,"0.0");
-ACTION_SET_CVS_ID(Action::ValueDescDisconnect,"$Id: valuedescdisconnect.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $");
+ACTION_SET_CVS_ID(Action::ValueDescDisconnect,"$Id$");
 
 /* === G L O B A L S ======================================================= */
 
@@ -90,12 +93,22 @@ Action::ValueDescDisconnect::is_candidate(const ParamList &x)
 	if(candidate_check(get_param_vocab(),x))
 	{
 		ValueDesc value_desc(x.find("value_desc")->second.get_value_desc());
+
+		// don't allow the Index parameter of the Duplicate layer to be disconnected
+		if(value_desc.parent_is_layer_param() && value_desc.get_layer()->get_name() == "duplicate" && value_desc.get_param_name() == "index")
+			return false;
 		if(!value_desc.parent_is_canvas() && value_desc.is_value_node() && value_desc.get_value_node()->rcount()>1)
 			return true;
 		if(value_desc.is_const())
 			return false;
 		if(value_desc.is_value_node() && ValueNode_Const::Handle::cast_dynamic(value_desc.get_value_node()))
 			return false;
+		// don't allow Duplicate ValueNodes in the Children dialog to be disconnected
+		if(value_desc.is_value_node() &&
+		   ValueNode_Duplicate::Handle::cast_dynamic(value_desc.get_value_node()) &&
+		   !value_desc.parent_is_layer_param() &&
+		   !value_desc.parent_is_value_node())
+			return false;
 		return true;
 	}
 	return false;
@@ -190,5 +203,5 @@ Action::ValueDescDisconnect::prepare()
 		return;
 	}
 
-	throw Error(_("ValueDesc is not recognised or supported."));
+	throw Error(_("ValueDesc is not recognized or supported."));
 }