X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fvaluedescdisconnect.cpp;h=2efc2e61122e8e276835f1e79028ed351ec82e2d;hb=c34eaa5441242b3e9a7b7645e9ee4983d14eae85;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..2efc2e6 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp @@ -71,7 +71,7 @@ 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,14 +80,14 @@ 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()); if(!value_desc.parent_is_canvas() && value_desc.is_value_node() && value_desc.get_value_node()->rcount()>1) @@ -107,14 +107,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 +135,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 recognised or supported.")); }