Made a new ACTION_INIT_NO_GET_LOCAL_NAME macro for actions which want to define their...

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

diff --git a/synfig-studio/trunk/src/synfigapp/action.h b/synfig-studio/trunk/src/synfigapp/action.h
index d113bc4..4458062 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/action.h
+++ b/synfig-studio/trunk/src/synfigapp/action.h
@@ -2,7 +2,7 @@
 /*!    \file action.h
 **     \brief Template File
 **
-**     $Id: action.h,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $
+**     $Id$
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@ -74,10 +74,14 @@
 
 #define ACTION_SET_CVS_ID(class,x) const char class::cvs_id__[]=x
 
-#define ACTION_INIT(class) \
-       Action::Base* class::create() { return new class(); }   \
-       synfig::String class::get_name()const { return name__; }        \
-       synfig::String class::get_local_name()const { return local_name__; }    \
+//! don't define get_local_name() - allow the action code to define its own
+#define ACTION_INIT_NO_GET_LOCAL_NAME(class)                     \
+       Action::Base* class::create() { return new class(); } \
+       synfig::String class::get_name()const { return name__; }
+
+#define ACTION_INIT(class)                              \
+       ACTION_INIT_NO_GET_LOCAL_NAME(class) \
+       synfig::String class::get_local_name()const { return dgettext("synfigstudio",local_name__); }
 
 /* === T Y P E D E F S ===================================================== */
 
@@ -199,7 +203,7 @@ public:
        //! This function will throw an Action::Error() on failure
        virtual void perform()=0;
 
-       virtual bool set_param(const synfig::String& name, const Param &) { return false; }
+       virtual bool set_param(const synfig::String& /*name*/, const Param &) { return false; }
        virtual bool is_ready()const=0;
 
        virtual synfig::String get_name()const =0;
@@ -322,7 +326,7 @@ public:
 
        virtual void prepare() { };
 
-       virtual bool set_param(const synfig::String& name, const Param &)const { return false; }
+       virtual bool set_param(const synfig::String& /*name*/, const Param &)const { return false; }
        virtual bool is_ready()const { return ready_; }
 
        void set_name(std::string&x) { name_=x; }