Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-studio/trunk/src/synfigapp/action.cpp b/synfig-studio/trunk/src/synfigapp/action.cpp
index c45a669..7a98252 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/action.cpp
+++ b/synfig-studio/trunk/src/synfigapp/action.cpp
@@ -74,6 +74,8 @@
 #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"
@@ -192,6 +194,8 @@ Action::Main::Main()
        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);
@@ -222,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);
@@ -378,10 +383,10 @@ Super::perform()
        prepare();
 
        ActionList::const_iterator iter;
-       //synfig::info("%s:%d actions...", __FILE__, __LINE__);
        for(iter=action_list_.begin();iter!=action_list_.end();++iter)
        {
-               //synfig::info("%s:%d action: '%s'", __FILE__, __LINE__, (*iter)->get_name().c_str());
+               //// debug actions
+               // synfig::info("%s:%d action: '%s'", __FILE__, __LINE__, (*iter)->get_name().c_str());
                try
                {
                        try
@@ -405,7 +410,7 @@ Super::perform()
                catch(Error x)
                {
                        //synfig::info("%s:%d caught exception", __FILE__, __LINE__);
-                       throw Error(x.get_type(),((*iter)->get_name()+": "+x.get_desc()).c_str());
+                       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());
        }