X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fkeyframeremove.cpp;h=8699b52de6dfdb3de29fc0f257ed56ed781bbc89;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=d6915f56b0ae04c53bd2c23d48b8631fbfe22916;hpb=ce408de81ca266b1f334ee9bc6c8fb7ba1492ed4;p=synfig.git diff --git a/synfig-studio/trunk/src/synfigapp/actions/keyframeremove.cpp b/synfig-studio/trunk/src/synfigapp/actions/keyframeremove.cpp index d6915f5..8699b52 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/keyframeremove.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/keyframeremove.cpp @@ -2,7 +2,7 @@ /*! \file keyframeremove.cpp ** \brief Template File ** -** $Id: keyframeremove.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,8 @@ #include "activepointremove.h" #include "waypointremove.h" +#include + #endif using namespace std; @@ -47,13 +49,13 @@ using namespace Action; /* === M A C R O S ========================================================= */ ACTION_INIT(Action::KeyframeRemove); -ACTION_SET_NAME(Action::KeyframeRemove,"keyframe_remove"); -ACTION_SET_LOCAL_NAME(Action::KeyframeRemove,"Remove Keyframe"); +ACTION_SET_NAME(Action::KeyframeRemove,"KeyframeRemove"); +ACTION_SET_LOCAL_NAME(Action::KeyframeRemove,N_("Remove Keyframe")); ACTION_SET_TASK(Action::KeyframeRemove,"remove"); ACTION_SET_CATEGORY(Action::KeyframeRemove,Action::CATEGORY_KEYFRAME); ACTION_SET_PRIORITY(Action::KeyframeRemove,0); ACTION_SET_VERSION(Action::KeyframeRemove,"0.0"); -ACTION_SET_CVS_ID(Action::KeyframeRemove,"$Id: keyframeremove.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $"); +ACTION_SET_CVS_ID(Action::KeyframeRemove,"$Id$"); /* === G L O B A L S ======================================================= */ @@ -71,7 +73,7 @@ Action::ParamVocab Action::KeyframeRemove::get_param_vocab() { ParamVocab ret(Action::CanvasSpecific::get_param_vocab()); - + ret.push_back(ParamDesc("keyframe",Param::TYPE_KEYFRAME) .set_local_name(_("Keyframe")) .set_desc(_("Keyframe to be removed")) @@ -81,9 +83,9 @@ Action::KeyframeRemove::get_param_vocab() } bool -Action::KeyframeRemove::is_canidate(const ParamList &x) +Action::KeyframeRemove::is_candidate(const ParamList &x) { - return canidate_check(get_param_vocab(),x); + return candidate_check(get_param_vocab(),x); } bool @@ -92,7 +94,7 @@ Action::KeyframeRemove::set_param(const synfig::String& name, const Action::Para if(name=="keyframe" && param.get_type()==Param::TYPE_KEYFRAME) { keyframe=param.get_keyframe(); - + return true; } @@ -116,9 +118,9 @@ Action::KeyframeRemove::prepare() catch(synfig::Exception::NotFound) { throw Error(_("Unable to find the given keyframe")); - } + } + - { std::vector value_desc_list; get_canvas_interface()->find_important_value_descs(value_desc_list); @@ -132,28 +134,28 @@ Action::KeyframeRemove::prepare() void Action::KeyframeRemove::process_value_desc(const synfigapp::ValueDesc& value_desc) -{ +{ const synfig::Time time(keyframe.get_time()); if(value_desc.is_value_node()) { ValueNode::Handle value_node(value_desc.get_value_node()); - + // If we are a dynamic list, then we need to update the ActivePoints if(ValueNode_DynamicList::Handle::cast_dynamic(value_node)) { - ValueNode_DynamicList::Handle value_node(ValueNode_DynamicList::Handle::cast_dynamic(value_node)); + ValueNode_DynamicList::Handle value_node_dynamic(ValueNode_DynamicList::Handle::cast_dynamic(value_node)); int i; - for(i=0;ilink_count();i++) + for(i=0;ilink_count();i++) try { Activepoint activepoint; - activepoint=*value_node->list[i].find(time); + activepoint=*value_node_dynamic->list[i].find(time); - synfigapp::ValueDesc value_desc(value_node,i); + synfigapp::ValueDesc value_desc(value_node_dynamic,i); Action::Handle action(ActivepointRemove::create()); - + action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); action->set_param("value_desc",value_desc); @@ -162,8 +164,8 @@ Action::KeyframeRemove::process_value_desc(const synfigapp::ValueDesc& value_des assert(action->is_ready()); if(!action->is_ready()) throw Error(Error::TYPE_NOTREADY); - - add_action_front(action); + + add_action_front(action); } catch(...) { @@ -172,23 +174,23 @@ Action::KeyframeRemove::process_value_desc(const synfigapp::ValueDesc& value_des else if(ValueNode_Animated::Handle::cast_dynamic(value_node)) try { - ValueNode_Animated::Handle value_node(ValueNode_Animated::Handle::cast_dynamic(value_node)); + ValueNode_Animated::Handle value_node_animated(ValueNode_Animated::Handle::cast_dynamic(value_node)); Waypoint waypoint; - waypoint=*value_node->find(time); + waypoint=*value_node_animated->find(time); assert(waypoint.get_time()==time); - + Action::Handle action(WaypointRemove::create()); - + action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); - action->set_param("value_node",ValueNode::Handle(value_node)); + action->set_param("value_node",ValueNode::Handle(value_node_animated)); action->set_param("waypoint",waypoint); - + assert(action->is_ready()); if(!action->is_ready()) throw Error(Error::TYPE_NOTREADY); - - add_action_front(action); + + add_action_front(action); } catch(...) { @@ -201,29 +203,29 @@ void Action::KeyframeRemove::perform() { Action::Super::perform(); - + if(get_canvas_interface()) { get_canvas_interface()->signal_keyframe_removed()(keyframe); } else synfig::warning("CanvasInterface not set on action"); - get_canvas()->keyframe_list().erase(keyframe); + get_canvas()->keyframe_list().erase(keyframe); } void Action::KeyframeRemove::undo() { try { get_canvas()->keyframe_list().find(keyframe.get_time()); throw Error(_("A Keyframe already exists at this point in time"));} - catch(synfig::Exception::NotFound) { } + catch(synfig::Exception::NotFound) { } try { get_canvas()->keyframe_list().find(keyframe); throw Error(_("This keyframe is already in the ValueNode"));} - catch(synfig::Exception::NotFound) { } + catch(synfig::Exception::NotFound) { } Action::Super::undo(); - + get_canvas()->keyframe_list().add(keyframe); - + if(get_canvas_interface()) { get_canvas_interface()->signal_keyframe_added()(keyframe);