projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Apply patch #17: Implement a Fill/Outline system in place of Foreground/Background...
[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
5193f7b
..
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/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/waypointsimpleadd.h"
#include "actions/activepointadd.h"
@@
-95,6
+97,9
@@
#include "actions/timepointscopy.h"
#include "actions/timepointsdelete.h"
#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"
#include "actions/canvasrenddescset.h"
#include "actions/canvasadd.h"
#include "actions/canvasremove.h"
@@
-189,6
+194,8
@@
Action::Main::Main()
ADD_ACTION(Action::WaypointSet);
ADD_ACTION(Action::WaypointSetSmart);
ADD_ACTION(Action::WaypointRemove);
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::WaypointSimpleAdd);
ADD_ACTION(Action::ActivepointAdd);
@@
-206,6
+213,9
@@
Action::Main::Main()
ADD_ACTION(Action::KeyframeWaypointSet);
ADD_ACTION(Action::KeyframeSetDelta);
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);
ADD_ACTION(Action::CanvasRendDescSet);
ADD_ACTION(Action::CanvasAdd);
ADD_ACTION(Action::CanvasRemove);
@@
-216,7
+226,8
@@
Action::Main::Main()
ADD_ACTION(Action::BLinePointTangentSplit);
ADD_ACTION(Action::GradientSet);
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);
ADD_ACTION(Action::TimepointsMove);
ADD_ACTION(Action::TimepointsCopy);
@@
-261,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))
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);
ret.push_back(iter->second);
+ }
else
{
//synfig::info("Action \"%s\" is not a candidate",iter->second.name.c_str());
}
}
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;
}
return ret;
@@
-367,6
+385,8
@@
Super::perform()
ActionList::const_iterator iter;
for(iter=action_list_.begin();iter!=action_list_.end();++iter)
{
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
try
{
try
@@
-389,8
+409,10
@@
Super::perform()
}
catch(Error x)
{
}
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());
}
}
}
}