Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-studio / trunk / src / synfigapp / actions / keyframesetdelta.cpp

diff --git a/synfig-studio/trunk/src/synfigapp/actions/keyframesetdelta.cpp b/synfig-studio/trunk/src/synfigapp/actions/keyframesetdelta.cpp
index 1ce46bd..6cd262a 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/actions/keyframesetdelta.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/keyframesetdelta.cpp
@@ -1,20 +1,21 @@
 /* === S Y N F I G ========================================================= */
-/*!    \file keyframeset.cpp
+/*!    \file keyframesetdelta.cpp
 **     \brief Template File
 **
-**     $Id: keyframesetdelta.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $
+**     $Id$
 **
 **     \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
 */
 /* ========================================================================= */
@@ -35,6 +36,8 @@
 #include "activepointsetsmart.h"
 #include "waypointsetsmart.h"
 
+#include <synfigapp/general.h>
+
 #endif
 
 using namespace std;
@@ -46,13 +49,13 @@ using namespace Action;
 /* === M A C R O S ========================================================= */
 
 ACTION_INIT(Action::KeyframeSetDelta);
-ACTION_SET_NAME(Action::KeyframeSetDelta,"keyframe_set_delta");
-ACTION_SET_LOCAL_NAME(Action::KeyframeSetDelta,"Set Keyframe Delta");
+ACTION_SET_NAME(Action::KeyframeSetDelta,"KeyframeSetDelta");
+ACTION_SET_LOCAL_NAME(Action::KeyframeSetDelta,N_("Set Keyframe Delta"));
 ACTION_SET_TASK(Action::KeyframeSetDelta,"set");
 ACTION_SET_CATEGORY(Action::KeyframeSetDelta,Action::CATEGORY_KEYFRAME|Action::CATEGORY_HIDDEN);
 ACTION_SET_PRIORITY(Action::KeyframeSetDelta,0);
 ACTION_SET_VERSION(Action::KeyframeSetDelta,"0.0");
-ACTION_SET_CVS_ID(Action::KeyframeSetDelta,"$Id: keyframesetdelta.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $");
+ACTION_SET_CVS_ID(Action::KeyframeSetDelta,"$Id$");
 
 /* === G L O B A L S ======================================================= */
 
@@ -71,7 +74,7 @@ Action::ParamVocab
 Action::KeyframeSetDelta::get_param_vocab()
 {
        ParamVocab ret(Action::CanvasSpecific::get_param_vocab());
-       
+
        ret.push_back(ParamDesc("keyframe",Param::TYPE_KEYFRAME)
                .set_local_name(_("Keyframe"))
        );
@@ -83,9 +86,9 @@ Action::KeyframeSetDelta::get_param_vocab()
 }
 
 bool
-Action::KeyframeSetDelta::is_canidate(const ParamList &x)
+Action::KeyframeSetDelta::is_candidate(const ParamList &x)
 {
-       return canidate_check(get_param_vocab(),x);
+       return candidate_check(get_param_vocab(),x);
 }
 
 bool
@@ -120,21 +123,20 @@ Action::KeyframeSetDelta::prepare()
        value_desc_list.clear();
        get_canvas_interface()->find_important_value_descs(value_desc_list);
 
-       
+
        Time time(get_canvas()->keyframe_list().find(keyframe)->get_time());
-       
+
        std::vector<synfigapp::ValueDesc>::iterator iter;
-               DEBUGPOINT();
        for(iter=value_desc_list.begin();iter!=value_desc_list.end();++iter)
        {
                ValueDesc& value_desc(*iter);
                ValueNode_Animated::Handle value_node(
                        ValueNode_Animated::Handle::cast_dynamic(value_desc.get_value_node())
                );
-               
+
                if(!value_node)
                        continue;
-               
+
                try{
                        value_node->find(time);
                        // if we got to this point, then we know that
@@ -151,8 +153,8 @@ Action::KeyframeSetDelta::prepare()
                                continue;
                        }
                }
-               Action::Handle action(Action::create("waypoint_set_smart"));
-               
+               Action::Handle action(Action::create("WaypointSetSmart"));
+
                action->set_param("canvas",get_canvas());
                action->set_param("canvas_interface",get_canvas_interface());
                action->set_param("value_node",ValueNode::Handle::cast_static(value_node));
@@ -162,8 +164,8 @@ Action::KeyframeSetDelta::prepare()
                assert(action->is_ready());
                if(!action->is_ready())
                        throw Error(Error::TYPE_NOTREADY);
-       
-               add_action(action);                                             
+
+               add_action(action);
        }
 }
 
@@ -173,11 +175,14 @@ Action::KeyframeSetDelta::perform()
        if(!delta)
                return;
        Action::Super::perform();
-       
+
 //     Time location(keyframe.get_time());
-       Time location(get_canvas()->keyframe_list().find(keyframe)->get_time());        
-       Time delta(delta);
-       
+       Time location(get_canvas()->keyframe_list().find(keyframe)->get_time());
+//     This line sets delta to 0s regardless to any previous value of delta.
+//     I think it was here for symmetry to the undo() operation.
+//     It was causing that the Set delta operation was faulty. Now works!
+//     Time delta(delta);
+
        get_canvas()->keyframe_list().insert_time(location,delta);
 
        std::vector<synfigapp::ValueDesc>::iterator iter;
@@ -217,11 +222,11 @@ Action::KeyframeSetDelta::undo()
 {
        if(!delta)
                return;
-       
+
 //     Time location(keyframe.get_time());
-       Time location(get_canvas()->keyframe_list().find(keyframe)->get_time());        
+       Time location(get_canvas()->keyframe_list().find(keyframe)->get_time());
        Time delta(-delta);
-       
+
        get_canvas()->keyframe_list().insert_time(location,delta);
 
        std::vector<synfigapp::ValueDesc>::iterator iter;