X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fvaluedescdisconnect.cpp;h=c703b6d4ff76777f207b66d727e5b023fc3e31f5;hb=334e15ce6c4d9b1f30a168a55e7ef4d31320d568;hp=80535a97513e5f701a1396e476410d2469355ff4;hpb=ce408de81ca266b1f334ee9bc6c8fb7ba1492ed4;p=synfig.git diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp index 80535a9..c703b6d 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 #include +#include + +#include #endif @@ -47,14 +50,14 @@ using namespace Action; /* === M A C R O S ========================================================= */ -ACTION_INIT(Action::ValueDescDisconnect); +ACTION_INIT_NO_GET_LOCAL_NAME(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 ======================================================= */ @@ -67,11 +70,21 @@ 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() { ParamVocab ret(Action::CanvasSpecific::get_param_vocab()); - + ret.push_back(ParamDesc("value_desc",Param::TYPE_VALUEDESC) .set_local_name(_("ValueDesc")) ); @@ -80,22 +93,32 @@ Action::ValueDescDisconnect::get_param_vocab() .set_local_name(_("Time")) .set_optional() ); - + return ret; } bool -Action::ValueDescDisconnect::is_canidate(const ParamList &x) +Action::ValueDescDisconnect::is_candidate(const ParamList &x) { - if(canidate_check(get_param_vocab(),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; @@ -107,14 +130,14 @@ Action::ValueDescDisconnect::set_param(const synfig::String& name, const Action: if(name=="value_desc" && param.get_type()==Param::TYPE_VALUEDESC) { value_desc=param.get_value_desc(); - + return true; } if(name=="time" && param.get_type()==Param::TYPE_TIME) { time=param.get_time(); - + return true; } @@ -135,60 +158,60 @@ Action::ValueDescDisconnect::prepare() clear(); if(value_desc.parent_is_canvas()) - { + { ValueNode::Handle src_value_node; src_value_node=ValueNode_Const::create((*value_desc.get_value_node())(time)); Action::Handle action(ValueNodeReplace::create()); - + action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("src",src_value_node); action->set_param("dest",value_desc.get_value_node()); - + assert(action->is_ready()); if(!action->is_ready()) throw Error(Error::TYPE_NOTREADY); - + add_action_front(action); - return; + return; } else if(value_desc.parent_is_linkable_value_node()) { Action::Handle action(ValueNodeLinkDisconnect::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("index",value_desc.get_index()); action->set_param("time",time); - + assert(action->is_ready()); if(!action->is_ready()) throw Error(Error::TYPE_NOTREADY); - + add_action_front(action); - return; + return; } else if(value_desc.parent_is_layer_param()) { Action::Handle action(LayerParamDisconnect::create()); - + action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("layer",value_desc.get_layer()); action->set_param("param",value_desc.get_param_name()); action->set_param("time",time); - - assert(action->is_ready()); + + assert(action->is_ready()); if(!action->is_ready()) throw Error(Error::TYPE_NOTREADY); - + add_action_front(action); - return; + return; } - - throw Error(_("ValueDesc is not recognised or supported.")); + + throw Error(_("ValueDesc is not recognized or supported.")); }