X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Faction.cpp;h=a8de89e746de82be7ee68965a1a5638981686a13;hb=f3aafc647c21fa0713a641ed78f38a9cefb2d6d1;hp=a1fdd69621ea895a689c149d263c1c3cb9e23e9c;hpb=8ef042c40521681cea99944097c4f90a5ac6cf74;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/action.cpp b/synfig-studio/trunk/src/synfigapp/action.cpp
index a1fdd69..a8de89e 100644
--- a/synfig-studio/trunk/src/synfigapp/action.cpp
+++ b/synfig-studio/trunk/src/synfigapp/action.cpp
@@ -130,7 +130,7 @@ synfigapp::Action::Book *book_;
 
 #define ADD_ACTION(x) { BookEntry &be(book()[x::name__]); \
 	be.name=x::name__; \
-	be.local_name=gettext(x::local_name__); \
+	be.local_name=dgettext("synfigstudio",x::local_name__); \
 	be.version=x::version__; \
 	be.task=x::task__; \
 	be.priority=x::priority__; \
@@ -232,7 +232,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?
@@ -266,7 +266,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)
@@ -284,6 +284,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()
 {
@@ -367,7 +433,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)
 {