diff --git a/ChangeLog b/ChangeLog index 92f13d56d7..124cf931fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2006-04-06 Sven Neumann + + * app/plug-in/plug-in-enums.h + * libgimpbase/gimpbaseenums.h: moved GimpRunMode enum to libgimpbase. + + * app/plug-in/plug-in-enums.c + * libgimp/gimpenums.h + * libgimpbase/gimpbaseenums.c + * tools/pdbgen/enums.pl: regenerated. + + * libgimpbase/gimpbase.def: updated. + 2006-04-06 Michael Natterer * app/plug-in/Makefile.am @@ -71,11 +83,13 @@ 'extralibs' and changed mkgen.pl to treat this equally to 'optional' for non-optional plug-ins that needs different libs on different platforms + * plug-ins/common/Makefile.am: regenerated 2006-04-05 Michael Schumacher * configure.in: don't exclude the screenshot plug-in on os_win32 + * plug-ins/common/Makefile.am: change $(SCREENSHOT) into screenshot to make the screenshot plug-in build and install on the Microsoft Windows platform. diff --git a/app/plug-in/plug-in-enums.c b/app/plug-in/plug-in-enums.c index e93ec65fe6..e8aa6069cb 100644 --- a/app/plug-in/plug-in-enums.c +++ b/app/plug-in/plug-in-enums.c @@ -8,36 +8,6 @@ #include "gimp-intl.h" /* enumerations from "./plug-in-enums.h" */ -GType -gimp_run_mode_get_type (void) -{ - static const GEnumValue values[] = - { - { GIMP_RUN_INTERACTIVE, "GIMP_RUN_INTERACTIVE", "interactive" }, - { GIMP_RUN_NONINTERACTIVE, "GIMP_RUN_NONINTERACTIVE", "noninteractive" }, - { GIMP_RUN_WITH_LAST_VALS, "GIMP_RUN_WITH_LAST_VALS", "with-last-vals" }, - { 0, NULL, NULL } - }; - - static const GimpEnumDesc descs[] = - { - { GIMP_RUN_INTERACTIVE, "GIMP_RUN_INTERACTIVE", NULL }, - { GIMP_RUN_NONINTERACTIVE, "GIMP_RUN_NONINTERACTIVE", NULL }, - { GIMP_RUN_WITH_LAST_VALS, "GIMP_RUN_WITH_LAST_VALS", NULL }, - { 0, NULL, NULL } - }; - - static GType type = 0; - - if (! type) - { - type = g_enum_register_static ("GimpRunMode", values); - gimp_enum_set_value_descriptions (type, descs); - } - - return type; -} - GType plug_in_image_type_get_type (void) { diff --git a/app/plug-in/plug-in-enums.h b/app/plug-in/plug-in-enums.h index 7ae2eabd38..e1f63de612 100644 --- a/app/plug-in/plug-in-enums.h +++ b/app/plug-in/plug-in-enums.h @@ -20,18 +20,6 @@ #define __PLUG_IN_ENUMS_H__ -#define GIMP_TYPE_RUN_MODE (gimp_run_mode_get_type ()) - -GType gimp_run_mode_get_type (void) G_GNUC_CONST; - -typedef enum -{ - GIMP_RUN_INTERACTIVE, - GIMP_RUN_NONINTERACTIVE, - GIMP_RUN_WITH_LAST_VALS -} GimpRunMode; - - typedef enum /*< pdb-skip >*/ /*< skip >*/ { PLUG_IN_RGB_IMAGE = 1 << 0, diff --git a/devel-docs/libgimpbase/libgimpbase-sections.txt b/devel-docs/libgimpbase/libgimpbase-sections.txt index 1e5a3666cc..90f96fa443 100644 --- a/devel-docs/libgimpbase/libgimpbase-sections.txt +++ b/devel-docs/libgimpbase/libgimpbase-sections.txt @@ -36,6 +36,7 @@ GimpPDBProcType GimpPDBStatusType GimpProgressCommand GimpRepeatMode +GimpRunMode GimpSizeType GimpStackTraceMode GimpTransferMode @@ -65,6 +66,7 @@ GIMP_TYPE_PDB_PROC_TYPE GIMP_TYPE_PDB_STATUS_TYPE GIMP_TYPE_PROGRESS_COMMAND GIMP_TYPE_REPEAT_MODE +GIMP_TYPE_RUN_MODE GIMP_TYPE_SIZE_TYPE GIMP_TYPE_STACK_TRACE_MODE GIMP_TYPE_TRANSFER_MODE @@ -93,6 +95,7 @@ gimp_pdb_proc_type_get_type gimp_pdb_status_type_get_type gimp_progress_command_get_type gimp_repeat_mode_get_type +gimp_run_mode_get_type gimp_size_type_get_type gimp_stack_trace_mode_get_type gimp_transfer_mode_get_type diff --git a/libgimp/gimpenums.h b/libgimp/gimpenums.h index b965518335..db2135dcb7 100644 --- a/libgimp/gimpenums.h +++ b/libgimp/gimpenums.h @@ -259,18 +259,6 @@ typedef enum } GimpRotationType; -#define GIMP_TYPE_RUN_MODE (gimp_run_mode_get_type ()) - -GType gimp_run_mode_get_type (void) G_GNUC_CONST; - -typedef enum -{ - GIMP_RUN_INTERACTIVE, - GIMP_RUN_NONINTERACTIVE, - GIMP_RUN_WITH_LAST_VALS -} GimpRunMode; - - void gimp_enums_init (void); const gchar ** gimp_enums_get_type_names (gint *n_type_names); diff --git a/libgimpbase/gimpbase.def b/libgimpbase/gimpbase.def index fda1743a7e..e52fee5d5b 100644 --- a/libgimpbase/gimpbase.def +++ b/libgimpbase/gimpbase.def @@ -80,6 +80,7 @@ EXPORTS gimp_plug_in_directory gimp_progress_command_get_type gimp_repeat_mode_get_type + gimp_run_mode_get_type gimp_signal_private gimp_size_type_get_type gimp_stack_trace_mode_get_type diff --git a/libgimpbase/gimpbaseenums.c b/libgimpbase/gimpbaseenums.c index 5873933cd2..d9f06e7ed3 100644 --- a/libgimpbase/gimpbaseenums.c +++ b/libgimpbase/gimpbaseenums.c @@ -636,6 +636,37 @@ gimp_repeat_mode_get_type (void) return type; } +GType +gimp_run_mode_get_type (void) +{ + static const GEnumValue values[] = + { + { GIMP_RUN_INTERACTIVE, "GIMP_RUN_INTERACTIVE", "interactive" }, + { GIMP_RUN_NONINTERACTIVE, "GIMP_RUN_NONINTERACTIVE", "noninteractive" }, + { GIMP_RUN_WITH_LAST_VALS, "GIMP_RUN_WITH_LAST_VALS", "with-last-vals" }, + { 0, NULL, NULL } + }; + + static const GimpEnumDesc descs[] = + { + { GIMP_RUN_INTERACTIVE, N_("Run interactively"), NULL }, + { GIMP_RUN_NONINTERACTIVE, N_("Run non-interactively"), NULL }, + { GIMP_RUN_WITH_LAST_VALS, N_("Run with last used values"), NULL }, + { 0, NULL, NULL } + }; + + static GType type = 0; + + if (! type) + { + type = g_enum_register_static ("GimpRunMode", values); + gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp"); + gimp_enum_set_value_descriptions (type, descs); + } + + return type; +} + GType gimp_size_type_get_type (void) { diff --git a/libgimpbase/gimpbaseenums.h b/libgimpbase/gimpbaseenums.h index 4ec6a9b04e..afc418a33d 100644 --- a/libgimpbase/gimpbaseenums.h +++ b/libgimpbase/gimpbaseenums.h @@ -274,6 +274,18 @@ typedef enum } GimpRepeatMode; +#define GIMP_TYPE_RUN_MODE (gimp_run_mode_get_type ()) + +GType gimp_run_mode_get_type (void) G_GNUC_CONST; + +typedef enum +{ + GIMP_RUN_INTERACTIVE, /*< desc="Run interactively" >*/ + GIMP_RUN_NONINTERACTIVE, /*< desc="Run non-interactively" >*/ + GIMP_RUN_WITH_LAST_VALS /*< desc="Run with last used values" >*/ +} GimpRunMode; + + #define GIMP_TYPE_SIZE_TYPE (gimp_size_type_get_type ()) GType gimp_size_type_get_type (void) G_GNUC_CONST; diff --git a/tools/pdbgen/enums.pl b/tools/pdbgen/enums.pl index 05bb3891b5..a846194e1d 100644 --- a/tools/pdbgen/enums.pl +++ b/tools/pdbgen/enums.pl @@ -198,6 +198,15 @@ package Gimp::CodeGen::enums; GIMP_REPEAT_SAWTOOTH => '1', GIMP_REPEAT_TRIANGULAR => '2' } }, + GimpRunMode => + { contig => 1, + header => 'libgimpbase/gimpbaseenums.h', + symbols => [ qw(GIMP_RUN_INTERACTIVE GIMP_RUN_NONINTERACTIVE + GIMP_RUN_WITH_LAST_VALS) ], + mapping => { GIMP_RUN_INTERACTIVE => '0', + GIMP_RUN_NONINTERACTIVE => '1', + GIMP_RUN_WITH_LAST_VALS => '2' } + }, GimpSizeType => { contig => 1, header => 'libgimpbase/gimpbaseenums.h', @@ -520,15 +529,6 @@ package Gimp::CodeGen::enums; symbols => [ qw(GIMP_BLUR_CONVOLVE GIMP_SHARPEN_CONVOLVE) ], mapping => { GIMP_BLUR_CONVOLVE => '0', GIMP_SHARPEN_CONVOLVE => '1' } - }, - GimpRunMode => - { contig => 1, - header => 'plug-in/plug-in-enums.h', - symbols => [ qw(GIMP_RUN_INTERACTIVE GIMP_RUN_NONINTERACTIVE - GIMP_RUN_WITH_LAST_VALS) ], - mapping => { GIMP_RUN_INTERACTIVE => '0', - GIMP_RUN_NONINTERACTIVE => '1', - GIMP_RUN_WITH_LAST_VALS => '2' } } );