Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp
index c703b6d..9d1c457 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp
@@ -6,6 +6,7 @@
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2008 Chris Moore
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -30,6 +31,7 @@
 #endif
 
 #include "layerparamdisconnect.h"
+#include "waypointdisconnect.h"
 #include "valuenodelinkdisconnect.h"
 #include "valuenodereplace.h"
 
@@ -51,7 +53,7 @@ using namespace Action;
 /* === M A C R O S ========================================================= */
 
 ACTION_INIT_NO_GET_LOCAL_NAME(Action::ValueDescDisconnect);
-ACTION_SET_NAME(Action::ValueDescDisconnect,"value_desc_disconnect");
+ACTION_SET_NAME(Action::ValueDescDisconnect,"ValueDescDisconnect");
 ACTION_SET_LOCAL_NAME(Action::ValueDescDisconnect,N_("Disconnect"));
 ACTION_SET_TASK(Action::ValueDescDisconnect,"disconnect");
 ACTION_SET_CATEGORY(Action::ValueDescDisconnect,Action::CATEGORY_VALUEDESC);
@@ -100,28 +102,27 @@ Action::ValueDescDisconnect::get_param_vocab()
 bool
 Action::ValueDescDisconnect::is_candidate(const ParamList &x)
 {
-       if(candidate_check(get_param_vocab(),x))
-       {
-               ValueDesc value_desc(x.find("value_desc")->second.get_value_desc());
-
-               // don't allow the Index parameter of the Duplicate layer to be disconnected
-               if(value_desc.parent_is_layer_param() && value_desc.get_layer()->get_name() == "duplicate" && value_desc.get_param_name() == "index")
-                       return false;
-               if(!value_desc.parent_is_canvas() && value_desc.is_value_node() && value_desc.get_value_node()->rcount()>1)
-                       return true;
-               if(value_desc.is_const())
-                       return false;
-               if(value_desc.is_value_node() && ValueNode_Const::Handle::cast_dynamic(value_desc.get_value_node()))
-                       return false;
-               // don't allow Duplicate ValueNodes in the Children dialog to be disconnected
-               if(value_desc.is_value_node() &&
-                  ValueNode_Duplicate::Handle::cast_dynamic(value_desc.get_value_node()) &&
-                  !value_desc.parent_is_layer_param() &&
-                  !value_desc.parent_is_value_node())
-                       return false;
+       if (!candidate_check(get_param_vocab(),x))
+               return false;
+
+       ValueDesc value_desc(x.find("value_desc")->second.get_value_desc());
+
+       // don't allow the Index parameter of the Duplicate layer to be disconnected
+       if(value_desc.parent_is_layer_param() && value_desc.get_layer()->get_name() == "duplicate" && value_desc.get_param_name() == "index")
+               return false;
+       if(!value_desc.parent_is_canvas() && value_desc.is_value_node() && value_desc.get_value_node()->rcount()>1)
                return true;
-       }
-       return false;
+       if(value_desc.is_const())
+               return false;
+       if(value_desc.is_value_node() && ValueNode_Const::Handle::cast_dynamic(value_desc.get_value_node()))
+               return false;
+       // don't allow Duplicate ValueNodes in the Children dialog to be disconnected
+       if(value_desc.is_value_node() &&
+          ValueNode_Duplicate::Handle::cast_dynamic(value_desc.get_value_node()) &&
+          !value_desc.parent_is_layer_param() &&
+          !value_desc.parent_is_value_node())
+               return false;
+       return true;
 }
 
 bool
@@ -177,6 +178,24 @@ Action::ValueDescDisconnect::prepare()
                return;
        }
        else
+       if(value_desc.parent_is_waypoint())
+       {
+               Action::Handle action(WaypointDisconnect::create());
+
+               action->set_param("canvas",get_canvas());
+               action->set_param("canvas_interface",get_canvas_interface());
+               action->set_param("parent_value_node",value_desc.get_parent_value_node());
+               action->set_param("waypoint_time",value_desc.get_waypoint_time());
+               action->set_param("time",time);
+
+               assert(action->is_ready());
+               if(!action->is_ready())
+                       throw Error(Error::TYPE_NOTREADY);
+
+               add_action_front(action);
+               return;
+       }
+       else
        if(value_desc.parent_is_linkable_value_node())
        {
                Action::Handle action(ValueNodeLinkDisconnect::create());