X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Faction.cpp;h=7a982524d00e1f29d4c73070c95a5463afc28778;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=05c5be8801b36f127ce7f769a31a144e57894192;hpb=756c0d29ac1742f231e6615f9a577e574e35a4af;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/action.cpp b/synfig-studio/trunk/src/synfigapp/action.cpp
index 05c5be8..7a98252 100644
--- a/synfig-studio/trunk/src/synfigapp/action.cpp
+++ b/synfig-studio/trunk/src/synfigapp/action.cpp
@@ -68,11 +68,15 @@
 #include "actions/valuedescconnect.h"
 #include "actions/valuedescdisconnect.h"
 #include "actions/valuedesclink.h"
+#include "actions/valuedescblinelink.h"
 
 #include "actions/waypointadd.h"
 #include "actions/waypointset.h"
 #include "actions/waypointsetsmart.h"
 #include "actions/waypointremove.h"
+#include "actions/waypointconnect.h"
+#include "actions/waypointdisconnect.h"
+// #include "actions/waypointsimpleadd.h"
 
 #include "actions/activepointadd.h"
 #include "actions/activepointset.h"
@@ -80,6 +84,7 @@
 #include "actions/activepointsetoff.h"
 #include "actions/activepointseton.h"
 #include "actions/activepointremove.h"
+// #include "actions/activepointsimpleadd.h"
 
 #include "actions/keyframeadd.h"
 #include "actions/keyframeset.h"
@@ -92,6 +97,9 @@
 #include "actions/timepointscopy.h"
 #include "actions/timepointsdelete.h"
 
+#include "actions/canvasdescriptionset.h"
+#include "actions/canvasidset.h"
+#include "actions/canvasnameset.h"
 #include "actions/canvasrenddescset.h"
 #include "actions/canvasadd.h"
 #include "actions/canvasremove.h"
@@ -180,11 +188,15 @@ Action::Main::Main()
 	ADD_ACTION(Action::ValueDescConnect);
 	ADD_ACTION(Action::ValueDescDisconnect);
 	ADD_ACTION(Action::ValueDescLink);
+	ADD_ACTION(Action::ValueDescBLineLink);
 
 	ADD_ACTION(Action::WaypointAdd);
 	ADD_ACTION(Action::WaypointSet);
 	ADD_ACTION(Action::WaypointSetSmart);
 	ADD_ACTION(Action::WaypointRemove);
+	ADD_ACTION(Action::WaypointConnect);
+	ADD_ACTION(Action::WaypointDisconnect);
+//	ADD_ACTION(Action::WaypointSimpleAdd);
 
 	ADD_ACTION(Action::ActivepointAdd);
 	ADD_ACTION(Action::ActivepointSet);
@@ -192,6 +204,7 @@ Action::Main::Main()
 	ADD_ACTION(Action::ActivepointSetOn);
 	ADD_ACTION(Action::ActivepointSetOff);
 	ADD_ACTION(Action::ActivepointRemove);
+//	ADD_ACTION(Action::ActivepointSimpleAdd);
 
 	ADD_ACTION(Action::KeyframeAdd);
 	ADD_ACTION(Action::KeyframeSet);
@@ -200,6 +213,9 @@ Action::Main::Main()
 	ADD_ACTION(Action::KeyframeWaypointSet);
 	ADD_ACTION(Action::KeyframeSetDelta);
 
+	ADD_ACTION(Action::CanvasDescriptionSet);
+	ADD_ACTION(Action::CanvasIdSet);
+	ADD_ACTION(Action::CanvasNameSet);
 	ADD_ACTION(Action::CanvasRendDescSet);
 	ADD_ACTION(Action::CanvasAdd);
 	ADD_ACTION(Action::CanvasRemove);
@@ -210,7 +226,8 @@ Action::Main::Main()
 	ADD_ACTION(Action::BLinePointTangentSplit);
 
 	ADD_ACTION(Action::GradientSet);
-	ADD_ACTION(Action::ColorSet);
+	ADD_ACTION(Action::ColorSetFromOC);
+	ADD_ACTION(Action::ColorSetFromFC);
 
 	ADD_ACTION(Action::TimepointsMove);
 	ADD_ACTION(Action::TimepointsCopy);
@@ -255,12 +272,19 @@ Action::compile_candidate_list(const ParamList& param_list, Category category)
 		if((iter->second.category&category))
 		{
 			if(iter->second.is_candidate(param_list))
+			{
+				//synfig::info("Action \"%s\" is in",iter->second.name.c_str());
 				ret.push_back(iter->second);
+			}
 			else
 			{
 				//synfig::info("Action \"%s\" is not a candidate",iter->second.name.c_str());
 			}
 		}
+		else
+		{
+			//synfig::info("Action \"%s\" has unsuitable category",iter->second.name.c_str());
+		}
 	}
 
 	return ret;
@@ -361,6 +385,8 @@ Super::perform()
 	ActionList::const_iterator iter;
 	for(iter=action_list_.begin();iter!=action_list_.end();++iter)
 	{
+		//// debug actions
+		// synfig::info("%s:%d action: '%s'", __FILE__, __LINE__, (*iter)->get_name().c_str());
 		try
 		{
 			try
@@ -383,8 +409,10 @@ Super::perform()
 		}
 		catch(Error x)
 		{
-			throw Error(x.get_type(),((*iter)->get_name()+": "+x.get_desc()).c_str());
+			//synfig::info("%s:%d caught exception", __FILE__, __LINE__);
+			throw Error(x.get_type(),((*iter)->get_local_name()+": "+x.get_desc()).c_str());
 		}
+		//synfig::info("%s:%d finished action: '%s'", __FILE__, __LINE__, (*iter)->get_name().c_str());
 	}
 }