X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fvaluedescconnect.cpp;h=eea57f0b3d619e03ef3c60af2e3aa8fefc9009a1;hb=a9d08207afd2628f4d6f520ee75ba5d2a35048d9;hp=fe4714b11f5a923461f428a7c82a61f810205a29;hpb=8ef042c40521681cea99944097c4f90a5ac6cf74;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescconnect.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescconnect.cpp
index fe4714b..eea57f0 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/valuedescconnect.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescconnect.cpp
@@ -48,7 +48,7 @@ using namespace Action;
 
 /* === M A C R O S ========================================================= */
 
-ACTION_INIT(Action::ValueDescConnect);
+ACTION_INIT_NO_GET_LOCAL_NAME(Action::ValueDescConnect);
 ACTION_SET_NAME(Action::ValueDescConnect,"value_desc_connect");
 ACTION_SET_LOCAL_NAME(Action::ValueDescConnect,N_("Connect"));
 ACTION_SET_TASK(Action::ValueDescConnect,"connect");
@@ -67,6 +67,15 @@ Action::ValueDescConnect::ValueDescConnect()
 {
 }
 
+synfig::String
+Action::ValueDescConnect::get_local_name()const
+{
+	// TRANSLATORS: This is used in the 'history' dialog when a connection is made.
+	return strprintf(_("Connect '%s' to '%s'"),
+					 value_desc.get_description(false).c_str(),
+					 value_node->get_id().c_str());
+}
+
 Action::ParamVocab
 Action::ValueDescConnect::get_param_vocab()
 {
@@ -95,6 +104,17 @@ Action::ValueDescConnect::is_candidate(const ParamList &x)
 {
 	if(candidate_check(get_param_vocab(),x))
 	{
+		// don't show the option of connecting to an existing Index parameter of the Duplicate layer
+		if(x.count("dest"))
+		{
+			ValueDesc value_desc=x.find("dest")->second.get_value_desc();
+
+			if (value_desc.parent_is_layer_param() &&
+				value_desc.get_layer()->get_name() == "duplicate" &&
+				value_desc.get_param_name() == "index")
+				return false;
+		}
+
 		if(x.count("src"))
 		{
 			ValueDesc value_desc=x.find("dest")->second.get_value_desc();