gimp r25325 - in trunk: . app/text libgimpbase

[neo svn gnome org]

Author: neo
Date: Mon Mar 31 22:48:07 2008
New Revision: 25325
URL: http://svn.gnome.org/viewvc/gimp?rev=25325&view=rev

Log:
2008-03-31  Sven Neumann  <sven gimp org>

	* app/text/text-enums.[ch]
	* libgimpbase/gimpbaseenums.[ch]: as a first step towards a new
	text PDB API, moved GimpTextDirection and GimpTextJustification
	enums to libgimpbase.

	* libgimpbase/gimpbase.def: updated.



Modified:
   trunk/ChangeLog
   trunk/app/text/text-enums.c
   trunk/app/text/text-enums.h
   trunk/libgimpbase/gimpbase.def
   trunk/libgimpbase/gimpbaseenums.c
   trunk/libgimpbase/gimpbaseenums.h

Modified: trunk/app/text/text-enums.c
==============================================================================
--- trunk/app/text/text-enums.c	(original)
+++ trunk/app/text/text-enums.c	Mon Mar 31 22:48:07 2008
@@ -37,66 +37,6 @@
 }
 
 GType
-gimp_text_direction_get_type (void)
-{
-  static const GEnumValue values[] =
-  {
-    { GIMP_TEXT_DIRECTION_LTR, "GIMP_TEXT_DIRECTION_LTR", "ltr" },
-    { GIMP_TEXT_DIRECTION_RTL, "GIMP_TEXT_DIRECTION_RTL", "rtl" },
-    { 0, NULL, NULL }
-  };
-
-  static const GimpEnumDesc descs[] =
-  {
-    { GIMP_TEXT_DIRECTION_LTR, N_("From left to right"), NULL },
-    { GIMP_TEXT_DIRECTION_RTL, N_("From right to left"), NULL },
-    { 0, NULL, NULL }
-  };
-
-  static GType type = 0;
-
-  if (! type)
-    {
-      type = g_enum_register_static ("GimpTextDirection", values);
-      gimp_enum_set_value_descriptions (type, descs);
-    }
-
-  return type;
-}
-
-GType
-gimp_text_justification_get_type (void)
-{
-  static const GEnumValue values[] =
-  {
-    { GIMP_TEXT_JUSTIFY_LEFT, "GIMP_TEXT_JUSTIFY_LEFT", "left" },
-    { GIMP_TEXT_JUSTIFY_RIGHT, "GIMP_TEXT_JUSTIFY_RIGHT", "right" },
-    { GIMP_TEXT_JUSTIFY_CENTER, "GIMP_TEXT_JUSTIFY_CENTER", "center" },
-    { GIMP_TEXT_JUSTIFY_FILL, "GIMP_TEXT_JUSTIFY_FILL", "fill" },
-    { 0, NULL, NULL }
-  };
-
-  static const GimpEnumDesc descs[] =
-  {
-    { GIMP_TEXT_JUSTIFY_LEFT, N_("Left justified"), NULL },
-    { GIMP_TEXT_JUSTIFY_RIGHT, N_("Right justified"), NULL },
-    { GIMP_TEXT_JUSTIFY_CENTER, N_("Centered"), NULL },
-    { GIMP_TEXT_JUSTIFY_FILL, N_("Filled"), NULL },
-    { 0, NULL, NULL }
-  };
-
-  static GType type = 0;
-
-  if (! type)
-    {
-      type = g_enum_register_static ("GimpTextJustification", values);
-      gimp_enum_set_value_descriptions (type, descs);
-    }
-
-  return type;
-}
-
-GType
 gimp_text_outline_get_type (void)
 {
   static const GEnumValue values[] =

Modified: trunk/app/text/text-enums.h
==============================================================================
--- trunk/app/text/text-enums.h	(original)
+++ trunk/app/text/text-enums.h	Mon Mar 31 22:48:07 2008
@@ -31,30 +31,6 @@
 } GimpTextBoxMode;
 
 
-#define GIMP_TYPE_TEXT_DIRECTION (gimp_text_direction_get_type ())
-
-GType gimp_text_direction_get_type (void) G_GNUC_CONST;
-
-typedef enum /*< pdb-skip >*/
-{
-  GIMP_TEXT_DIRECTION_LTR,   /*< desc="From left to right" >*/
-  GIMP_TEXT_DIRECTION_RTL    /*< desc="From right to left" >*/
-} GimpTextDirection;
-
-
-#define GIMP_TYPE_TEXT_JUSTIFICATION (gimp_text_justification_get_type ())
-
-GType gimp_text_justification_get_type (void) G_GNUC_CONST;
-
-typedef enum /*< pdb-skip >*/
-{
-  GIMP_TEXT_JUSTIFY_LEFT,    /*< desc="Left justified"  >*/
-  GIMP_TEXT_JUSTIFY_RIGHT,   /*< desc="Right justified" >*/
-  GIMP_TEXT_JUSTIFY_CENTER,  /*< desc="Centered"        >*/
-  GIMP_TEXT_JUSTIFY_FILL     /*< desc="Filled"          >*/
-} GimpTextJustification;
-
-
 #define GIMP_TYPE_TEXT_OUTLINE (gimp_text_outline_get_type ())
 
 GType gimp_text_outline_get_type (void) G_GNUC_CONST;

Modified: trunk/libgimpbase/gimpbase.def
==============================================================================
--- trunk/libgimpbase/gimpbase.def	(original)
+++ trunk/libgimpbase/gimpbase.def	Mon Mar 31 22:48:07 2008
@@ -92,6 +92,8 @@
 	gimp_stack_trace_mode_get_type
 	gimp_strip_uline
 	gimp_sysconf_directory
+	gimp_text_direction_get_type
+	gimp_text_justification_get_type 
 	gimp_transfer_mode_get_type
 	gimp_transform_direction_get_type
 	gimp_transform_resize_get_type

Modified: trunk/libgimpbase/gimpbaseenums.c
==============================================================================
--- trunk/libgimpbase/gimpbaseenums.c	(original)
+++ trunk/libgimpbase/gimpbaseenums.c	Mon Mar 31 22:48:07 2008
@@ -1033,6 +1033,68 @@
 }
 
 GType
+gimp_text_direction_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_TEXT_DIRECTION_LTR, "GIMP_TEXT_DIRECTION_LTR", "ltr" },
+    { GIMP_TEXT_DIRECTION_RTL, "GIMP_TEXT_DIRECTION_RTL", "rtl" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_TEXT_DIRECTION_LTR, N_("From left to right"), NULL },
+    { GIMP_TEXT_DIRECTION_RTL, N_("From right to left"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (! type)
+    {
+      type = g_enum_register_static ("GimpTextDirection", values);
+      gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
+gimp_text_justification_get_type (void)
+{
+  static const GEnumValue values[] =
+  {
+    { GIMP_TEXT_JUSTIFY_LEFT, "GIMP_TEXT_JUSTIFY_LEFT", "left" },
+    { GIMP_TEXT_JUSTIFY_RIGHT, "GIMP_TEXT_JUSTIFY_RIGHT", "right" },
+    { GIMP_TEXT_JUSTIFY_CENTER, "GIMP_TEXT_JUSTIFY_CENTER", "center" },
+    { GIMP_TEXT_JUSTIFY_FILL, "GIMP_TEXT_JUSTIFY_FILL", "fill" },
+    { 0, NULL, NULL }
+  };
+
+  static const GimpEnumDesc descs[] =
+  {
+    { GIMP_TEXT_JUSTIFY_LEFT, N_("Left justified"), NULL },
+    { GIMP_TEXT_JUSTIFY_RIGHT, N_("Right justified"), NULL },
+    { GIMP_TEXT_JUSTIFY_CENTER, N_("Centered"), NULL },
+    { GIMP_TEXT_JUSTIFY_FILL, N_("Filled"), NULL },
+    { 0, NULL, NULL }
+  };
+
+  static GType type = 0;
+
+  if (! type)
+    {
+      type = g_enum_register_static ("GimpTextJustification", values);
+      gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
+      gimp_enum_set_value_descriptions (type, descs);
+    }
+
+  return type;
+}
+
+GType
 gimp_user_directory_get_type (void)
 {
   static const GEnumValue values[] =

Modified: trunk/libgimpbase/gimpbaseenums.h
==============================================================================
--- trunk/libgimpbase/gimpbaseenums.h	(original)
+++ trunk/libgimpbase/gimpbaseenums.h	Mon Mar 31 22:48:07 2008
@@ -449,6 +449,30 @@
 } GimpProgressCommand;
 
 
+#define GIMP_TYPE_TEXT_DIRECTION (gimp_text_direction_get_type ())
+
+GType gimp_text_direction_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_TEXT_DIRECTION_LTR,   /*< desc="From left to right" >*/
+  GIMP_TEXT_DIRECTION_RTL    /*< desc="From right to left" >*/
+} GimpTextDirection;
+
+
+#define GIMP_TYPE_TEXT_JUSTIFICATION (gimp_text_justification_get_type ())
+
+GType gimp_text_justification_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_TEXT_JUSTIFY_LEFT,    /*< desc="Left justified"  >*/
+  GIMP_TEXT_JUSTIFY_RIGHT,   /*< desc="Right justified" >*/
+  GIMP_TEXT_JUSTIFY_CENTER,  /*< desc="Centered"        >*/
+  GIMP_TEXT_JUSTIFY_FILL     /*< desc="Filled"          >*/
+} GimpTextJustification;
+
+
 #ifndef GIMP_DISABLE_DEPRECATED
 #define GIMP_TYPE_USER_DIRECTORY (gimp_user_directory_get_type ())