app/config/Makefile.am app/config/gimpguiconfig.[ch] started to implement

2001-12-16  Sven Neumann  <sven@gimp.org>

	* app/config/Makefile.am
	* app/config/gimpguiconfig.[ch]
	* app/config/test-config.c: started to implement GimpGuiConfig.

	* app/config/gimpcoreconfig.c: set default for image-comment.
This commit is contained in:
Sven Neumann 2001-12-16 21:34:05 +00:00 committed by Sven Neumann
parent 45874f1b36
commit 8ba4e0c07d
6 changed files with 438 additions and 3 deletions

View file

@ -1,3 +1,11 @@
2001-12-16 Sven Neumann <sven@gimp.org>
* app/config/Makefile.am
* app/config/gimpguiconfig.[ch]
* app/config/test-config.c: started to implement GimpGuiConfig.
* app/config/gimpcoreconfig.c: set default for image-comment.
2001-12-16 Sven Neumann <sven@gimp.org>
* app/core/gimpcoreconfig.[ch]: changed thumbnail_mode to boolean

View file

@ -20,6 +20,8 @@ libappconfig_a_SOURCES = @STRIP_BEGIN@ \
gimpbaseconfig.h \
gimpcoreconfig.c \
gimpcoreconfig.h \
gimpguiconfig.c \
gimpguiconfig.h \
@STRIP_END@
AM_CPPFLAGS = @STRIP_BEGIN@ \

View file

@ -151,7 +151,7 @@ gimp_core_config_class_init (GimpCoreConfigClass *klass)
NULL);
GIMP_CONFIG_INSTALL_PROP_STRING (object_class, PROP_DEFAULT_COMMENT,
"default-comment",
NULL);
"Created with The GIMP");
GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_DEFAULT_IMAGE_TYPE,
"default-image-type",
GIMP_TYPE_IMAGE_BASE_TYPE, GIMP_RGB);

321
app/config/gimpguiconfig.c Normal file
View file

@ -0,0 +1,321 @@
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* GimpGuiConfig class
* Copyright (C) 2001 Sven Neumann <sven@gimp.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include <glib-object.h>
#include "libgimpbase/gimpbase.h"
#include "base/base-enums.h"
#include "core/core-enums.h"
#include "gimpconfig.h"
#include "gimpconfig-params.h"
#include "gimpconfig-types.h"
#include "gimpguiconfig.h"
static void gimp_gui_config_class_init (GimpGuiConfigClass *klass);
static void gimp_gui_config_set_property (GObject *object,
guint property_id,
const GValue *value,
GParamSpec *pspec);
static void gimp_gui_config_get_property (GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec);
enum
{
PROP_0,
PROP_MARCHING_ANTS_SPEED,
PROP_COLORMAP_CYCLING,
PROP_LAST_OPENED_SIZE,
PROP_TRANSPARENCY_SIZE,
PROP_TRANSPARENCY_TYPE,
PROP_GAMMA_CORRECTION,
PROP_PERFECT_MOUSE,
PROP_INSTALL_COLORMAP,
PROP_MIN_COLORS,
PROP_DEFAULT_THRESHOLD,
PROP_RESIZE_WINDOWS_ON_ZOOM,
PROP_RESIZE_WINDOWS_ON_RESIZE,
PROP_PREVIEW_SIZE,
PROP_NAV_PREVIEW_SIZE,
PROP_IMAGE_TITLE_FORMAT,
PROP_SHOW_RULERS,
PROP_SHOW_STATUSBAR,
PROP_SHOW_TOOL_TIPS,
PROP_GLOBAL_PAINT_OPTIONS
};
GType
gimp_gui_config_get_type (void)
{
static GType config_type = 0;
if (! config_type)
{
static const GTypeInfo config_info =
{
sizeof (GimpGuiConfigClass),
NULL, /* base_init */
NULL, /* base_finalize */
(GClassInitFunc) gimp_gui_config_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GimpGuiConfig),
0, /* n_preallocs */
NULL /* instance_init */
};
config_type = g_type_register_static (GIMP_TYPE_CORE_CONFIG,
"GimpGuiConfig",
&config_info, 0);
}
return config_type;
}
static void
gimp_gui_config_class_init (GimpGuiConfigClass *klass)
{
GObjectClass *object_class;
object_class = G_OBJECT_CLASS (klass);
object_class->set_property = gimp_gui_config_set_property;
object_class->get_property = gimp_gui_config_get_property;
GIMP_CONFIG_INSTALL_PROP_INT (object_class, PROP_MARCHING_ANTS_SPEED,
"marching-ants-speed",
50, G_MAXINT, 300);
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_COLORMAP_CYCLING,
"colormap-cycling",
FALSE);
GIMP_CONFIG_INSTALL_PROP_INT (object_class, PROP_LAST_OPENED_SIZE,
"last-opened-size",
0, G_MAXINT, 4);
GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_TRANSPARENCY_SIZE,
"transparency-size",
GIMP_TYPE_CHECK_SIZE, GIMP_MEDIUM_CHECKS);
GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_TRANSPARENCY_TYPE,
"transparency-type",
GIMP_TYPE_CHECK_TYPE, GIMP_GRAY_CHECKS);
GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_GAMMA_CORRECTION,
"gamma-correction",
0.0, 100.0, 1.0);
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_PERFECT_MOUSE,
"perfect-mouse",
FALSE);
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_INSTALL_COLORMAP,
"install-colormap",
FALSE);
GIMP_CONFIG_INSTALL_PROP_INT (object_class, PROP_MIN_COLORS,
"min-colors",
27, 256, 144);
GIMP_CONFIG_INSTALL_PROP_INT (object_class, PROP_DEFAULT_THRESHOLD,
"default-threshold",
0, 255, 15);
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_RESIZE_WINDOWS_ON_ZOOM,
"resize-windows-on-zoom",
FALSE);
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_RESIZE_WINDOWS_ON_RESIZE,
"resize-windows-on-resize",
FALSE);
GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_PREVIEW_SIZE,
"preview-size",
GIMP_TYPE_PREVIEW_SIZE, GIMP_PREVIEW_SIZE_SMALL);
GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_NAV_PREVIEW_SIZE,
"nav-preview-size",
GIMP_TYPE_PREVIEW_SIZE, GIMP_PREVIEW_SIZE_HUGE);
GIMP_CONFIG_INSTALL_PROP_STRING (object_class, PROP_IMAGE_TITLE_FORMAT,
"image-title-format",
"%f-%p.%i (%t)");
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_SHOW_RULERS,
"show-rulers",
TRUE);
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_SHOW_STATUSBAR,
"show-statusbar",
TRUE);
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_SHOW_TOOL_TIPS,
"show-tool-tips",
TRUE);
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_GLOBAL_PAINT_OPTIONS,
"global-paint-options",
FALSE);
}
static void
gimp_gui_config_set_property (GObject *object,
guint property_id,
const GValue *value,
GParamSpec *pspec)
{
GimpGuiConfig *gui_config;
gui_config = GIMP_GUI_CONFIG (object);
switch (property_id)
{
case PROP_MARCHING_ANTS_SPEED:
gui_config->marching_ants_speed = g_value_get_int (value);
break;
case PROP_COLORMAP_CYCLING:
gui_config->colormap_cycling = g_value_get_boolean (value);
break;
case PROP_LAST_OPENED_SIZE:
gui_config->last_opened_size = g_value_get_int (value);
break;
case PROP_TRANSPARENCY_SIZE:
gui_config->transparency_size = g_value_get_enum (value);
break;
case PROP_TRANSPARENCY_TYPE:
gui_config->transparency_type = g_value_get_enum (value);
break;
case PROP_GAMMA_CORRECTION:
gui_config->gamma_val = g_value_get_double (value);
break;
case PROP_PERFECT_MOUSE:
gui_config->perfect_mouse = g_value_get_boolean (value);
break;
case PROP_INSTALL_COLORMAP:
gui_config->install_cmap = g_value_get_boolean (value);
break;
case PROP_MIN_COLORS:
gui_config->min_colors = g_value_get_int (value);
break;
case PROP_DEFAULT_THRESHOLD:
gui_config->default_threshold = g_value_get_int (value);
break;
case PROP_RESIZE_WINDOWS_ON_ZOOM:
gui_config->resize_windows_on_zoom = g_value_get_boolean (value);
break;
case PROP_RESIZE_WINDOWS_ON_RESIZE:
gui_config->resize_windows_on_resize = g_value_get_boolean (value);
break;
case PROP_PREVIEW_SIZE:
gui_config->preview_size = g_value_get_enum (value);
break;
case PROP_NAV_PREVIEW_SIZE:
gui_config->nav_preview_size = g_value_get_enum (value);
break;
case PROP_IMAGE_TITLE_FORMAT:
g_free (gui_config->image_title_format);
gui_config->image_title_format = g_value_dup_string (value);
break;
case PROP_SHOW_RULERS:
gui_config->show_rulers = g_value_get_boolean (value);
break;
case PROP_SHOW_STATUSBAR:
gui_config->show_statusbar = g_value_get_boolean (value);
break;
case PROP_SHOW_TOOL_TIPS:
gui_config->show_tool_tips = g_value_get_boolean (value);
break;
case PROP_GLOBAL_PAINT_OPTIONS:
gui_config->global_paint_options = g_value_get_boolean (value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
}
}
static void
gimp_gui_config_get_property (GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec)
{
GimpGuiConfig *gui_config;
gui_config = GIMP_GUI_CONFIG (object);
switch (property_id)
{
case PROP_MARCHING_ANTS_SPEED:
g_value_set_int (value, gui_config->marching_ants_speed);
break;
case PROP_COLORMAP_CYCLING:
g_value_set_boolean (value, gui_config->colormap_cycling);
break;
case PROP_LAST_OPENED_SIZE:
g_value_set_int (value, gui_config->last_opened_size);
break;
case PROP_TRANSPARENCY_SIZE:
g_value_set_enum (value, gui_config->transparency_size);
break;
case PROP_TRANSPARENCY_TYPE:
g_value_set_enum (value, gui_config->transparency_type);
break;
case PROP_GAMMA_CORRECTION:
g_value_set_double (value, gui_config->gamma_val);
break;
case PROP_PERFECT_MOUSE:
g_value_set_boolean (value, gui_config->perfect_mouse);
break;
case PROP_INSTALL_COLORMAP:
g_value_set_boolean (value, gui_config->install_cmap);
break;
case PROP_MIN_COLORS:
g_value_set_int (value, gui_config->min_colors);
break;
case PROP_DEFAULT_THRESHOLD:
g_value_set_int (value, gui_config->default_threshold);
break;
case PROP_RESIZE_WINDOWS_ON_ZOOM:
g_value_set_boolean (value, gui_config->resize_windows_on_zoom);
break;
case PROP_RESIZE_WINDOWS_ON_RESIZE:
g_value_set_boolean (value, gui_config->resize_windows_on_resize);
break;
case PROP_PREVIEW_SIZE:
g_value_set_enum (value, gui_config->preview_size);
break;
case PROP_NAV_PREVIEW_SIZE:
g_value_set_enum (value, gui_config->nav_preview_size);
break;
case PROP_IMAGE_TITLE_FORMAT:
g_value_set_string (value, gui_config->image_title_format);
break;
case PROP_SHOW_RULERS:
g_value_set_boolean (value, gui_config->show_rulers);
break;
case PROP_SHOW_STATUSBAR:
g_value_set_boolean (value, gui_config->show_statusbar);
break;
case PROP_SHOW_TOOL_TIPS:
g_value_set_boolean (value, gui_config->show_tool_tips);
break;
case PROP_GLOBAL_PAINT_OPTIONS:
g_value_set_boolean (value, gui_config->global_paint_options);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
}
}

104
app/config/gimpguiconfig.h Normal file
View file

@ -0,0 +1,104 @@
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* GimpGuiConfig class
* Copyright (C) 2001 Sven Neumann <sven@gimp.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __GIMP_GUI_CONFIG_H__
#define __GIMP_GUI_CONFIG_H__
#include "gimpcoreconfig.h"
#define GIMP_TYPE_GUI_CONFIG (gimp_gui_config_get_type ())
#define GIMP_GUI_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_GUI_CONFIG, GimpGuiConfig))
#define GIMP_GUI_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_GUI_CONFIG, GimpGuiConfigClass))
#define GIMP_IS_GUI_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_GUI_CONFIG))
#define GIMP_IS_GUI_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_GUI_CONFIG))
typedef struct _GimpGuiConfig GimpGuiConfig;
typedef struct _GimpGuiConfigClass GimpGuiConfigClass;
struct _GimpGuiConfig
{
GimpCoreConfig parent_instance;
gint marching_ants_speed;
gboolean colormap_cycling;
gint last_opened_size;
GimpCheckSize transparency_size;
GimpCheckType transparency_type;
gdouble gamma_val;
gboolean perfect_mouse;
gboolean install_cmap;
gint min_colors;
gint default_threshold;
gboolean resize_windows_on_zoom;
gboolean resize_windows_on_resize;
GimpPreviewSize preview_size;
GimpPreviewSize nav_preview_size;
gchar *image_title_format;
gboolean show_rulers;
gboolean show_statusbar;
gboolean show_tool_tips;
gboolean global_paint_options;
/* the fields below have not yet been implemented as properties */
gboolean confirm_on_close;
gboolean default_dot_for_dot;
gboolean save_device_status;
gboolean save_session_info;
gboolean always_restore_session;
gboolean show_tips;
gint last_tip;
gdouble monitor_xres;
gdouble monitor_yres;
gboolean using_xserver_resolution;
gboolean show_indicators;
guint max_new_image_size;
gboolean trust_dirty_flag;
gboolean nav_window_per_display;
gboolean info_window_follows_mouse;
gboolean use_help;
gint help_browser;
gint cursor_mode;
gboolean no_cursor_updating;
gboolean disable_tearoff_menus;
gchar *theme_path;
gchar *theme;
};
struct _GimpGuiConfigClass
{
GimpCoreConfigClass parent_class;
};
GType gimp_gui_config_get_type (void) G_GNUC_CONST;
#endif /* GIMP_GUI_CONFIG_H__ */

View file

@ -30,7 +30,7 @@
#include "core/core-enums.h"
#include "gimpconfig.h"
#include "gimpcoreconfig.h"
#include "gimpguiconfig.h"
static void notify_callback (GObject *object,
@ -65,7 +65,7 @@ main (int argc,
g_print ("Testing GimpConfig ...\n\n");
config = g_object_new (GIMP_TYPE_CORE_CONFIG, NULL);
config = g_object_new (GIMP_TYPE_GUI_CONFIG, NULL);
g_print (" Serializing %s to '%s' ... ",
g_type_name (G_TYPE_FROM_INSTANCE (config)), filename);