X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fvaluedescconvert.cpp;h=2230cf93a5a5e0cf8321db9e01f5e110d610ff20;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=4aa59ef27725aba290e779ab5b570351a548b9a0;hpb=ce408de81ca266b1f334ee9bc6c8fb7ba1492ed4;p=synfig.git diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescconvert.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescconvert.cpp index 4aa59ef..2230cf9 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuedescconvert.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescconvert.cpp @@ -2,10 +2,11 @@ /*! \file valuedescconvert.cpp ** \brief Template File ** -** $Id: valuedescconvert.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) 2007, 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 @@ -42,6 +43,8 @@ #include #include +#include + #endif using namespace std; @@ -52,14 +55,14 @@ using namespace Action; /* === M A C R O S ========================================================= */ -ACTION_INIT(Action::ValueDescConvert); -ACTION_SET_NAME(Action::ValueDescConvert,"value_desc_convert"); -ACTION_SET_LOCAL_NAME(Action::ValueDescConvert,"Convert"); +ACTION_INIT_NO_GET_LOCAL_NAME(Action::ValueDescConvert); +ACTION_SET_NAME(Action::ValueDescConvert,"ValueDescConvert"); +ACTION_SET_LOCAL_NAME(Action::ValueDescConvert,N_("Convert")); ACTION_SET_TASK(Action::ValueDescConvert,"convert"); ACTION_SET_CATEGORY(Action::ValueDescConvert,Action::CATEGORY_VALUEDESC); ACTION_SET_PRIORITY(Action::ValueDescConvert,0); ACTION_SET_VERSION(Action::ValueDescConvert,"0.0"); -ACTION_SET_CVS_ID(Action::ValueDescConvert,"$Id: valuedescconvert.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $"); +ACTION_SET_CVS_ID(Action::ValueDescConvert,"$Id$"); /* === G L O B A L S ======================================================= */ @@ -69,13 +72,23 @@ ACTION_SET_CVS_ID(Action::ValueDescConvert,"$Id: valuedescconvert.cpp,v 1.1.1.1 Action::ValueDescConvert::ValueDescConvert() { + time=(Time::begin()-1); +} + +synfig::String +Action::ValueDescConvert::get_local_name()const +{ + // TRANSLATORS: This is used in the 'history' dialog when a ValueNode is converted. The first %s is what is converted, the 2nd is the local name of the ValueNode's type. + return strprintf(_("Convert '%s' to ValueNode type '%s'"), + value_desc.get_description().c_str(), + LinkableValueNode::book()[type].local_name.c_str()); } Action::ParamVocab Action::ValueDescConvert::get_param_vocab() { ParamVocab ret(Action::CanvasSpecific::get_param_vocab()); - + ret.push_back(ParamDesc("value_desc",Param::TYPE_VALUEDESC) .set_local_name(_("ValueDesc")) ); @@ -84,14 +97,18 @@ Action::ValueDescConvert::get_param_vocab() .set_local_name(_("Type")) .set_desc(_("The type of ValueNode that you want to be converted to")) ); - + + ret.push_back(ParamDesc("time",Param::TYPE_TIME) + .set_local_name(_("Time")) + ); + return ret; } bool -Action::ValueDescConvert::is_canidate(const ParamList &x) +Action::ValueDescConvert::is_candidate(const ParamList &x) { - return canidate_check(get_param_vocab(),x); + return candidate_check(get_param_vocab(),x); } bool @@ -100,14 +117,21 @@ Action::ValueDescConvert::set_param(const synfig::String& name, const Action::Pa if(name=="value_desc" && param.get_type()==Param::TYPE_VALUEDESC) { value_desc=param.get_value_desc(); - + return true; } if(name=="type" && param.get_type()==Param::TYPE_STRING) { type=param.get_string(); - + + return true; + } + + if(name=="time" && param.get_type()==Param::TYPE_TIME) + { + time=param.get_time(); + return true; } @@ -119,6 +143,11 @@ Action::ValueDescConvert::is_ready()const { if(!value_desc || type.empty()) return false; + if(time==(Time::begin()-1)) + { + synfig::error("Missing time"); + return false; + } return Action::CanvasSpecific::is_ready(); } @@ -128,25 +157,25 @@ Action::ValueDescConvert::prepare() clear(); ValueBase value; - + if(value_desc.is_const()) value=value_desc.get_value(); else if(value_desc.is_value_node()) - value=(*value_desc.get_value_node())(0); + value=(*value_desc.get_value_node())(time); else throw Error(_("Unable to decipher ValueDesc (Bug?)")); - + ValueNode::Handle src_value_node(LinkableValueNode::create(type,value)); if(!src_value_node) throw Error(_("Unable to create new value node")); - + ValueNode::Handle dest_value_node; dest_value_node=value_desc.get_value_node(); Action::Handle action(ValueDescConnect::create()); - + action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("src",src_value_node); @@ -159,67 +188,67 @@ Action::ValueDescConvert::prepare() add_action_front(action); /* - return; + return; + - if(value_desc.parent_is_canvas()) - { + { ValueNode::Handle dest_value_node; dest_value_node=value_desc.get_value_node(); 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",dest_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(ValueNodeLinkConnect::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("value_node", src_value_node); action->set_param("index",value_desc.get_index()); - + 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(LayerParamConnect::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("value_node",src_value_node); - - 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.")); */ }