X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Fvaluedescdisconnect.cpp;h=9d1c457692aa2072d89c569de5e612a0643f021d;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=91c58ca7b7c5774ebf9e453023cdb12d0d28ece2;hpb=fcf1f2a99d715f39ca71469145d286d74a8af159;p=synfig.git diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp index 91c58ca..9d1c457 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp @@ -31,6 +31,7 @@ #endif #include "layerparamdisconnect.h" +#include "waypointdisconnect.h" #include "valuenodelinkdisconnect.h" #include "valuenodereplace.h" @@ -52,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); @@ -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());