X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fkeyframeadd.cpp;h=0c96edbb21b27900237288750f8e98b875a7b2b3;hb=c34eaa5441242b3e9a7b7645e9ee4983d14eae85;hp=4ec09b6e8b2fa8048e6117e513adea967888f8f8;hpb=02252941b29de64037116f4d37991a38d9ff0d94;p=synfig.git diff --git a/synfig-studio/trunk/src/synfigapp/actions/keyframeadd.cpp b/synfig-studio/trunk/src/synfigapp/actions/keyframeadd.cpp index 4ec09b6..0c96edb 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/keyframeadd.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/keyframeadd.cpp @@ -5,16 +5,17 @@ ** $Id: keyframeadd.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $ ** ** \legal -** Copyright (c) 2002 Robert B. Quattlebaum Jr. +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley ** -** This software and associated documentation -** are CONFIDENTIAL and PROPRIETARY property of -** the above-mentioned copyright holder. +** This package is free software; you can redistribute it and/or +** modify it under the terms of the GNU General Public License as +** published by the Free Software Foundation; either version 2 of +** the License, or (at your option) any later version. ** -** You may not copy, print, publish, or in any -** other way distribute this software without -** a prior written agreement with -** the copyright holder. +** This package is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. ** \endlegal */ /* ========================================================================= */ @@ -66,7 +67,7 @@ Action::ParamVocab Action::KeyframeAdd::get_param_vocab() { ParamVocab ret(Action::CanvasSpecific::get_param_vocab()); - + ret.push_back(ParamDesc("keyframe",Param::TYPE_KEYFRAME) .set_local_name(_("New Keyframe")) .set_desc(_("Keyframe to be added")) @@ -76,11 +77,11 @@ Action::KeyframeAdd::get_param_vocab() } bool -Action::KeyframeAdd::is_canidate(const ParamList &x) +Action::KeyframeAdd::is_candidate(const ParamList &x) { - if(!canidate_check(get_param_vocab(),x)) + if(!candidate_check(get_param_vocab(),x)) return false; - + return true; } @@ -90,7 +91,7 @@ Action::KeyframeAdd::set_param(const synfig::String& name, const Action::Param & if(name=="keyframe" && param.get_type()==Param::TYPE_KEYFRAME) { keyframe=param.get_keyframe(); - + return true; } @@ -107,15 +108,15 @@ Action::KeyframeAdd::is_ready()const void Action::KeyframeAdd::perform() -{ +{ 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) { } + get_canvas()->keyframe_list().add(keyframe); - + if(get_canvas_interface()) { get_canvas_interface()->signal_keyframe_added()(keyframe); @@ -132,5 +133,5 @@ Action::KeyframeAdd::undo() } else synfig::warning("CanvasInterface not set on action"); - get_canvas()->keyframe_list().erase(keyframe); + get_canvas()->keyframe_list().erase(keyframe); }