Remove .gitignore do nothing is ignored.
[synfig.git] / synfig-studio / trunk / src / synfigapp / actions / waypointremove.cpp
index f3b71c3..4374cdc 100644 (file)
@@ -2,19 +2,20 @@
 /*!    \file waypointremove.cpp
 **     \brief Template File
 **
-**     $Id: waypointremove.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
 */
 /* ========================================================================= */
@@ -31,6 +32,8 @@
 #include "waypointremove.h"
 #include <synfigapp/canvasinterface.h>
 
+#include <synfigapp/general.h>
+
 #endif
 
 using namespace std;
@@ -42,13 +45,13 @@ using namespace Action;
 /* === M A C R O S ========================================================= */
 
 ACTION_INIT(Action::WaypointRemove);
-ACTION_SET_NAME(Action::WaypointRemove,"waypoint_remove");
-ACTION_SET_LOCAL_NAME(Action::WaypointRemove,"Remove Waypoint");
+ACTION_SET_NAME(Action::WaypointRemove,"WaypointRemove");
+ACTION_SET_LOCAL_NAME(Action::WaypointRemove,N_("Remove Waypoint"));
 ACTION_SET_TASK(Action::WaypointRemove,"remove");
 ACTION_SET_CATEGORY(Action::WaypointRemove,Action::CATEGORY_WAYPOINT);
 ACTION_SET_PRIORITY(Action::WaypointRemove,0);
 ACTION_SET_VERSION(Action::WaypointRemove,"0.0");
-ACTION_SET_CVS_ID(Action::WaypointRemove,"$Id: waypointremove.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $");
+ACTION_SET_CVS_ID(Action::WaypointRemove,"$Id$");
 
 /* === G L O B A L S ======================================================= */
 
@@ -66,7 +69,7 @@ Action::ParamVocab
 Action::WaypointRemove::get_param_vocab()
 {
        ParamVocab ret(Action::CanvasSpecific::get_param_vocab());
-       
+
        ret.push_back(ParamDesc("value_node",Param::TYPE_VALUENODE)
                .set_local_name(_("ValueNode (Animated)"))
        );
@@ -80,9 +83,9 @@ Action::WaypointRemove::get_param_vocab()
 }
 
 bool
-Action::WaypointRemove::is_canidate(const ParamList &x)
+Action::WaypointRemove::is_candidate(const ParamList &x)
 {
-       return canidate_check(get_param_vocab(),x);
+       return candidate_check(get_param_vocab(),x);
 }
 
 bool
@@ -91,13 +94,13 @@ Action::WaypointRemove::set_param(const synfig::String& name, const Action::Para
        if(name=="value_node" && param.get_type()==Param::TYPE_VALUENODE)
        {
                value_node=ValueNode_Animated::Handle::cast_dynamic(param.get_value_node());
-               
+
                return static_cast<bool>(value_node);
        }
        if(name=="waypoint" && param.get_type()==Param::TYPE_WAYPOINT)
        {
                waypoint=param.get_waypoint();
-               
+
                return true;
        }
 
@@ -114,7 +117,7 @@ Action::WaypointRemove::is_ready()const
 
 void
 Action::WaypointRemove::perform()
-{      
+{
        WaypointList::iterator iter(value_node->find(waypoint));
 
        if((UniqueID)*iter!=(UniqueID)waypoint)
@@ -122,9 +125,9 @@ Action::WaypointRemove::perform()
 
        if(iter->get_time()!=waypoint.get_time())
                throw Error(_("Time mismatch iter=%s, waypoint=%s"),iter->get_time().get_string().c_str(),waypoint.get_time().get_string().c_str());
-       
+
        waypoint=*iter;
-       
+
        value_node->erase(waypoint);
 
        // In this case, we need to convert this to a
@@ -137,10 +140,20 @@ Action::WaypointRemove::perform()
                        if(!value_node_ref)
                                throw Error(_("Unable to create ValueNode_Reference"));
                }
-               
+
+               // fix 2256600 (and 2321845) : deleting the last waypoint of an exported valuenode unexported it
+               // if the waypoint's value isn't exported, set its id to be the id of the parent node
+               if (value_node_ref->get_id() == "" && value_node->get_id() != "")
+               {
+                       const String id(value_node->get_id());
+                       Canvas::LooseHandle canvas(value_node->get_parent_canvas());
+                       canvas->remove_value_node(value_node);
+                       canvas->add_value_node(value_node_ref, id);
+               }
+
                value_node->replace(value_node_ref);
                value_node->waypoint_list().clear();
-               
+
                if(get_canvas_interface())
                {
                        get_canvas_interface()->signal_value_node_replaced()(value_node,value_node_ref);
@@ -157,11 +170,19 @@ Action::WaypointRemove::undo()
        {
                if(value_node->waypoint_list().size()!=0)
                        throw Error(_("This animated value node should be empty, but for some reason it isn't. This is a bug. (1)"));
-               
+
+               if (value_node->get_id() == "" && value_node_ref->get_id() != "")
+               {
+                       const String id(value_node_ref->get_id());
+                       Canvas::LooseHandle canvas(value_node_ref->get_parent_canvas());
+                       canvas->remove_value_node(value_node_ref);
+                       canvas->add_value_node(value_node, id);
+               }
+
                value_node_ref->replace(value_node);
-               
+
                waypoint.set_value_node(value_node_ref);
-               
+
                if(get_canvas_interface())
                        get_canvas_interface()->signal_value_node_replaced()(value_node_ref,value_node);
 
@@ -172,14 +193,14 @@ Action::WaypointRemove::undo()
        if(value_node->waypoint_list().size()!=0)
        {
                try { value_node->find(waypoint.get_time()); throw Error(_("A Waypoint already exists at this point in time"));}
-               catch(synfig::Exception::NotFound) { }  
-               
+               catch(synfig::Exception::NotFound) { }
+
                try { if(value_node->find(waypoint)!=value_node->waypoint_list().end()) throw Error(_("This waypoint is already in the ValueNode"));}
-               catch(synfig::Exception::NotFound) { }  
+               catch(synfig::Exception::NotFound) { }
        }
-       
+
        value_node->add(waypoint);
-       
+
 /*_if(get_canvas_interface())
        {
                get_canvas_interface()->signal_value_node_changed()(value_node);