X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fvaluedescdisconnect.cpp;h=9d1c457692aa2072d89c569de5e612a0643f021d;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;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..9d1c457 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp
@@ -2,10 +2,11 @@
 /*!	\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
+**	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
@@ -30,12 +31,16 @@
 #endif
 
 #include "layerparamdisconnect.h"
+#include "waypointdisconnect.h"
 #include "valuenodelinkdisconnect.h"
 #include "valuenodereplace.h"
 
 #include "valuedescdisconnect.h"
 #include <synfigapp/canvasinterface.h>
 #include <synfig/valuenode_const.h>
+#include <synfig/valuenode_duplicate.h>
+
+#include <synfigapp/general.h>
 
 #endif
 
@@ -47,14 +52,14 @@ using namespace Action;
 
 /* === M A C R O S ========================================================= */
 
-ACTION_INIT(Action::ValueDescDisconnect);
-ACTION_SET_NAME(Action::ValueDescDisconnect,"value_desc_disconnect");
-ACTION_SET_LOCAL_NAME(Action::ValueDescDisconnect,"Disconnect");
+ACTION_INIT_NO_GET_LOCAL_NAME(Action::ValueDescDisconnect);
+ACTION_SET_NAME(Action::ValueDescDisconnect,"ValueDescDisconnect");
+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 ======================================================= */
 
@@ -67,6 +72,16 @@ Action::ValueDescDisconnect::ValueDescDisconnect():
 {
 }
 
+synfig::String
+Action::ValueDescDisconnect::get_local_name()const
+{
+  // TRANSLATORS: This is used in the History dialog when a ValueNode is disconnected.
+  return strprintf(_("Disconnect %s"),
+                   value_desc
+                   ? value_desc.get_description().c_str()
+                   : _("ValueDesc"));
+}
+
 Action::ParamVocab
 Action::ValueDescDisconnect::get_param_vocab()
 {
@@ -87,18 +102,27 @@ Action::ValueDescDisconnect::get_param_vocab()
 bool
 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());
-		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;
+	if (!candidate_check(get_param_vocab(),x))
+		return false;
+
+	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;
-	}
-	return false;
+	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;
 }
 
 bool
@@ -154,6 +178,24 @@ Action::ValueDescDisconnect::prepare()
 		return;
 	}
 	else
+	if(value_desc.parent_is_waypoint())
+	{
+		Action::Handle action(WaypointDisconnect::create());
+
+		action->set_param("canvas",get_canvas());
+		action->set_param("canvas_interface",get_canvas_interface());
+		action->set_param("parent_value_node",value_desc.get_parent_value_node());
+		action->set_param("waypoint_time",value_desc.get_waypoint_time());
+		action->set_param("time",time);
+
+		assert(action->is_ready());
+		if(!action->is_ready())
+			throw Error(Error::TYPE_NOTREADY);
+
+		add_action_front(action);
+		return;
+	}
+	else
 	if(value_desc.parent_is_linkable_value_node())
 	{
 		Action::Handle action(ValueNodeLinkDisconnect::create());
@@ -190,5 +232,5 @@ Action::ValueDescDisconnect::prepare()
 		return;
 	}
 
-	throw Error(_("ValueDesc is not recognised or supported."));
+	throw Error(_("ValueDesc is not recognized or supported."));
 }