X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fvaluedescconvert.cpp;h=2d894a3fe8fe25761d8e4de5cd6492831aae5e96;hb=a7b9e100b09a63f59982eb6b2c6d1529a9a2993d;hp=acfef982efbfd4021333a3eedb058e8faf362d05;hpb=bd8367952ea2be0ab1e94922922409bf5f9a0be8;p=synfig.git diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescconvert.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescconvert.cpp index acfef98..2d894a3 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuedescconvert.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescconvert.cpp @@ -42,6 +42,8 @@ #include #include +#include + #endif using namespace std; @@ -54,7 +56,7 @@ using namespace Action; ACTION_INIT(Action::ValueDescConvert); ACTION_SET_NAME(Action::ValueDescConvert,"value_desc_convert"); -ACTION_SET_LOCAL_NAME(Action::ValueDescConvert,"Convert"); +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); @@ -69,6 +71,7 @@ ACTION_SET_CVS_ID(Action::ValueDescConvert,"$Id$"); Action::ValueDescConvert::ValueDescConvert() { + time=(Time::begin()-1); } Action::ParamVocab @@ -85,6 +88,10 @@ Action::ValueDescConvert::get_param_vocab() .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; } @@ -111,6 +118,13 @@ Action::ValueDescConvert::set_param(const synfig::String& name, const Action::Pa return true; } + if(name=="time" && param.get_type()==Param::TYPE_TIME) + { + time=param.get_time(); + + return true; + } + return Action::CanvasSpecific::set_param(name,param); } @@ -119,6 +133,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(); } @@ -132,7 +151,7 @@ Action::ValueDescConvert::prepare() 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?)"));