moved GIMP_PARAM defines from here ...

2006-01-30  Sven Neumann  <sven@gimp.org>

	* app/config/config-types.h: moved GIMP_PARAM defines from here ...

	* libgimpbase/gimpparam.h: ... to this new files.

	* libgimpbase/Makefile.am
	* libgimpbase/gimpbasetypes.h: include the new header file.

	* libgimp/gimpfontselectbutton.c
	* libgimpconfig/gimpcolorconfig.c
	* libgimpthumb/gimpthumbnail.c
	* libgimpwidgets/gimpcellrenderercolor.c
	* libgimpwidgets/gimpcellrenderertoggle.c
	* libgimpwidgets/gimpcolorarea.c
	* libgimpwidgets/gimpcolorbutton.c
	* libgimpwidgets/gimpcolordisplay.c
	* libgimpwidgets/gimpcontroller.c
	* libgimpwidgets/gimpdialog.c
	* libgimpwidgets/gimpenumcombobox.c
	* libgimpwidgets/gimpintcombobox.c
	* libgimpwidgets/gimppageselector.c
	* libgimpwidgets/gimppreview.c
	* libgimpwidgets/gimppreviewarea.c
	* libgimpwidgets/gimpzoommodel.c
	* modules/cdisplay_colorblind.c
	* modules/cdisplay_gamma.c
	* modules/cdisplay_highcontrast.c
	* modules/cdisplay_lcms.c
	* modules/cdisplay_proof.c
	* modules/controller_linux_input.c
	* modules/controller_midi.c: use the GIMP_PARAM defines to avoid
	unnecessary string allocations.
This commit is contained in:
Sven Neumann
2006-01-30 16:10:56 +00:00
committed by Sven Neumann
parent 904e8ac7cf
commit 7b24dd8e36
32 changed files with 205 additions and 72 deletions

View File

@ -1,3 +1,37 @@
2006-01-30 Sven Neumann <sven@gimp.org>
* app/config/config-types.h: moved GIMP_PARAM defines from here ...
* libgimpbase/gimpparam.h: ... to this new files.
* libgimpbase/Makefile.am
* libgimpbase/gimpbasetypes.h: include the new header file.
* libgimp/gimpfontselectbutton.c
* libgimpconfig/gimpcolorconfig.c
* libgimpthumb/gimpthumbnail.c
* libgimpwidgets/gimpcellrenderercolor.c
* libgimpwidgets/gimpcellrenderertoggle.c
* libgimpwidgets/gimpcolorarea.c
* libgimpwidgets/gimpcolorbutton.c
* libgimpwidgets/gimpcolordisplay.c
* libgimpwidgets/gimpcontroller.c
* libgimpwidgets/gimpdialog.c
* libgimpwidgets/gimpenumcombobox.c
* libgimpwidgets/gimpintcombobox.c
* libgimpwidgets/gimppageselector.c
* libgimpwidgets/gimppreview.c
* libgimpwidgets/gimppreviewarea.c
* libgimpwidgets/gimpzoommodel.c
* modules/cdisplay_colorblind.c
* modules/cdisplay_gamma.c
* modules/cdisplay_highcontrast.c
* modules/cdisplay_lcms.c
* modules/cdisplay_proof.c
* modules/controller_linux_input.c
* modules/controller_midi.c: use the GIMP_PARAM defines to avoid
unnecessary string allocations.
2006-01-29 Michael Natterer <mitch@gimp.org> 2006-01-29 Michael Natterer <mitch@gimp.org>
* autogen.sh: make autoconf check more robust and the generic * autogen.sh: make autoconf check more robust and the generic

View File

@ -26,17 +26,6 @@
#include "libgimpconfig/gimpconfigtypes.h" #include "libgimpconfig/gimpconfigtypes.h"
#define GIMP_PARAM_STATIC_STRINGS (G_PARAM_STATIC_NAME | \
G_PARAM_STATIC_NICK | \
G_PARAM_STATIC_BLURB)
#define GIMP_PARAM_READABLE (G_PARAM_READABLE | \
GIMP_PARAM_STATIC_STRINGS)
#define GIMP_PARAM_WRITABLE (G_PARAM_WRITABLE | \
GIMP_PARAM_STATIC_STRINGS)
#define GIMP_PARAM_READWRITE (G_PARAM_READWRITE | \
GIMP_PARAM_STATIC_STRINGS)
typedef struct _GimpBaseConfig GimpBaseConfig; typedef struct _GimpBaseConfig GimpBaseConfig;
typedef struct _GimpCoreConfig GimpCoreConfig; typedef struct _GimpCoreConfig GimpCoreConfig;
typedef struct _GimpDisplayConfig GimpDisplayConfig; typedef struct _GimpDisplayConfig GimpDisplayConfig;

View File

@ -1,3 +1,9 @@
2006-01-30 Sven Neumann <sven@gimp.org>
* libgimpbase/libgimpbase-docs.sgml
* libgimpbase/libgimpbase-sections.txt
* libgimpbase/tmpl/gimpparam.sgml: added docs for GIMP_PARAM defines.
2006-01-25 Sven Neumann <sven@gimp.org> 2006-01-25 Sven Neumann <sven@gimp.org>
* libgimp/libgimp-sections.txt * libgimp/libgimp-sections.txt

View File

@ -17,6 +17,7 @@
<xi:include href="xml/gimpbasetypes.xml" /> <xi:include href="xml/gimpbasetypes.xml" />
<xi:include href="xml/gimpversion.xml" /> <xi:include href="xml/gimpversion.xml" />
<xi:include href="xml/gimplimits.xml" /> <xi:include href="xml/gimplimits.xml" />
<xi:include href="xml/gimpparam.xml" />
<xi:include href="xml/gimpchecks.xml" /> <xi:include href="xml/gimpchecks.xml" />
<xi:include href="xml/gimpdatafiles.xml" /> <xi:include href="xml/gimpdatafiles.xml" />
<xi:include href="xml/gimpenv.xml" /> <xi:include href="xml/gimpenv.xml" />

View File

@ -148,6 +148,14 @@ gimp_memsize_get_type
gimp_param_memsize_get_type gimp_param_memsize_get_type
</SECTION> </SECTION>
<SECTION>
<FILE>gimpparam</FILE>
GIMP_PARAM_STATIC_STRINGS
GIMP_PARAM_READABLE
GIMP_PARAM_WRITABLE
GIMP_PARAM_READWRITE
</SECTION>
<SECTION> <SECTION>
<FILE>gimpparasite</FILE> <FILE>gimpparasite</FILE>
GimpParasite GimpParasite

View File

@ -0,0 +1,49 @@
<!-- ##### SECTION Title ##### -->
gimpparam
<!-- ##### SECTION Short_Description ##### -->
Definitions of useful #GParamFlags.
<!-- ##### SECTION Long_Description ##### -->
<para>
</para>
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### MACRO GIMP_PARAM_STATIC_STRINGS ##### -->
<para>
Since: GIMP 2.4
</para>
<!-- ##### MACRO GIMP_PARAM_READABLE ##### -->
<para>
Since: GIMP 2.4
</para>
<!-- ##### MACRO GIMP_PARAM_WRITABLE ##### -->
<para>
Since: GIMP 2.4
</para>
<!-- ##### MACRO GIMP_PARAM_READWRITE ##### -->
<para>
Since: GIMP 2.4
</para>

View File

@ -124,7 +124,7 @@ gimp_font_select_button_class_init (GimpFontSelectButtonClass *klass)
g_object_class_install_property (gobject_class, PROP_TITLE, g_object_class_install_property (gobject_class, PROP_TITLE,
g_param_spec_string ("title", NULL, NULL, g_param_spec_string ("title", NULL, NULL,
_("Font Selection"), _("Font Selection"),
G_PARAM_READWRITE | GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY)); G_PARAM_CONSTRUCT_ONLY));
/** /**
@ -137,7 +137,7 @@ gimp_font_select_button_class_init (GimpFontSelectButtonClass *klass)
g_object_class_install_property (gobject_class, PROP_FONT_NAME, g_object_class_install_property (gobject_class, PROP_FONT_NAME,
g_param_spec_string ("font-name", NULL, NULL, g_param_spec_string ("font-name", NULL, NULL,
_("Sans"), _("Sans"),
G_PARAM_READWRITE)); GIMP_PARAM_READWRITE));
/** /**
* GimpFontSelectButton::font-set: * GimpFontSelectButton::font-set:

View File

@ -77,6 +77,7 @@ libgimpbase_sources = \
gimpbasetypes.h \ gimpbasetypes.h \
gimpbasetypes.c \ gimpbasetypes.c \
gimplimits.h \ gimplimits.h \
gimpparam.h \
gimpversion.h \ gimpversion.h \
\ \
gimpbase-private.c \ gimpbase-private.c \
@ -118,6 +119,7 @@ libgimpbaseinclude_HEADERS = \
gimpbaseenums.h \ gimpbaseenums.h \
gimpbasetypes.h \ gimpbasetypes.h \
gimplimits.h \ gimplimits.h \
gimpparam.h \
gimpversion.h \ gimpversion.h \
\ \
gimpchecks.h \ gimpchecks.h \

View File

@ -25,6 +25,8 @@
#include <libgimpmath/gimpmathtypes.h> #include <libgimpmath/gimpmathtypes.h>
#include <libgimpbase/gimpbaseenums.h> #include <libgimpbase/gimpbaseenums.h>
#include <libgimpbase/gimpparam.h>
G_BEGIN_DECLS G_BEGIN_DECLS

37
libgimpbase/gimpparam.h Normal file
View File

@ -0,0 +1,37 @@
/* LIBGIMP - The GIMP Library
* Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifndef __GIMP_PARAM_H__
#define __GIMP_PARAM_H__
/* For information look into the C source or the html documentation */
#define GIMP_PARAM_STATIC_STRINGS (G_PARAM_STATIC_NAME | \
G_PARAM_STATIC_NICK | \
G_PARAM_STATIC_BLURB)
#define GIMP_PARAM_READABLE (G_PARAM_READABLE | \
GIMP_PARAM_STATIC_STRINGS)
#define GIMP_PARAM_WRITABLE (G_PARAM_WRITABLE | \
GIMP_PARAM_STATIC_STRINGS)
#define GIMP_PARAM_READWRITE (G_PARAM_READWRITE | \
GIMP_PARAM_STATIC_STRINGS)
#endif /* __GIMP_PARAM_H__ */

View File

@ -116,63 +116,63 @@ gimp_color_config_class_init (GimpColorConfigClass *klass)
"mode", COLOR_MANAGEMENT_MODE_BLURB, "mode", COLOR_MANAGEMENT_MODE_BLURB,
GIMP_TYPE_COLOR_MANAGEMENT_MODE, GIMP_TYPE_COLOR_MANAGEMENT_MODE,
GIMP_COLOR_MANAGEMENT_DISPLAY, GIMP_COLOR_MANAGEMENT_DISPLAY,
0); GIMP_PARAM_STATIC_STRINGS);
GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_RGB_PROFILE, GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_RGB_PROFILE,
"rgb-profile", RGB_PROFILE_BLURB, "rgb-profile", RGB_PROFILE_BLURB,
GIMP_CONFIG_PATH_FILE, NULL, GIMP_CONFIG_PATH_FILE, NULL,
0); GIMP_PARAM_STATIC_STRINGS);
GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_CMYK_PROFILE, GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_CMYK_PROFILE,
"cmyk-profile", CMYK_PROFILE_BLURB, "cmyk-profile", CMYK_PROFILE_BLURB,
GIMP_CONFIG_PATH_FILE, NULL, GIMP_CONFIG_PATH_FILE, NULL,
0); GIMP_PARAM_STATIC_STRINGS);
GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_DISPLAY_PROFILE, GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_DISPLAY_PROFILE,
"display-profile", DISPLAY_PROFILE_BLURB, "display-profile", DISPLAY_PROFILE_BLURB,
GIMP_CONFIG_PATH_FILE, NULL, GIMP_CONFIG_PATH_FILE, NULL,
0); GIMP_PARAM_STATIC_STRINGS);
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_DISPLAY_PROFILE_FROM_GDK, GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_DISPLAY_PROFILE_FROM_GDK,
"display-profile-from-gdk", "display-profile-from-gdk",
DISPLAY_PROFILE_FROM_GDK_BLURB, DISPLAY_PROFILE_FROM_GDK_BLURB,
TRUE, TRUE,
0); GIMP_PARAM_STATIC_STRINGS);
GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_PRINTER_PROFILE, GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_PRINTER_PROFILE,
"printer-profile", PRINTER_PROFILE_BLURB, "printer-profile", PRINTER_PROFILE_BLURB,
GIMP_CONFIG_PATH_FILE, NULL, GIMP_CONFIG_PATH_FILE, NULL,
0); GIMP_PARAM_STATIC_STRINGS);
GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_DISPLAY_RENDERING_INTENT, GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_DISPLAY_RENDERING_INTENT,
"display-rendering-intent", "display-rendering-intent",
DISPLAY_RENDERING_INTENT_BLURB, DISPLAY_RENDERING_INTENT_BLURB,
GIMP_TYPE_COLOR_RENDERING_INTENT, GIMP_TYPE_COLOR_RENDERING_INTENT,
GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL, GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL,
0); GIMP_PARAM_STATIC_STRINGS);
GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_SIMULATION_RENDERING_INTENT, GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_SIMULATION_RENDERING_INTENT,
"simulation-rendering-intent", "simulation-rendering-intent",
SIMULATION_RENDERING_INTENT_BLURB, SIMULATION_RENDERING_INTENT_BLURB,
GIMP_TYPE_COLOR_RENDERING_INTENT, GIMP_TYPE_COLOR_RENDERING_INTENT,
GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL, GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL,
0); GIMP_PARAM_STATIC_STRINGS);
GIMP_CONFIG_INSTALL_PROP_STRING (object_class, PROP_DISPLAY_MODULE, GIMP_CONFIG_INSTALL_PROP_STRING (object_class, PROP_DISPLAY_MODULE,
"display-module", NULL, "display-module", NULL,
"CdisplayLcms", "CdisplayLcms",
0); GIMP_PARAM_STATIC_STRINGS);
#if 0 #if 0
GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_OPEN_BEHAVIOUR_NO_PROFILE, GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_OPEN_BEHAVIOUR_NO_PROFILE,
"open-behaviour-no-profile", "open-behaviour-no-profile",
OPEN_BEHAVIOUR_NO_PROFILE_BLURB, OPEN_BEHAVIOUR_NO_PROFILE_BLURB,
GIMP_TYPE_COLOR_FILE_OPEN_BEHAVIOUR, GIMP_TYPE_COLOR_FILE_OPEN_BEHAVIOUR,
GIMP_COLOR_FILE_OPEN_ASK, GIMP_COLOR_FILE_OPEN_ASK,
0); GIMP_PARAM_STATIC_STRINGS);
GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_OPEN_BEHAVIOUR_RGB_PROFILE, GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_OPEN_BEHAVIOUR_RGB_PROFILE,
"open-behaviour-rgb-profile", "open-behaviour-rgb-profile",
OPEN_BEHAVIOUR_RGB_PROFILE_BLURB, OPEN_BEHAVIOUR_RGB_PROFILE_BLURB,
GIMP_TYPE_COLOR_FILE_OPEN_BEHAVIOUR, GIMP_TYPE_COLOR_FILE_OPEN_BEHAVIOUR,
GIMP_COLOR_FILE_OPEN_ASK, GIMP_COLOR_FILE_OPEN_ASK,
0); GIMP_PARAM_STATIC_STRINGS);
GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_OPEN_BEHAVIOUR_CMYK_PROFILE, GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_OPEN_BEHAVIOUR_CMYK_PROFILE,
"open-behaviour-cmyk-profile", "open-behaviour-cmyk-profile",
OPEN_BEHAVIOUR_CMYK_PROFILE_BLURB, OPEN_BEHAVIOUR_CMYK_PROFILE_BLURB,
GIMP_TYPE_COLOR_FILE_OPEN_BEHAVIOUR, GIMP_TYPE_COLOR_FILE_OPEN_BEHAVIOUR,
GIMP_COLOR_FILE_OPEN_ASK, GIMP_COLOR_FILE_OPEN_ASK,
0); GIMP_PARAM_STATIC_STRINGS);
#endif #endif
} }

View File

@ -36,6 +36,8 @@
#include <glib/gstdio.h> #include <glib/gstdio.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpbase/gimpparam.h"
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
#include "libgimpbase/gimpwin32-io.h" #include "libgimpbase/gimpwin32-io.h"
#include <process.h> #include <process.h>
@ -136,25 +138,25 @@ gimp_thumbnail_class_init (GimpThumbnailClass *klass)
"State of the image associated to the thumbnail object", "State of the image associated to the thumbnail object",
GIMP_TYPE_THUMB_STATE, GIMP_TYPE_THUMB_STATE,
GIMP_THUMB_STATE_UNKNOWN, GIMP_THUMB_STATE_UNKNOWN,
G_PARAM_READWRITE)); GIMP_PARAM_READWRITE));
g_object_class_install_property (object_class, g_object_class_install_property (object_class,
PROP_IMAGE_URI, PROP_IMAGE_URI,
g_param_spec_string ("image-uri", NULL, g_param_spec_string ("image-uri", NULL,
"URI of the image file", "URI of the image file",
NULL, NULL,
G_PARAM_READWRITE)); GIMP_PARAM_READWRITE));
g_object_class_install_property (object_class, g_object_class_install_property (object_class,
PROP_IMAGE_MTIME, PROP_IMAGE_MTIME,
g_param_spec_int64 ("image-mtime", NULL, g_param_spec_int64 ("image-mtime", NULL,
"Modification time of the image file in seconds since the Epoch", "Modification time of the image file in seconds since the Epoch",
0, G_MAXINT64, 0, 0, G_MAXINT64, 0,
G_PARAM_READWRITE)); GIMP_PARAM_READWRITE));
g_object_class_install_property (object_class, g_object_class_install_property (object_class,
PROP_IMAGE_FILESIZE, PROP_IMAGE_FILESIZE,
g_param_spec_int64 ("image-filesize", NULL, g_param_spec_int64 ("image-filesize", NULL,
"Size of the image file in bytes", "Size of the image file in bytes",
0, G_MAXINT64, 0, 0, G_MAXINT64, 0,
G_PARAM_READWRITE)); GIMP_PARAM_READWRITE));
/** /**
* GimpThumbnail::image-mimetype: * GimpThumbnail::image-mimetype:
* *
@ -165,38 +167,38 @@ gimp_thumbnail_class_init (GimpThumbnailClass *klass)
g_param_spec_string ("image-mimetype", NULL, g_param_spec_string ("image-mimetype", NULL,
"Image mimetype", "Image mimetype",
NULL, NULL,
G_PARAM_READWRITE)); GIMP_PARAM_READWRITE));
g_object_class_install_property (object_class, g_object_class_install_property (object_class,
PROP_IMAGE_WIDTH, PROP_IMAGE_WIDTH,
g_param_spec_int ("image-width", NULL, g_param_spec_int ("image-width", NULL,
"Width of the image in pixels", "Width of the image in pixels",
0, G_MAXINT, 0, 0, G_MAXINT, 0,
G_PARAM_READWRITE)); GIMP_PARAM_READWRITE));
g_object_class_install_property (object_class, g_object_class_install_property (object_class,
PROP_IMAGE_HEIGHT, PROP_IMAGE_HEIGHT,
g_param_spec_int ("image-height", NULL, g_param_spec_int ("image-height", NULL,
"Height of the image in pixels", "Height of the image in pixels",
0, G_MAXINT, 0, 0, G_MAXINT, 0,
G_PARAM_READWRITE)); GIMP_PARAM_READWRITE));
g_object_class_install_property (object_class, g_object_class_install_property (object_class,
PROP_IMAGE_TYPE, PROP_IMAGE_TYPE,
g_param_spec_string ("image-type", NULL, g_param_spec_string ("image-type", NULL,
"String describing the type of the image format", "String describing the type of the image format",
NULL, NULL,
G_PARAM_READWRITE)); GIMP_PARAM_READWRITE));
g_object_class_install_property (object_class, g_object_class_install_property (object_class,
PROP_IMAGE_NUM_LAYERS, PROP_IMAGE_NUM_LAYERS,
g_param_spec_int ("image-num-layers", NULL, g_param_spec_int ("image-num-layers", NULL,
"The number of layers in the image", "The number of layers in the image",
0, G_MAXINT, 0, 0, G_MAXINT, 0,
G_PARAM_READWRITE)); GIMP_PARAM_READWRITE));
g_object_class_install_property (object_class, g_object_class_install_property (object_class,
PROP_THUMB_STATE, PROP_THUMB_STATE,
g_param_spec_enum ("thumb-state", NULL, g_param_spec_enum ("thumb-state", NULL,
"State of the thumbnail file", "State of the thumbnail file",
GIMP_TYPE_THUMB_STATE, GIMP_TYPE_THUMB_STATE,
GIMP_THUMB_STATE_UNKNOWN, GIMP_THUMB_STATE_UNKNOWN,
G_PARAM_READWRITE)); GIMP_PARAM_READWRITE));
} }
static void static void

View File

@ -90,19 +90,19 @@ gimp_cell_renderer_color_class_init (GimpCellRendererColorClass *klass)
PROP_COLOR, PROP_COLOR,
g_param_spec_boxed ("color", NULL, NULL, g_param_spec_boxed ("color", NULL, NULL,
GIMP_TYPE_RGB, GIMP_TYPE_RGB,
G_PARAM_READWRITE)); GIMP_PARAM_READWRITE));
g_object_class_install_property (object_class, g_object_class_install_property (object_class,
PROP_OPAQUE, PROP_OPAQUE,
g_param_spec_boolean ("opaque", NULL, NULL, g_param_spec_boolean ("opaque", NULL, NULL,
TRUE, TRUE,
G_PARAM_READWRITE | GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT)); G_PARAM_CONSTRUCT));
g_object_class_install_property (object_class, g_object_class_install_property (object_class,
PROP_SIZE, PROP_SIZE,
g_param_spec_int ("icon-size", NULL, NULL, g_param_spec_int ("icon-size", NULL, NULL,
0, G_MAXINT, 0, G_MAXINT,
DEFAULT_ICON_SIZE, DEFAULT_ICON_SIZE,
G_PARAM_READWRITE | GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT)); G_PARAM_CONSTRUCT));
} }

View File

@ -119,7 +119,7 @@ gimp_cell_renderer_toggle_class_init (GimpCellRendererToggleClass *klass)
g_param_spec_string ("stock-id", g_param_spec_string ("stock-id",
NULL, NULL, NULL, NULL,
NULL, NULL,
G_PARAM_READWRITE | GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT)); G_PARAM_CONSTRUCT));
g_object_class_install_property (object_class, g_object_class_install_property (object_class,
PROP_STOCK_SIZE, PROP_STOCK_SIZE,
@ -127,7 +127,7 @@ gimp_cell_renderer_toggle_class_init (GimpCellRendererToggleClass *klass)
NULL, NULL, NULL, NULL,
0, G_MAXINT, 0, G_MAXINT,
DEFAULT_ICON_SIZE, DEFAULT_ICON_SIZE,
G_PARAM_READWRITE | GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT)); G_PARAM_CONSTRUCT));
} }

View File

@ -140,7 +140,7 @@ gimp_color_area_class_init (GimpColorAreaClass *klass)
g_object_class_install_property (object_class, PROP_COLOR, g_object_class_install_property (object_class, PROP_COLOR,
gimp_param_spec_rgb ("color", NULL, NULL, gimp_param_spec_rgb ("color", NULL, NULL,
&color, &color,
G_PARAM_READWRITE | GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT)); G_PARAM_CONSTRUCT));
/** /**
* GimpColorArea:type: * GimpColorArea:type:
@ -153,7 +153,7 @@ gimp_color_area_class_init (GimpColorAreaClass *klass)
g_param_spec_enum ("type", NULL, NULL, g_param_spec_enum ("type", NULL, NULL,
GIMP_TYPE_COLOR_AREA_TYPE, GIMP_TYPE_COLOR_AREA_TYPE,
GIMP_COLOR_AREA_FLAT, GIMP_COLOR_AREA_FLAT,
G_PARAM_READWRITE | GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT)); G_PARAM_CONSTRUCT));
/** /**
* GimpColorArea:drag-type: * GimpColorArea:drag-type:
@ -166,7 +166,7 @@ gimp_color_area_class_init (GimpColorAreaClass *klass)
g_param_spec_flags ("drag-mask", NULL, NULL, g_param_spec_flags ("drag-mask", NULL, NULL,
GDK_TYPE_MODIFIER_TYPE, GDK_TYPE_MODIFIER_TYPE,
0, 0,
G_PARAM_WRITABLE | GIMP_PARAM_WRITABLE |
G_PARAM_CONSTRUCT_ONLY)); G_PARAM_CONSTRUCT_ONLY));
/** /**
* GimpColorArea:draw-border: * GimpColorArea:draw-border:
@ -179,7 +179,7 @@ gimp_color_area_class_init (GimpColorAreaClass *klass)
g_param_spec_boolean ("draw-border", g_param_spec_boolean ("draw-border",
NULL, NULL, NULL, NULL,
FALSE, FALSE,
G_PARAM_READWRITE)); GIMP_PARAM_READWRITE));
} }
static void static void

View File

@ -211,7 +211,7 @@ gimp_color_button_class_init (GimpColorButtonClass *klass)
g_object_class_install_property (object_class, PROP_TITLE, g_object_class_install_property (object_class, PROP_TITLE,
g_param_spec_string ("title", NULL, NULL, g_param_spec_string ("title", NULL, NULL,
NULL, NULL,
G_PARAM_READWRITE | GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY)); G_PARAM_CONSTRUCT_ONLY));
/** /**
* GimpColorButton:color: * GimpColorButton:color:
@ -223,7 +223,7 @@ gimp_color_button_class_init (GimpColorButtonClass *klass)
g_object_class_install_property (object_class, PROP_COLOR, g_object_class_install_property (object_class, PROP_COLOR,
gimp_param_spec_rgb ("color", NULL, NULL, gimp_param_spec_rgb ("color", NULL, NULL,
&color, &color,
G_PARAM_READWRITE | GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT)); G_PARAM_CONSTRUCT));
/** /**
* GimpColorButton:type: * GimpColorButton:type:
@ -236,7 +236,7 @@ gimp_color_button_class_init (GimpColorButtonClass *klass)
g_param_spec_enum ("type", NULL, NULL, g_param_spec_enum ("type", NULL, NULL,
GIMP_TYPE_COLOR_AREA_TYPE, GIMP_TYPE_COLOR_AREA_TYPE,
GIMP_COLOR_AREA_FLAT, GIMP_COLOR_AREA_FLAT,
G_PARAM_READWRITE | GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT)); G_PARAM_CONSTRUCT));
/** /**
* GimpColorButton:continuous-update: * GimpColorButton:continuous-update:

View File

@ -77,7 +77,7 @@ gimp_color_display_class_init (GimpColorDisplayClass *klass)
g_object_class_install_property (object_class, PROP_ENABLED, g_object_class_install_property (object_class, PROP_ENABLED,
g_param_spec_boolean ("enabled", NULL, NULL, g_param_spec_boolean ("enabled", NULL, NULL,
TRUE, TRUE,
G_PARAM_READWRITE | GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT)); G_PARAM_CONSTRUCT));
display_signals[CHANGED] = display_signals[CHANGED] =

View File

@ -103,13 +103,13 @@ gimp_controller_class_init (GimpControllerClass *klass)
g_object_class_install_property (object_class, PROP_NAME, g_object_class_install_property (object_class, PROP_NAME,
g_param_spec_string ("name", NULL, NULL, g_param_spec_string ("name", NULL, NULL,
"Unnamed Controller", "Unnamed Controller",
G_PARAM_READWRITE | GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT)); G_PARAM_CONSTRUCT));
g_object_class_install_property (object_class, PROP_STATE, g_object_class_install_property (object_class, PROP_STATE,
g_param_spec_string ("state", NULL, NULL, g_param_spec_string ("state", NULL, NULL,
"Unknown", "Unknown",
G_PARAM_READWRITE | GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT)); G_PARAM_CONSTRUCT));
controller_signals[EVENT] = controller_signals[EVENT] =

View File

@ -92,7 +92,7 @@ gimp_dialog_class_init (GimpDialogClass *klass)
**/ **/
g_object_class_install_property (object_class, PROP_HELP_FUNC, g_object_class_install_property (object_class, PROP_HELP_FUNC,
g_param_spec_pointer ("help-func", NULL, NULL, g_param_spec_pointer ("help-func", NULL, NULL,
G_PARAM_READWRITE | GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY)); G_PARAM_CONSTRUCT_ONLY));
/** /**
@ -103,7 +103,7 @@ gimp_dialog_class_init (GimpDialogClass *klass)
g_object_class_install_property (object_class, PROP_HELP_ID, g_object_class_install_property (object_class, PROP_HELP_ID,
g_param_spec_string ("help-id", NULL, NULL, g_param_spec_string ("help-id", NULL, NULL,
NULL, NULL,
G_PARAM_READWRITE | GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY)); G_PARAM_CONSTRUCT_ONLY));
} }

View File

@ -68,7 +68,7 @@ gimp_enum_combo_box_class_init (GimpEnumComboBoxClass *klass)
PROP_MODEL, PROP_MODEL,
g_param_spec_object ("model", NULL, NULL, g_param_spec_object ("model", NULL, NULL,
GIMP_TYPE_ENUM_STORE, GIMP_TYPE_ENUM_STORE,
G_PARAM_READWRITE)); GIMP_PARAM_READWRITE));
} }
static void static void

View File

@ -98,7 +98,7 @@ gimp_int_combo_box_class_init (GimpIntComboBoxClass *klass)
g_param_spec_enum ("ellipsize", NULL, NULL, g_param_spec_enum ("ellipsize", NULL, NULL,
PANGO_TYPE_ELLIPSIZE_MODE, PANGO_TYPE_ELLIPSIZE_MODE,
PANGO_ELLIPSIZE_NONE, PANGO_ELLIPSIZE_NONE,
G_PARAM_READWRITE)); GIMP_PARAM_READWRITE));
g_type_class_add_private (object_class, sizeof (GimpIntComboBoxPrivate)); g_type_class_add_private (object_class, sizeof (GimpIntComboBoxPrivate));
} }

View File

@ -187,7 +187,7 @@ gimp_page_selector_class_init (GimpPageSelectorClass *klass)
g_object_class_install_property (object_class, PROP_N_PAGES, g_object_class_install_property (object_class, PROP_N_PAGES,
g_param_spec_int ("n-pages", NULL, NULL, g_param_spec_int ("n-pages", NULL, NULL,
0, G_MAXINT, 0, 0, G_MAXINT, 0,
G_PARAM_READWRITE)); GIMP_PARAM_READWRITE));
/** /**
* GimpPageSelector:target: * GimpPageSelector:target:
@ -200,7 +200,7 @@ gimp_page_selector_class_init (GimpPageSelectorClass *klass)
g_param_spec_enum ("target", NULL, NULL, g_param_spec_enum ("target", NULL, NULL,
GIMP_TYPE_PAGE_SELECTOR_TARGET, GIMP_TYPE_PAGE_SELECTOR_TARGET,
GIMP_PAGE_SELECTOR_TARGET_LAYERS, GIMP_PAGE_SELECTOR_TARGET_LAYERS,
G_PARAM_READWRITE)); GIMP_PARAM_READWRITE));
g_type_class_add_private (object_class, sizeof (GimpPageSelectorPrivate)); g_type_class_add_private (object_class, sizeof (GimpPageSelectorPrivate));
} }

View File

@ -162,7 +162,7 @@ gimp_preview_class_init (GimpPreviewClass *klass)
g_param_spec_boolean ("update", g_param_spec_boolean ("update",
NULL, NULL, NULL, NULL,
TRUE, TRUE,
G_PARAM_READWRITE | GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT)); G_PARAM_CONSTRUCT));
gtk_widget_class_install_style_property (widget_class, gtk_widget_class_install_style_property (widget_class,
@ -170,7 +170,7 @@ gimp_preview_class_init (GimpPreviewClass *klass)
NULL, NULL, NULL, NULL,
1, 1024, 1, 1024,
DEFAULT_SIZE, DEFAULT_SIZE,
G_PARAM_READABLE)); GIMP_PARAM_READABLE));
} }
static void static void

View File

@ -94,14 +94,14 @@ gimp_preview_area_class_init (GimpPreviewAreaClass *klass)
_("Check Size"), NULL, _("Check Size"), NULL,
GIMP_TYPE_CHECK_SIZE, GIMP_TYPE_CHECK_SIZE,
DEFAULT_CHECK_SIZE, DEFAULT_CHECK_SIZE,
G_PARAM_READWRITE)); GIMP_PARAM_READWRITE));
g_object_class_install_property (object_class, PROP_CHECK_TYPE, g_object_class_install_property (object_class, PROP_CHECK_TYPE,
g_param_spec_enum ("check-type", g_param_spec_enum ("check-type",
_("Check Style"), NULL, _("Check Style"), NULL,
GIMP_TYPE_CHECK_TYPE, GIMP_TYPE_CHECK_TYPE,
DEFAULT_CHECK_TYPE, DEFAULT_CHECK_TYPE,
G_PARAM_READWRITE)); GIMP_PARAM_READWRITE));
} }
static void static void

View File

@ -111,30 +111,30 @@ gimp_zoom_model_class_init (GimpZoomModelClass *klass)
"Zoom factor", NULL, "Zoom factor", NULL,
ZOOM_MIN, ZOOM_MAX, ZOOM_MIN, ZOOM_MAX,
1.0, 1.0,
G_PARAM_READWRITE)); GIMP_PARAM_READWRITE));
g_object_class_install_property (object_class, PROP_MINIMUM, g_object_class_install_property (object_class, PROP_MINIMUM,
g_param_spec_double ("minimum", g_param_spec_double ("minimum",
"Lower limit for the zoom factor", NULL, "Lower limit for the zoom factor", NULL,
ZOOM_MIN, ZOOM_MAX, ZOOM_MIN, ZOOM_MAX,
ZOOM_MIN, ZOOM_MIN,
G_PARAM_READWRITE)); GIMP_PARAM_READWRITE));
g_object_class_install_property (object_class, PROP_MAXIMUM, g_object_class_install_property (object_class, PROP_MAXIMUM,
g_param_spec_double ("maximum", g_param_spec_double ("maximum",
"Upper limit for the zoom factor", NULL, "Upper limit for the zoom factor", NULL,
ZOOM_MIN, ZOOM_MAX, ZOOM_MIN, ZOOM_MAX,
ZOOM_MAX, ZOOM_MAX,
G_PARAM_READWRITE)); GIMP_PARAM_READWRITE));
g_object_class_install_property (object_class, PROP_FRACTION, g_object_class_install_property (object_class, PROP_FRACTION,
g_param_spec_string ("fraction", g_param_spec_string ("fraction",
"The zoom factor expressed as a fraction", NULL, "The zoom factor expressed as a fraction", NULL,
"1:1", "1:1",
G_PARAM_READABLE)); GIMP_PARAM_READABLE));
g_object_class_install_property (object_class, PROP_PERCENTAGE, g_object_class_install_property (object_class, PROP_PERCENTAGE,
g_param_spec_string ("percentage", g_param_spec_string ("percentage",
"The zoom factor expressed as a percentage", NULL, "The zoom factor expressed as a percentage", NULL,
"100%", "100%",
G_PARAM_READABLE)); GIMP_PARAM_READABLE));
g_type_class_add_private (object_class, sizeof (GimpZoomModelPrivate)); g_type_class_add_private (object_class, sizeof (GimpZoomModelPrivate));
} }

View File

@ -285,7 +285,7 @@ cdisplay_colorblind_class_init (CdisplayColorblindClass *klass)
"deficiency", NULL, "deficiency", NULL,
CDISPLAY_TYPE_COLORBLIND_DEFICIENCY, CDISPLAY_TYPE_COLORBLIND_DEFICIENCY,
DEFAULT_DEFICIENCY, DEFAULT_DEFICIENCY,
0); GIMP_PARAM_STATIC_STRINGS);
display_class->name = _("Color Deficient Vision"); display_class->name = _("Color Deficient Vision");
display_class->help_id = "gimp-colordisplay-colorblind"; display_class->help_id = "gimp-colordisplay-colorblind";

View File

@ -155,7 +155,7 @@ cdisplay_gamma_class_init (CdisplayGammaClass *klass)
GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_GAMMA, GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_GAMMA,
"gamma", NULL, "gamma", NULL,
0.01, 10.0, DEFAULT_GAMMA, 0.01, 10.0, DEFAULT_GAMMA,
0); GIMP_PARAM_STATIC_STRINGS);
display_class->name = _("Gamma"); display_class->name = _("Gamma");
display_class->help_id = "gimp-colordisplay-gamma"; display_class->help_id = "gimp-colordisplay-gamma";

View File

@ -155,7 +155,7 @@ cdisplay_contrast_class_init (CdisplayContrastClass *klass)
GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_CONTRAST, GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_CONTRAST,
"contrast", NULL, "contrast", NULL,
0.01, 10.0, DEFAULT_CONTRAST, 0.01, 10.0, DEFAULT_CONTRAST,
0); GIMP_PARAM_STATIC_STRINGS);
display_class->name = _("Contrast"); display_class->name = _("Contrast");
display_class->help_id = "gimp-colordisplay-contrast"; display_class->help_id = "gimp-colordisplay-contrast";

View File

@ -168,7 +168,7 @@ cdisplay_lcms_class_init (CdisplayLcmsClass *klass)
GIMP_CONFIG_INSTALL_PROP_OBJECT (object_class, PROP_CONFIG, GIMP_CONFIG_INSTALL_PROP_OBJECT (object_class, PROP_CONFIG,
"config", NULL, "config", NULL,
GIMP_TYPE_COLOR_CONFIG, GIMP_TYPE_COLOR_CONFIG,
0); GIMP_PARAM_STATIC_STRINGS);
display_class->name = _("Color Management"); display_class->name = _("Color Management");
display_class->help_id = "gimp-colordisplay-lcms"; display_class->help_id = "gimp-colordisplay-lcms";

View File

@ -208,15 +208,15 @@ cdisplay_proof_class_init (CdisplayProofClass *klass)
GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_INTENT, GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_INTENT,
"intent", NULL, "intent", NULL,
CDISPLAY_TYPE_PROOF_INTENT, INTENT_PERCEPTUAL, CDISPLAY_TYPE_PROOF_INTENT, INTENT_PERCEPTUAL,
0); GIMP_PARAM_STATIC_STRINGS);
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_BPC, GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_BPC,
"black-point-compensation", NULL, "black-point-compensation", NULL,
FALSE, FALSE,
0); GIMP_PARAM_STATIC_STRINGS);
GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_PROFILE, GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_PROFILE,
"profile", NULL, "profile", NULL,
GIMP_CONFIG_PATH_FILE, NULL, GIMP_CONFIG_PATH_FILE, NULL,
0); GIMP_PARAM_STATIC_STRINGS);
display_class->name = _("Color Proof"); display_class->name = _("Color Proof");
display_class->help_id = "gimp-colordisplay-proof"; display_class->help_id = "gimp-colordisplay-proof";

View File

@ -222,6 +222,7 @@ linux_input_class_init (ControllerLinuxInputClass *klass)
_("Device:"), _("Device:"),
_("The name of the device to read Linux Input events from."), _("The name of the device to read Linux Input events from."),
NULL, NULL,
GIMP_PARAM_STATIC_STRINGS |
GIMP_CONFIG_PARAM_FLAGS)); GIMP_CONFIG_PARAM_FLAGS));
controller_class->name = _("Linux Input"); controller_class->name = _("Linux Input");

View File

@ -244,6 +244,7 @@ midi_class_init (ControllerMidiClass *klass)
_("Device:"), _("Device:"),
blurb, blurb,
NULL, NULL,
GIMP_PARAM_STATIC_STRINGS |
GIMP_CONFIG_PARAM_FLAGS)); GIMP_CONFIG_PARAM_FLAGS));
g_free (blurb); g_free (blurb);
@ -253,6 +254,7 @@ midi_class_init (ControllerMidiClass *klass)
_("Channel:"), _("Channel:"),
_("The MIDI channel to read events from. Set to -1 for reading from all MIDI channels."), _("The MIDI channel to read events from. Set to -1 for reading from all MIDI channels."),
-1, 15, -1, -1, 15, -1,
GIMP_PARAM_STATIC_STRINGS |
GIMP_CONFIG_PARAM_FLAGS)); GIMP_CONFIG_PARAM_FLAGS));
controller_class->name = _("MIDI"); controller_class->name = _("MIDI");