X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fvaluedescconnect.cpp;h=2979ed803069aef2cb7f1a1b9e65bc0228fa5d68;hb=2e7fd51065ba36fc990b825f2842da8baa2fed39;hp=1a176783615c89ac4b3d1769b4703772ac00d34c;hpb=bd8367952ea2be0ab1e94922922409bf5f9a0be8;p=synfig.git diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescconnect.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescconnect.cpp index 1a17678..2979ed8 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuedescconnect.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescconnect.cpp @@ -36,6 +36,8 @@ #include "valuedescconnect.h" #include +#include + #endif using namespace std; @@ -48,7 +50,7 @@ using namespace Action; ACTION_INIT(Action::ValueDescConnect); ACTION_SET_NAME(Action::ValueDescConnect,"value_desc_connect"); -ACTION_SET_LOCAL_NAME(Action::ValueDescConnect,"Connect"); +ACTION_SET_LOCAL_NAME(Action::ValueDescConnect,N_("Connect")); ACTION_SET_TASK(Action::ValueDescConnect,"connect"); ACTION_SET_CATEGORY(Action::ValueDescConnect,Action::CATEGORY_VALUEDESC|Action::CATEGORY_VALUENODE); ACTION_SET_PRIORITY(Action::ValueDescConnect,0); @@ -93,6 +95,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();