Fix bugs in previous commit that caused FTBFS in synfig and ETL FTBFS with older...

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

diff --git a/synfig-studio/tags/stable/src/synfigapp/action.cpp b/synfig-studio/tags/stable/src/synfigapp/action.cpp
index c3e2aac..5332434 100644 (file)
--- a/synfig-studio/tags/stable/src/synfigapp/action.cpp
+++ b/synfig-studio/tags/stable/src/synfigapp/action.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
@@ -67,11 +68,13 @@
 #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/waypointsimpleadd.h"
 
 #include "actions/activepointadd.h"
 #include "actions/activepointset.h"
@@ -79,6 +82,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"
@@ -91,6 +95,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"
@@ -110,6 +117,8 @@
 
 #include "canvasinterface.h"
 
+#include "general.h"
+
 #endif
 
 using namespace std;
@@ -128,7 +137,7 @@ synfigapp::Action::Book *book_;
 
 #define ADD_ACTION(x) { BookEntry &be(book()[x::name__]); \
        be.name=x::name__; \
-       be.local_name=x::local_name__; \
+       be.local_name=dgettext("synfigstudio",x::local_name__); \
        be.version=x::version__; \
        be.task=x::task__; \
        be.priority=x::priority__; \
@@ -177,11 +186,13 @@ 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::WaypointSimpleAdd);
 
        ADD_ACTION(Action::ActivepointAdd);
        ADD_ACTION(Action::ActivepointSet);
@@ -189,6 +200,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);
@@ -197,6 +209,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);
@@ -230,7 +245,7 @@ Action::Book& Action::book() { return *book_; }
 
 
 Action::Handle
-Action::create(const String &name)
+Action::create(const synfig::String &name)
 {
        if(!book().count(name))
                return 0; //! \todo perhaps we should throw something instead?
@@ -264,7 +279,7 @@ Action::compile_candidate_list(const ParamList& param_list, Category category)
 }
 
 Action::CandidateList::iterator
-Action::CandidateList::find(const String& x)
+Action::CandidateList::find(const synfig::String& x)
 {
        iterator iter;
        for(iter=begin();iter!=end();++iter)
@@ -282,6 +297,72 @@ Action::Base::set_param_list(const ParamList &param_list)
                set_param(iter->first,iter->second);
 }
 
+synfig::String
+Action::Base::get_layer_descriptions(const std::list<synfig::Layer::Handle> layers, synfig::String singular_prefix, synfig::String plural_prefix)
+{
+       String ret;
+       bool first = true;
+
+       if (plural_prefix.empty())
+               plural_prefix = singular_prefix;
+
+       if (layers.empty())
+               return plural_prefix;
+
+       if (layers.size() == 1)
+               ret = singular_prefix;
+       else
+               ret = plural_prefix;
+
+       if (!ret.empty())
+               ret.push_back(' ');
+
+       for(std::list<synfig::Layer::Handle>::const_iterator iter=layers.begin(); iter!=layers.end(); ++iter)
+       {
+               if (first)
+                       first = false;
+               else
+                       ret += ", ";
+
+               ret += strprintf("'%s'", (*iter)->get_non_empty_description().c_str());
+       }
+
+       return ret;
+}
+
+synfig::String
+Action::Base::get_layer_descriptions(const std::list<std::pair<synfig::Layer::Handle,int> > layers, synfig::String singular_prefix, synfig::String plural_prefix)
+{
+       String ret;
+       bool first = true;
+
+       if (plural_prefix.empty())
+               plural_prefix = singular_prefix;
+
+       if (layers.empty())
+               return plural_prefix;
+
+       if (layers.size() == 1)
+               ret = singular_prefix;
+       else
+               ret = plural_prefix;
+
+       if (!ret.empty())
+               ret.push_back(' ');
+
+       for(std::list<std::pair<synfig::Layer::Handle,int> >::const_iterator iter=layers.begin(); iter!=layers.end(); ++iter)
+       {
+               if (first)
+                       first = false;
+               else
+                       ret += ", ";
+
+               ret += strprintf("'%s'", iter->first->get_non_empty_description().c_str());
+       }
+
+       return ret;
+}
+
 void
 Super::perform()
 {
@@ -365,7 +446,7 @@ Super::add_action_front(etl::handle<Undoable> action)
 }
 
 
-Group::Group(const std::string &str):
+Group::Group(const synfig::String &str):
        name_(str),
        ready_(true)
 {