X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Factivepointsimpleadd.cpp;h=049a9bdb1d469ab9135b4356be51500512a669c6;hb=fc62d51d61bc6ca78c9e96eb2974e3adfcc4468d;hp=940efb85c7cf86e93d228aeb5045366d5703363b;hpb=dee84efa006428fdfbf0e84b66ee94eb23113ad9;p=synfig.git diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointsimpleadd.cpp b/synfig-studio/trunk/src/synfigapp/actions/activepointsimpleadd.cpp index 940efb8..049a9bd 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/activepointsimpleadd.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/activepointsimpleadd.cpp @@ -2,7 +2,7 @@ /*! \file activepointsimpleadd.cpp ** \brief Simple add activepoint File ** -** $Id: activepointsimpleadd.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $ +** $Id$ ** ** \legal ** Copyright (c) 2004 Adrian Bentley @@ -32,6 +32,8 @@ #include "activepointsimpleadd.h" #include +#include + #endif using namespace std; @@ -44,12 +46,12 @@ using namespace Action; ACTION_INIT(Action::ActivepointSimpleAdd); ACTION_SET_NAME(Action::ActivepointSimpleAdd,"waypoint_simpleadd"); -ACTION_SET_LOCAL_NAME(Action::ActivepointSimpleAdd,"Simply Add Waypoint"); +ACTION_SET_LOCAL_NAME(Action::ActivepointSimpleAdd,N_("Simply Add Waypoint")); ACTION_SET_TASK(Action::ActivepointSimpleAdd,"add"); ACTION_SET_CATEGORY(Action::ActivepointSimpleAdd,Action::CATEGORY_WAYPOINT); ACTION_SET_PRIORITY(Action::ActivepointSimpleAdd,0); ACTION_SET_VERSION(Action::ActivepointSimpleAdd,"0.0"); -ACTION_SET_CVS_ID(Action::ActivepointSimpleAdd,"$Id: activepointsimpleadd.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $"); +ACTION_SET_CVS_ID(Action::ActivepointSimpleAdd,"$Id$"); /* === G L O B A L S ======================================================= */ @@ -67,7 +69,7 @@ Action::ParamVocab Action::ActivepointSimpleAdd::get_param_vocab() { ParamVocab ret(Action::CanvasSpecific::get_param_vocab()); - + ret.push_back(ParamDesc("value_desc",Param::TYPE_VALUEDESC) .set_local_name(_("Destination ValueNode (Animated)")) ); @@ -100,23 +102,23 @@ Action::ActivepointSimpleAdd::set_param(const synfig::String& name, const Action if(name=="value_desc" && param.get_type()==Param::TYPE_VALUEDESC) { ValueDesc value_desc(param.get_value_desc()); - + if(!value_desc.parent_is_value_node()) return false; - + value_node=ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_parent_value_node()); - + if(!value_node) return false; - + index=value_desc.get_index(); - + return true; } if(name=="activepoint" && param.get_type()==Param::TYPE_ACTIVEPOINT) { activepoint = param.get_activepoint(); - + return true; } @@ -133,11 +135,11 @@ Action::ActivepointSimpleAdd::is_ready()const void Action::ActivepointSimpleAdd::perform() -{ +{ //remove any pretenders that lie at our destination ValueNode_DynamicList::ListEntry::findresult iter = value_node->list[index] .find_time(activepoint.get_time()); - + time_overwrite = false; if(iter.second) { @@ -145,13 +147,13 @@ Action::ActivepointSimpleAdd::perform() time_overwrite = true; value_node->list[index].erase(overwritten_ap); } - + //add the value node in since it's safe value_node->list[index].add(activepoint); - + //sort them... value_node->list[index].timing_info.sort(); - + // Signal that a valuenode has been changed value_node->changed(); } @@ -161,23 +163,23 @@ Action::ActivepointSimpleAdd::undo() { //remove our old version... ValueNode_DynamicList::ListEntry::findresult iter = value_node->list[index].find_uid(activepoint); - + if(!iter.second) { throw Error(_("The activepoint to remove no longer exists")); } - + //remove the offending value value_node->list[index].erase(*iter.first); //could also just use waypoint - + if(time_overwrite) { - value_node->list[index].add(overwritten_ap); + value_node->list[index].add(overwritten_ap); } - + //sort them... value_node->list[index].timing_info.sort(); - + // Signal that a valuenode has been changed value_node->changed(); }