Imported Upstream version 2.3.14

This commit is contained in:
Ari Pollak
2010-08-11 01:20:46 -04:00
parent bbd6d9844c
commit aca02f7697
2412 changed files with 114847 additions and 56535 deletions

View File

@ -197,6 +197,9 @@ CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@
DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DEFAULT_BINARY_FALSE = @DEFAULT_BINARY_FALSE@
DEFAULT_BINARY_TRUE = @DEFAULT_BINARY_TRUE@
DEFS = @DEFS@
@ -234,6 +237,7 @@ GIMPINSTALL = @GIMPINSTALL@
GIMP_API_VERSION = @GIMP_API_VERSION@
GIMP_APP_VERSION = @GIMP_APP_VERSION@
GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
GIMP_COMMAND = @GIMP_COMMAND@
GIMP_DATA_VERSION = @GIMP_DATA_VERSION@
GIMP_FULL_NAME = @GIMP_FULL_NAME@
GIMP_INTERFACE_AGE = @GIMP_INTERFACE_AGE@

View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
*
* cdisplay_colorblind.c

View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1999 Manish Singh <yosh@gimp.org>
*
* This program is free software; you can redistribute it and/or modify
@ -121,14 +121,14 @@ cdisplay_gamma_get_type (GTypeModule *module)
const GTypeInfo display_info =
{
sizeof (CdisplayGammaClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) cdisplay_gamma_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (CdisplayGamma),
0, /* n_preallocs */
NULL /* instance_init */
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) cdisplay_gamma_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (CdisplayGamma),
0, /* n_preallocs */
NULL /* instance_init */
};
cdisplay_gamma_type =
@ -232,10 +232,10 @@ cdisplay_gamma_convert (GimpColorDisplay *display,
{
i = width;
while (i--)
{
*buf = gamma->lookup[*buf];
buf++;
}
{
*buf = gamma->lookup[*buf];
buf++;
}
buf += bpl;
}
}

View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1999 Manish Singh <yosh@gimp.org>
*
* This program is free software; you can redistribute it and/or modify
@ -121,14 +121,14 @@ cdisplay_contrast_get_type (GTypeModule *module)
const GTypeInfo display_info =
{
sizeof (CdisplayContrastClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) cdisplay_contrast_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (CdisplayContrast),
0, /* n_preallocs */
NULL /* instance_init */
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) cdisplay_contrast_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (CdisplayContrast),
0, /* n_preallocs */
NULL /* instance_init */
};
cdisplay_contrast_type =
@ -232,10 +232,10 @@ cdisplay_contrast_convert (GimpColorDisplay *display,
{
i = width;
while (i--)
{
*buf = contrast->lookup[*buf];
buf++;
}
{
*buf = contrast->lookup[*buf];
buf++;
}
buf += bpl;
}
}

View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify
@ -149,16 +149,16 @@ cdisplay_lcms_get_type (GTypeModule *module)
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) cdisplay_lcms_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (CdisplayLcms),
0, /* n_preallocs */
0, /* n_preallocs */
(GInstanceInitFunc) cdisplay_lcms_init,
};
cdisplay_lcms_type =
g_type_module_register_type (module, GIMP_TYPE_COLOR_DISPLAY,
"CdisplayLcms", &display_info, 0);
g_type_module_register_type (module, GIMP_TYPE_COLOR_DISPLAY,
"CdisplayLcms", &display_info, 0);
}
return cdisplay_lcms_type;
@ -394,8 +394,8 @@ cdisplay_lcms_changed (GimpColorDisplay *display)
dest_profile :
src_profile), TYPE_RGB_8,
proof_profile,
config->display_intent,
config->simulation_intent,
config->display_intent,
cmsFLAGS_SOFTPROOFING);
cmsCloseProfile (proof_profile);
}

View File

@ -1,4 +1,4 @@
/* The GIMP -- an image manipulation program
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify
@ -135,16 +135,16 @@ cdisplay_proof_get_type (GTypeModule *module)
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) cdisplay_proof_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (CdisplayProof),
0, /* n_preallocs */
0, /* n_preallocs */
(GInstanceInitFunc) cdisplay_proof_init,
};
cdisplay_proof_type =
g_type_module_register_type (module, GIMP_TYPE_COLOR_DISPLAY,
"CdisplayProof", &display_info, 0);
g_type_module_register_type (module, GIMP_TYPE_COLOR_DISPLAY,
"CdisplayProof", &display_info, 0);
}
return cdisplay_proof_type;
@ -268,8 +268,8 @@ cdisplay_proof_set_property (GObject *object,
static void
cdisplay_proof_convert (GimpColorDisplay *display,
guchar *buf,
gint width,
guchar *buf,
gint width,
gint height,
gint bpp,
gint bpl)

View File

@ -102,14 +102,14 @@ colorsel_cmyk_get_type (GTypeModule *module)
const GTypeInfo select_info =
{
sizeof (ColorselCmykClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) colorsel_cmyk_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (ColorselCmyk),
0, /* n_preallocs */
(GInstanceInitFunc) colorsel_cmyk_init,
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) colorsel_cmyk_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (ColorselCmyk),
0, /* n_preallocs */
(GInstanceInitFunc) colorsel_cmyk_init,
};
colorsel_cmyk_type =
@ -175,19 +175,19 @@ colorsel_cmyk_init (ColorselCmyk *module)
for (i = 0; i < 4; i++)
{
adj = gimp_scale_entry_new (GTK_TABLE (table), 1, i,
gettext (cmyk_labels[i]),
-1, -1,
0.0,
0.0, 100.0,
1.0, 10.0,
0,
TRUE, 0.0, 0.0,
gettext (cmyk_tips[i]),
NULL);
gettext (cmyk_labels[i]),
-1, -1,
0.0,
0.0, 100.0,
1.0, 10.0,
0,
TRUE, 0.0, 0.0,
gettext (cmyk_tips[i]),
NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (colorsel_cmyk_adj_update),
module);
G_CALLBACK (colorsel_cmyk_adj_update),
module);
module->adj[i] = GTK_ADJUSTMENT (adj);
}
@ -204,8 +204,8 @@ colorsel_cmyk_init (ColorselCmyk *module)
1.0, 0);
gtk_table_attach (GTK_TABLE (table), spinbutton,
3, 4, i, i + 1,
GTK_SHRINK, GTK_SHRINK, 0, 0);
3, 4, i, i + 1,
GTK_SHRINK, GTK_SHRINK, 0, 0);
gtk_widget_show (spinbutton);
gimp_help_set_help_data (spinbutton,
@ -224,8 +224,8 @@ colorsel_cmyk_init (ColorselCmyk *module)
static void
colorsel_cmyk_set_color (GimpColorSelector *selector,
const GimpRGB *rgb,
const GimpHSV *hsv)
const GimpRGB *rgb,
const GimpHSV *hsv)
{
ColorselCmyk *module = COLORSEL_CMYK (selector);
@ -239,7 +239,7 @@ colorsel_cmyk_set_color (GimpColorSelector *selector,
static void
colorsel_cmyk_adj_update (GtkAdjustment *adj,
ColorselCmyk *module)
ColorselCmyk *module)
{
GimpColorSelector *selector = GIMP_COLOR_SELECTOR (module);
gint i;

View File

@ -121,14 +121,14 @@ colorsel_cmyk_get_type (GTypeModule *module)
const GTypeInfo select_info =
{
sizeof (ColorselCmykClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) colorsel_cmyk_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (ColorselCmyk),
0, /* n_preallocs */
(GInstanceInitFunc) colorsel_cmyk_init,
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) colorsel_cmyk_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (ColorselCmyk),
0, /* n_preallocs */
(GInstanceInitFunc) colorsel_cmyk_init,
};
colorsel_cmyk_type =
@ -202,19 +202,19 @@ colorsel_cmyk_init (ColorselCmyk *module)
for (i = 0; i < 4; i++)
{
adj = gimp_scale_entry_new (GTK_TABLE (table), 1, i,
gettext (cmyk_labels[i]),
-1, -1,
0.0,
0.0, 100.0,
1.0, 10.0,
0,
TRUE, 0.0, 0.0,
gettext (cmyk_tips[i]),
NULL);
gettext (cmyk_labels[i]),
-1, -1,
0.0,
0.0, 100.0,
1.0, 10.0,
0,
TRUE, 0.0, 0.0,
gettext (cmyk_tips[i]),
NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (colorsel_cmyk_adj_update),
module);
G_CALLBACK (colorsel_cmyk_adj_update),
module);
module->adj[i] = GTK_ADJUSTMENT (adj);
}
@ -243,8 +243,8 @@ colorsel_cmyk_dispose (GObject *object)
static void
colorsel_cmyk_set_color (GimpColorSelector *selector,
const GimpRGB *rgb,
const GimpHSV *hsv)
const GimpRGB *rgb,
const GimpHSV *hsv)
{
ColorselCmyk *module = COLORSEL_CMYK (selector);
@ -307,7 +307,7 @@ colorsel_cmyk_set_config (GimpColorSelector *selector,
static void
colorsel_cmyk_adj_update (GtkAdjustment *adj,
ColorselCmyk *module)
ColorselCmyk *module)
{
GimpColorSelector *selector = GIMP_COLOR_SELECTOR (module);
gint i;

View File

@ -84,10 +84,26 @@ static const LinuxInputEvent key_events[] =
static const LinuxInputEvent rel_events[] =
{
{ REL_WHEEL, "wheel-turn-left", N_("Wheel Turn Left") },
{ REL_WHEEL, "wheel-turn-right", N_("Wheel Turn Right") },
{ REL_DIAL, "dial-turn-left", N_("Dial Turn Left") },
{ REL_DIAL, "dial-turn-right", N_("Dial Turn Right") },
{ REL_X, "x-move-left", N_("X Move Left") },
{ REL_X, "x-move-right", N_("X Move Right") },
{ REL_Y, "y-move-away", N_("Y Move Away") },
{ REL_Y, "y-move-near", N_("Y Move Near") },
{ REL_Z, "z-move-up", N_("Z Move Up") },
{ REL_Z, "z-move-down", N_("Z Move Down") },
#ifdef REL_RX
{ REL_RX, "x-axis-tilt-away", N_("X Axis Tilt Away") },
{ REL_RX, "x-axis-tilt-near", N_("X Axis Tilt Near") },
{ REL_RY, "y-axis-tilt-right", N_("Y Axis Tilt Right") },
{ REL_RY, "y-axis-tilt-left", N_("Y Axis Tilt Left") },
{ REL_RZ, "z-axis-turn-left", N_("Z Axis Turn Left") },
{ REL_RZ, "z-axis-turn-right", N_("Z Axis Turn Right") },
#endif /* REL_RX */
{ REL_HWHEEL, "horizontal-wheel-turn-back", N_("Horiz. Wheel Turn Back") },
{ REL_HWHEEL, "horizontal-wheel-turn-forward", N_("Horiz. Wheel Turn Forward") },
{ REL_DIAL, "dial-turn-left", N_("Dial Turn Left") },
{ REL_DIAL, "dial-turn-right", N_("Dial Turn Right") },
{ REL_WHEEL, "wheel-turn-left", N_("Wheel Turn Left") },
{ REL_WHEEL, "wheel-turn-right", N_("Wheel Turn Right") },
};

View File

@ -452,9 +452,9 @@ midi_set_device (ControllerMidi *midi,
SND_SEQ_OPEN_INPUT, 0);
if (ret >= 0)
{
snd_seq_set_client_name (midi->sequencer, "The GIMP");
snd_seq_set_client_name (midi->sequencer, _("GIMP"));
ret = snd_seq_create_simple_port (midi->sequencer,
"The GIMP midi controller",
_("GIMP MIDI Input Controller"),
SND_SEQ_PORT_CAP_WRITE |
SND_SEQ_PORT_CAP_SUBS_WRITE,
SND_SEQ_PORT_TYPE_APPLICATION);