Commit 4fc86a04 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

gimp-mkenums doesn't seem to like newlines in enum definitions.

2005-02-08  Sven Neumann  <sven@gimp.org>

	* libgimpconfig/gimpcolorconfig-enums.[ch]: gimp-mkenums doesn't
	seem to like newlines in enum definitions.

	* libgimpconfig/gimpcolorconfig.[ch]: removed the "profile-path"
	property for now. It doesn't work too well with GimpFileEntry.
	We can add it back later if it turns out that we really need it.

	* app/dialogs/preferences-dialog.c
	* app/widgets/gimphelp-ids.h: added a color management page to the
	preferences dialog.
parent 8298cb90
2005-02-08 Sven Neumann <sven@gimp.org>
* libgimpconfig/gimpcolorconfig-enums.[ch]: gimp-mkenums doesn't
seem to like newlines in enum definitions.
* libgimpconfig/gimpcolorconfig.[ch]: removed the "profile-path"
property for now. It doesn't work too well with GimpFileEntry.
We can add it back later if it turns out that we really need it.
* app/dialogs/preferences-dialog.c
* app/widgets/gimphelp-ids.h: added a color management page to the
preferences dialog.
2005-02-07 Michael Natterer <mitch@gimp.org>
* plug-ins/uri/uri-backend.h: added backend methods for saving to
......
......@@ -2020,6 +2020,70 @@ prefs_dialog_new (Gimp *gimp,
sizeentry);
/**********************/
/* Color Management */
/**********************/
vbox = prefs_notebook_append_page (gimp,
GTK_NOTEBOOK (notebook),
_("Color Management"),
"color-management.png",
GTK_TREE_STORE (tree),
_("Color Management"),
GIMP_HELP_PREFS_COLOR_MANAGEMENT,
NULL,
&top_iter,
page_index++);
table = prefs_table_new (7, GTK_CONTAINER (vbox));
{
static const struct
{
const gchar *label;
const gchar *fs_label;
const gchar *property_name;
}
profiles[] =
{
{ N_("_RGB Profile:"),
N_("Select RGB color profile"), "rgb-profile" },
{ N_("_CMYK Profile:"),
N_("Select CMYK color profile"), "cmyk-profile" },
{ N_("_Monitor Profile:"),
N_("Select monitor color profile"), "display-profile" },
{ N_("_Printer Profile:"),
N_("Select printer color profile"), "printer-profile" }
};
GObject *color_config;
g_object_get (object, "color-management", &color_config, NULL);
prefs_enum_combo_box_add (color_config, "mode", 0, 0,
_("_Mode of operation:"),
GTK_TABLE (table), 0, NULL);
prefs_enum_combo_box_add (color_config, "display-rendering-intent", 0, 0,
_("_Display Rendering Intent:"),
GTK_TABLE (table), 1, NULL);
prefs_enum_combo_box_add (color_config, "simulation-rendering-intent", 0, 0,
_("_Softproof Rendering Intent:"),
GTK_TABLE (table), 2, NULL);
for (i = 0; i < G_N_ELEMENTS (profiles); i++)
{
fileselection =
gimp_prop_file_entry_new (color_config,
profiles[i].property_name,
gettext (profiles[i].fs_label),
FALSE, TRUE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 3 + i,
gettext (profiles[i].label), 0.0, 0.5,
fileselection, 1, FALSE);
}
g_object_unref (color_config);
}
/*******************/
/* Input Devices */
/*******************/
......
......@@ -386,6 +386,7 @@
#define GIMP_HELP_PREFS_IMAGE_WINDOW_TITLE "gimp-prefs-image-window-title"
#define GIMP_HELP_PREFS_DISPLAY "gimp-prefs-display"
#define GIMP_HELP_PREFS_MONITOR "gimp-prefs-monitor"
#define GIMP_HELP_PREFS_COLOR_MANAGEMENT "gimp-prefs-color-management"
#define GIMP_HELP_PREFS_WINDOW_MANAGEMENT "gimp-prefs-window-management"
#define GIMP_HELP_PREFS_ENVIRONMENT "gimp-prefs-environment"
#define GIMP_HELP_PREFS_SESSION "gimp-prefs-session"
......
......@@ -21,7 +21,6 @@ GimpColorConfig
@parent_instance:
@mode:
@profile_path:
@rgb_profile:
@cmyk_profile:
@display_profile:
......
......@@ -96,6 +96,8 @@ gimpconfig-params
name:
@\
name:
@\
name:
@\
name:
@blurb:
......@@ -136,6 +138,8 @@ gimpconfig-params
name:
@\
name:
@\
name:
@\
name:
@blurb:
......@@ -176,6 +180,8 @@ gimpconfig-params
name:
@\
name:
@\
name:
@\
name:
@blurb:
......@@ -218,6 +224,8 @@ gimpconfig-params
name:
@\
name:
@\
name:
@\
name:
@blurb:
......@@ -258,6 +266,8 @@ gimpconfig-params
name:
@\
name:
@\
name:
@\
name:
@blurb:
......@@ -299,6 +309,8 @@ gimpconfig-params
name:
@\
name:
@\
name:
@\
name:
@blurb:
......@@ -341,6 +353,8 @@ gimpconfig-params
name:
@\
name:
@\
name:
@\
name:
@blurb:
......@@ -381,6 +395,8 @@ gimpconfig-params
name:
@\
name:
@\
name:
@\
name:
@blurb:
......@@ -423,6 +439,8 @@ gimpconfig-params
name:
@\
name:
@\
name:
@\
name:
@blurb:
......@@ -466,6 +484,8 @@ gimpconfig-params
name:
@\
name:
@\
name:
@\
name:
@blurb:
......@@ -506,6 +526,8 @@ gimpconfig-params
name:
@\
name:
@\
name:
@\
name:
@blurb:
......@@ -548,6 +570,8 @@ gimpconfig-params
name:
@\
name:
@\
name:
@\
name:
@blurb:
......@@ -590,6 +614,8 @@ gimpconfig-params
name:
@\
name:
@\
name:
@\
name:
@blurb:
......@@ -630,6 +656,8 @@ gimpconfig-params
name:
@\
name:
@\
name:
@\
name:
@blurb:
......
......@@ -53,10 +53,10 @@ gimp_color_rendering_intent_get_type (void)
static const GimpEnumDesc descs[] =
{
{ GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL, "GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL", NULL },
{ GIMP_COLOR_RENDERING_INTENT_RELATIVE_COLORIMETRIC, "GIMP_COLOR_RENDERING_INTENT_RELATIVE_COLORIMETRIC", NULL },
{ GIMP_COLOR_RENDERING_INTENT_SATURATION, "GIMP_COLOR_RENDERING_INTENT_SATURATION", NULL },
{ GIMP_COLOR_RENDERING_INTENT_ABSOLUTE_COLORIMETRIC, "GIMP_COLOR_RENDERING_INTENT_ABSOLUTE_COLORIMETRIC", NULL },
{ GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL, N_("Perceptual"), NULL },
{ GIMP_COLOR_RENDERING_INTENT_RELATIVE_COLORIMETRIC, N_("Relative Colorimetric"), NULL },
{ GIMP_COLOR_RENDERING_INTENT_SATURATION, N_("Saturation"), NULL },
{ GIMP_COLOR_RENDERING_INTENT_ABSOLUTE_COLORIMETRIC, N_("Absolute Colorimetric"), NULL },
{ 0, NULL, NULL }
};
......
......@@ -43,14 +43,10 @@ GType gimp_color_rendering_intent_get_type (void) G_GNUC_CONST;
typedef enum
{
GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL,
/*< desc="Perceptual" >*/
GIMP_COLOR_RENDERING_INTENT_RELATIVE_COLORIMETRIC,
/*< desc="Relative Colorimetric" >*/
GIMP_COLOR_RENDERING_INTENT_SATURATION,
/*< desc="Saturation" >*/
GIMP_COLOR_RENDERING_INTENT_ABSOLUTE_COLORIMETRIC
/*< desc="Absolute Colorimetric" >*/
GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL, /*< desc="Perceptual" >*/
GIMP_COLOR_RENDERING_INTENT_RELATIVE_COLORIMETRIC, /*< desc="Relative Colorimetric" >*/
GIMP_COLOR_RENDERING_INTENT_SATURATION, /*< desc="Saturation" >*/
GIMP_COLOR_RENDERING_INTENT_ABSOLUTE_COLORIMETRIC /*< desc="Absolute Colorimetric" >*/
} GimpColorRenderingIntent;
......
......@@ -36,15 +36,10 @@
#include "libgimp/libgimp-intl.h"
#define DEFAULT_PROFILE_PATH "/usr/share/color/icc"
#define COLOR_MANAGEMENT_MODE_BLURB \
N_("Mode of operation for color management.")
#define PROFILE_PATH_BLURB \
N_("Default folder where ICC profiles are located.")
#define DISPLAY_PROFILE_BLURB \
N_("Sets the display color profile.")
N_("Sets the color profile for the display.")
#define RGB_PROFILE_BLURB \
N_("Sets default RGB workspace color profile.")
#define CMYK_PROFILE_BLURB \
......@@ -67,7 +62,6 @@ enum
{
PROP_0,
PROP_MODE,
PROP_PROFILE_PATH,
PROP_RGB_PROFILE,
PROP_CMYK_PROFILE,
PROP_DISPLAY_PROFILE,
......@@ -151,10 +145,6 @@ gimp_color_config_class_init (GimpColorConfigClass *klass)
GIMP_TYPE_COLOR_MANAGEMENT_MODE,
GIMP_COLOR_MANAGEMENT_DISPLAY,
0);
GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_PROFILE_PATH,
"profile-path", PROFILE_PATH_BLURB,
GIMP_CONFIG_PATH_DIR, DEFAULT_PROFILE_PATH,
0);
GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_RGB_PROFILE,
"rgb-profile", RGB_PROFILE_BLURB,
GIMP_CONFIG_PATH_FILE, NULL,
......@@ -210,7 +200,6 @@ gimp_color_config_finalize (GObject *object)
{
GimpColorConfig *color_config = GIMP_COLOR_CONFIG (object);
g_free (color_config->profile_path);
g_free (color_config->rgb_profile);
g_free (color_config->cmyk_profile);
g_free (color_config->display_profile);
......@@ -232,10 +221,6 @@ gimp_color_config_set_property (GObject *object,
case PROP_MODE:
color_config->mode = g_value_get_enum (value);
break;
case PROP_PROFILE_PATH:
g_free (color_config->profile_path);
color_config->profile_path = g_value_dup_string (value);
break;
case PROP_RGB_PROFILE:
g_free (color_config->rgb_profile);
color_config->rgb_profile = g_value_dup_string (value);
......@@ -288,9 +273,6 @@ gimp_color_config_get_property (GObject *object,
case PROP_MODE:
g_value_set_enum (value, color_config->mode);
break;
case PROP_PROFILE_PATH:
g_value_set_string (value, color_config->profile_path);
break;
case PROP_RGB_PROFILE:
g_value_set_string (value, color_config->rgb_profile);
break;
......
......@@ -38,7 +38,6 @@ struct _GimpColorConfig
GObject parent_instance;
GimpColorManagementMode mode;
gchar *profile_path;
gchar *rgb_profile;
gchar *cmyk_profile;
gchar *display_profile;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment