Remove .gitignore do nothing is ignored.
[synfig.git] / synfig-studio / trunk / src / synfigapp / actions / keyframeset.cpp
index bfbee21..f18897b 100644 (file)
@@ -2,7 +2,7 @@
 /*!    \file keyframeset.cpp
 **     \brief Template File
 **
-**     $Id: keyframeset.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 "activepointsetsmart.h"
 #include "waypointsetsmart.h"
 
+#include <synfigapp/general.h>
+
 #endif
 
 using namespace std;
@@ -47,13 +49,13 @@ using namespace Action;
 /* === M A C R O S ========================================================= */
 
 ACTION_INIT(Action::KeyframeSet);
-ACTION_SET_NAME(Action::KeyframeSet,"keyframe_set");
-ACTION_SET_LOCAL_NAME(Action::KeyframeSet,"Set Keyframe");
+ACTION_SET_NAME(Action::KeyframeSet,"KeyframeSet");
+ACTION_SET_LOCAL_NAME(Action::KeyframeSet,N_("Set Keyframe"));
 ACTION_SET_TASK(Action::KeyframeSet,"set");
 ACTION_SET_CATEGORY(Action::KeyframeSet,Action::CATEGORY_KEYFRAME|Action::CATEGORY_HIDDEN);
 ACTION_SET_PRIORITY(Action::KeyframeSet,0);
 ACTION_SET_VERSION(Action::KeyframeSet,"0.0");
-ACTION_SET_CVS_ID(Action::KeyframeSet,"$Id: keyframeset.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $");
+ACTION_SET_CVS_ID(Action::KeyframeSet,"$Id$");
 
 /* === G L O B A L S ======================================================= */
 
@@ -71,7 +73,7 @@ Action::ParamVocab
 Action::KeyframeSet::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"))
@@ -81,9 +83,9 @@ Action::KeyframeSet::get_param_vocab()
 }
 
 bool
-Action::KeyframeSet::is_canidate(const ParamList &x)
+Action::KeyframeSet::is_candidate(const ParamList &x)
 {
-       return canidate_check(get_param_vocab(),x);
+       return candidate_check(get_param_vocab(),x);
 }
 
 bool
@@ -95,7 +97,7 @@ Action::KeyframeSet::set_param(const synfig::String& name, const Action::Param &
                keyframe=param.get_keyframe();
                synfig::info("KeyframeSet::set_param():new_time: %s",keyframe.get_time().get_string().c_str());
                synfig::info("KeyframeSet::set_param():get_keyframe(): %s",param.get_keyframe().get_time().get_string().c_str());
-               
+
                return true;
        }
 
@@ -115,19 +117,19 @@ Action::KeyframeSet::prepare()
 {
        clear();
        guid_set.clear();
-       
-       
 
-       
-       
+
+
+
+
        //synfig::info("new_time: %s",new_time.get_string().c_str());
        //synfig::info("old_time: %s",old_time.get_string().c_str());
-       
+
        try { if(get_canvas()->keyframe_list().find(new_time)!=get_canvas()->keyframe_list().end()) throw Error(_("A Keyframe already exists at this point in time"));}
-       catch(...) { }  
+       catch(...) { }
 
 
-       // If the times are different, then we 
+       // If the times are different, then we
        // will need to romp through the valuenodes
        // and add actions to update their values.
        if(new_time!=old_time)
@@ -145,14 +147,14 @@ Action::KeyframeSet::prepare()
 #define old_2_new(x)   (((x)-old_begin)/(old_end-old_begin)*(new_end-new_begin)+new_begin)
 
 int
-Action::KeyframeSet::scale_activepoints(const synfigapp::ValueDesc& value_desc,const Time& old_begin,const Time& old_end,const Time& new_begin,const Time& new_end)
+Action::KeyframeSet::scale_activepoints(const synfigapp::ValueDesc& value_desc,const synfig::Time& old_begin,const synfig::Time& old_end,const synfig::Time& new_begin,const synfig::Time& new_end)
 {
        ValueNode_DynamicList::Handle value_node(ValueNode_DynamicList::Handle::cast_static(value_desc.get_parent_value_node()));
        ValueNode_DynamicList::ListEntry& list_entry(value_node->list[value_desc.get_index()]);
-       
+
        std::vector<Activepoint*> selected;
        std::vector<Activepoint*>::iterator iter;
-       
+
        if(list_entry.find(old_begin,old_end,selected))
        {
                // check to make sure this operation is OK
@@ -170,18 +172,18 @@ Action::KeyframeSet::scale_activepoints(const synfigapp::ValueDesc& value_desc,c
                        }
                        catch(Exception::NotFound) { }
                }
-               
+
                int ret(0);
                while(!selected.empty())
                {
                        if(selected.back()->get_time()!=old_2_new(selected.back()->get_time()))
                        {
-                               Action::Handle action(Action::create("activepoint_set"));
-                               
+                               Action::Handle action(Action::create("ActivepointSet"));
+
                                action->set_param("canvas",get_canvas());
                                action->set_param("canvas_interface",get_canvas_interface());
                                action->set_param("value_desc",value_desc);
-                               
+
                                Activepoint activepoint(*selected.back());
                                activepoint.set_time(old_2_new(selected.back()->get_time()));
 
@@ -190,8 +192,8 @@ Action::KeyframeSet::scale_activepoints(const synfigapp::ValueDesc& value_desc,c
                                assert(action->is_ready());
                                if(!action->is_ready())
                                        throw Error(Error::TYPE_NOTREADY);
-                       
-                               add_action_front(action);                                               
+
+                               add_action_front(action);
 
                                ret++;
                        }
@@ -203,13 +205,13 @@ Action::KeyframeSet::scale_activepoints(const synfigapp::ValueDesc& value_desc,c
 }
 
 int
-Action::KeyframeSet::scale_waypoints(const synfigapp::ValueDesc& value_desc,const Time& old_begin,const Time& old_end,const Time& new_begin,const Time& new_end)
+Action::KeyframeSet::scale_waypoints(const synfigapp::ValueDesc& value_desc,const synfig::Time& old_begin,const synfig::Time& old_end,const synfig::Time& new_begin,const synfig::Time& new_end)
 {
        ValueNode_Animated::Handle value_node(ValueNode_Animated::Handle::cast_static(value_desc.get_value_node()));
-       
+
        std::vector<Waypoint*> selected;
        std::vector<Waypoint*>::iterator iter;
-       
+
        if(value_node->find(old_begin,old_end,selected))
        {
                // check to make sure this operation is OK
@@ -229,18 +231,18 @@ Action::KeyframeSet::scale_waypoints(const synfigapp::ValueDesc& value_desc,cons
                        }
                        catch(Exception::NotFound) { }
                }
-               
+
                int ret(0);
                while(!selected.empty())
                {
                        if(selected.back()->get_time()!=old_2_new(selected.back()->get_time()))
                        {
-                               Action::Handle action(Action::create("waypoint_set"));
-                               
+                               Action::Handle action(Action::create("WaypointSet"));
+
                                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));
-                               
+
                                Waypoint waypoint(*selected.back());
                                waypoint.set_time(old_2_new(selected.back()->get_time()));
 
@@ -249,8 +251,8 @@ Action::KeyframeSet::scale_waypoints(const synfigapp::ValueDesc& value_desc,cons
                                assert(action->is_ready());
                                if(!action->is_ready())
                                        throw Error(Error::TYPE_NOTREADY);
-                       
-                               add_action_front(action);                                               
+
+                               add_action_front(action);
 
                                ret++;
                        }
@@ -263,9 +265,9 @@ Action::KeyframeSet::scale_waypoints(const synfigapp::ValueDesc& value_desc,cons
 
 void
 Action::KeyframeSet::process_value_desc(const synfigapp::ValueDesc& value_desc)
-{      
+{
        if(value_desc.is_value_node())
-       {               
+       {
                ValueNode::Handle value_node(value_desc.get_value_node());
 
                //if(guid_set.count(value_node->get_guid()))
@@ -289,13 +291,13 @@ Action::KeyframeSet::process_value_desc(const synfigapp::ValueDesc& value_desc)
                                        scale_activepoints(value_desc,old_time,keyframe_next,new_time,keyframe_next);
                                }
                                //else
-                               {       
+                               {
                                        Action::Handle action(ActivepointSetSmart::create());
-                                       
+
                                        action->set_param("canvas",get_canvas());
                                        action->set_param("canvas_interface",get_canvas_interface());
                                        action->set_param("value_desc",value_desc);
-                                       
+
                                        Activepoint activepoint;
                                        try
                                        {
@@ -309,11 +311,11 @@ Action::KeyframeSet::process_value_desc(const synfigapp::ValueDesc& value_desc)
                                                activepoint.set_priority(0);
                                        }
                                        action->set_param("activepoint",activepoint);
-       
+
                                        assert(action->is_ready());
                                        if(!action->is_ready())
                                                throw Error(Error::TYPE_NOTREADY);
-                               
+
                                        add_action_front(action);
                                }
                        }
@@ -331,13 +333,13 @@ Action::KeyframeSet::process_value_desc(const synfigapp::ValueDesc& value_desc)
                        //else
                        {
                                ValueNode_Animated::Handle value_node_animated(ValueNode_Animated::Handle::cast_dynamic(value_node));
-                               
+
                                Action::Handle action(WaypointSetSmart::create());
-                               
+
                                action->set_param("canvas",get_canvas());
                                action->set_param("canvas_interface",get_canvas_interface());
                                action->set_param("value_node",ValueNode::Handle(value_node_animated));
-                               
+
                                Waypoint waypoint;
                                try
                                {
@@ -350,11 +352,11 @@ Action::KeyframeSet::process_value_desc(const synfigapp::ValueDesc& value_desc)
                                        waypoint.set_value((*value_node_animated)(old_time));
                                }
                                action->set_param("waypoint",waypoint);
-               
+
                                assert(action->is_ready());
                                if(!action->is_ready())
                                        throw Error(Error::TYPE_NOTREADY);
-                       
+
                                add_action_front(action);
                        }
                }
@@ -368,14 +370,14 @@ Action::KeyframeSet::perform()
 
        old_time=get_canvas()->keyframe_list().find(keyframe)->get_time();
        new_time=keyframe.get_time();
-       
+
        try { get_canvas()->keyframe_list().find(keyframe);}
        catch(synfig::Exception::NotFound)
        {
                throw Error(_("Unable to find the given keyframe"));
-       }       
-       
-       // Check for colisions
+       }
+
+       // Check for collisions
        if(old_time!=new_time)
        {
                try {
@@ -391,7 +393,7 @@ Action::KeyframeSet::perform()
 
        old_keyframe=*get_canvas()->keyframe_list().find(keyframe);
        *get_canvas()->keyframe_list().find(keyframe)=keyframe;
-       
+
        get_canvas()->keyframe_list().sync();
 
        try{
@@ -403,7 +405,7 @@ Action::KeyframeSet::perform()
                get_canvas()->keyframe_list().sync();
                throw;
        }
-       
+
        // Signal that a layer has been inserted
        if(get_canvas_interface())
        {
@@ -420,7 +422,7 @@ Action::KeyframeSet::undo()
        *get_canvas()->keyframe_list().find(old_keyframe)=old_keyframe;
 
        get_canvas()->keyframe_list().sync();
-       
+
        // Signal that a layer has been inserted
        if(get_canvas_interface())
        {