dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app/plug-in/plug-in-enums.h moved GimpRunMode enum to libgimpbase. 

2006-04-06  Sven Neumann  <sven@gimp.org>

	* 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.
This commit is contained in:
Sven Neumann 2006-04-06 10:16:39 +00:00 committed by Sven Neumann
parent 7e258dfa27
commit 95f9330dbb
9 changed files with 70 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,3 +1,15 @@
2006-04-06 Sven Neumann <sven@gimp.org>
* 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 <mitch@gimp.org>
* 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 <schumaml@cvs.gnome.org>
* 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.

30
app/plug-in/plug-in-enums.c
View File

@ -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)
{

12
app/plug-in/plug-in-enums.h
View File

@ -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,

3
devel-docs/libgimpbase/libgimpbase-sections.txt
View File

@ -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

12
libgimp/gimpenums.h
View File

@ -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);

1
libgimpbase/gimpbase.def
View File

@ -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

31
libgimpbase/gimpbaseenums.c
View File

@ -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)
{

12
libgimpbase/gimpbaseenums.h
View File

@ -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;

18
tools/pdbgen/enums.pl
View File

@ -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' }
}
);