callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use a mnemonic that doesn't collide with the rest of the dialog.

Browse Source 
2002-10-30  Sven Neumann  <sven@gimp.org>

	* libgimpwidgets/gimpcolorselect.c: use a mnemonic that doesn't
	collide with the rest of the dialog.

	* modules/Makefile.am
	* modules/colorsel_gtk.c: removed the GTK color selector module.

	* modules/cdisplay_gamma.c
	* modules/cdisplay_highcontrast.c
	* modules/colorsel_triangle.c
	* modules/colorsel_water.c: translate in the gimp14-libgimp domain.
This commit is contained in:
Sven Neumann
2002-10-30 15:12:30 +00:00
committed by Sven Neumann
parent 0ea33ada16
commit 1c0e9df23b
15 changed files with 124 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2002-10-30 Sven Neumann <sven@gimp.org>
* libgimpwidgets/gimpcolorselect.c: use a mnemonic that doesn't
collide with the rest of the dialog.
* modules/Makefile.am
* modules/colorsel_gtk.c: removed the GTK color selector module.
* modules/cdisplay_gamma.c
* modules/cdisplay_highcontrast.c
* modules/colorsel_triangle.c
* modules/colorsel_water.c: translate in the gimp14-libgimp domain.
2002-10-30 Michael Natterer <mitch@gimp.org> 2002-10-30 Michael Natterer <mitch@gimp.org>
* libgimpwidgets/gimpcolornotebook.c: create the notebook labels * libgimpwidgets/gimpcolornotebook.c: create the notebook labels

5
devel-docs/libgimpwidgets/tmpl/gimpcolorscale.sgml
View File

@ -19,13 +19,16 @@ GimpColorScale
</para> </para>
@parent_instance:
<!-- ##### FUNCTION gimp_color_scale_new ##### --> <!-- ##### FUNCTION gimp_color_scale_new ##### -->
<para> <para>
</para> </para>
@orientation:
@channel:
@rgb:
@hsv:
@Returns: @Returns:

2
libgimpwidgets/gimpcolorselect.c
View File

@ -248,7 +248,7 @@ gimp_color_select_class_init (GimpColorSelectClass *klass)
object_class->finalize = gimp_color_select_finalize; object_class->finalize = gimp_color_select_finalize;
selector_class->name = "_GIMP"; selector_class->name = "GI_MP";
selector_class->help_page = "built_in.html"; selector_class->help_page = "built_in.html";
selector_class->set_color = gimp_color_select_set_color; selector_class->set_color = gimp_color_select_set_color;
selector_class->set_channel = gimp_color_select_set_channel; selector_class->set_channel = gimp_color_select_set_channel;

6
modules/Makefile.am
View File

@ -20,14 +20,8 @@ lib_LTLIBRARIES = \
libcdisplay_highcontrast.la \ libcdisplay_highcontrast.la \
libcolorsel_water.la libcolorsel_water.la
## libcolorsel_gtk.la \
EXTRA_LTLIBRARIES = EXTRA_LTLIBRARIES =
## libcolorsel_gtk_la_SOURCES = colorsel_gtk.c
## libcolorsel_gtk_la_LDFLAGS = -avoid-version -module
## libcolorsel_gtk_la_LIBADD = $(GTK_LIBS)
libcolorsel_triangle_la_SOURCES = colorsel_triangle.c libcolorsel_triangle_la_SOURCES = colorsel_triangle.c
libcolorsel_triangle_la_LDFLAGS = -avoid-version -module libcolorsel_triangle_la_LDFLAGS = -avoid-version -module
libcolorsel_triangle_la_LIBADD = $(GTK_LIBS) libcolorsel_triangle_la_LIBADD = $(GTK_LIBS)

2
modules/cdisplay_gamma.c
View File

@ -27,7 +27,7 @@
#include "libgimpmodule/gimpmodule.h" #include "libgimpmodule/gimpmodule.h"
#include "libgimpwidgets/gimpwidgets.h" #include "libgimpwidgets/gimpwidgets.h"
#include "libgimp/gimpintl.h" #include "libgimp/libgimp-intl.h"
#define DEFAULT_GAMMA 1.0 #define DEFAULT_GAMMA 1.0

2
modules/cdisplay_highcontrast.c
View File

@ -27,7 +27,7 @@
#include "libgimpmodule/gimpmodule.h" #include "libgimpmodule/gimpmodule.h"
#include "libgimpwidgets/gimpwidgets.h" #include "libgimpwidgets/gimpwidgets.h"
#include "libgimp/gimpintl.h" #include "libgimp/libgimp-intl.h"
#define DEFAULT_CONTRAST 4.0 #define DEFAULT_CONTRAST 4.0

242
modules/colorsel_gtk.c
View File

@ -1,242 +0,0 @@
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* colorsel_gtk module (C) 1998 Austin Donnelly <austin@greenend.org.uk>
*
* 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 <stdio.h>
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "gimpmodregister.h"
#include "libgimp/gimpcolorselector.h"
#include "libgimp/gimpmodule.h"
#include "libgimp/gimpintl.h"
/* prototypes */
static GtkWidget * colorsel_gtk_new (const GimpHSV *hsv,
const GimpRGB *rgb,
gboolean show_alpha,
GimpColorSelectorCallback callback,
gpointer data,
gpointer *selector_data);
static void colorsel_gtk_free (gpointer data);
static void colorsel_gtk_set_color (gpointer data,
const GimpHSV *hsv,
const GimpRGB *rgb);
static void colorsel_gtk_update (GtkWidget *widget,
gpointer data);
/* EEK */
static gboolean colorsel_gtk_widget_idle_hide (gpointer data);
static void colorsel_gtk_widget_hide (GtkWidget *widget,
gpointer data);
/* local methods */
static GimpColorSelectorMethods methods =
{
colorsel_gtk_new,
colorsel_gtk_free,
colorsel_gtk_set_color,
NULL /* set_channel */
};
static GimpModuleInfo info =
{
NULL,
N_("GTK color selector as a pluggable color selector"),
"Austin Donnelly <austin@gimp.org>",
"v0.02",
"(c) 1999, released under the GPL",
"17 Jan 1999"
};
/* globaly exported init function */
G_MODULE_EXPORT GimpModuleStatus
module_init (GimpModuleInfo **inforet)
{
GimpColorSelectorID id;
#ifndef __EMX__
id = gimp_color_selector_register ("GTK", "gtk.html", &methods);
#else
id = mod_color_selector_register ("GTK", "gtk.html", &methods);
#endif
if (id)
{
info.shutdown_data = id;
*inforet = &info;
return GIMP_MODULE_OK;
}
else
{
return GIMP_MODULE_UNLOAD;
}
}
G_MODULE_EXPORT void
module_unload (gpointer shutdown_data,
GimpColorSelectorFinishedCB completed_cb,
gpointer completed_data)
{
#ifndef __EMX__
gimp_color_selector_unregister (shutdown_data, completed_cb, completed_data);
#else
mod_color_selector_unregister (shutdown_data, completed_cb, completed_data);
#endif
}
/******************************/
/* GTK color selector methods */
typedef struct
{
GtkWidget *selector;
GimpColorSelectorCallback callback;
void *client_data;
} ColorselGtk;
static GtkWidget *
colorsel_gtk_new (const GimpHSV *hsv,
const GimpRGB *rgb,
gboolean show_alpha,
GimpColorSelectorCallback callback,
gpointer data,
/* RETURNS: */
gpointer *selector_data)
{
GtkWidget *hbox;
GtkWidget *vbox;
ColorselGtk *p;
p = g_new (ColorselGtk, 1);
p->selector = gtk_color_selection_new ();
p->callback = callback;
p->client_data = data;
gtk_color_selection_set_opacity (GTK_COLOR_SELECTION (p->selector),
show_alpha);
gtk_widget_hide (GTK_COLOR_SELECTION (p->selector)->scales[0]->parent);
colorsel_gtk_set_color (p, hsv, rgb);
/* EEK: to be removed */
g_signal_connect (G_OBJECT (GTK_COLOR_SELECTION (p->selector)->sample_area),
"realize",
G_CALLBACK (colorsel_gtk_widget_hide),
GTK_COLOR_SELECTION (p->selector)->sample_area->parent,
G_CONNECT_SWAPPED | G_CONNECT_AFTER);
g_signal_connect (G_OBJECT (p->selector), "color_changed",
G_CALLBACK (colorsel_gtk_update),
p);
vbox = gtk_vbox_new (TRUE, 0);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
gtk_box_pack_start (GTK_BOX (vbox), p->selector, FALSE, FALSE, 0);
gtk_widget_show (p->selector);
gtk_widget_show (vbox);
hbox = gtk_hbox_new (TRUE, 0);
gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
*selector_data = p;
return hbox;
}
static void
colorsel_gtk_free (gpointer data)
{
ColorselGtk *p = data;
/* don't need to gtk_widget_destroy() the selector, since that's
* done for us.
*/
g_free (p);
}
static void
colorsel_gtk_set_color (gpointer data,
const GimpHSV *hsv,
const GimpRGB *rgb)
{
ColorselGtk *p = data;
gdouble color[4];
color[0] = rgb->r;
color[1] = rgb->g;
color[2] = rgb->b;
color[3] = rgb->a;
gtk_color_selection_set_color (GTK_COLOR_SELECTION (p->selector), color);
}
static void
colorsel_gtk_update (GtkWidget *widget,
gpointer data)
{
ColorselGtk *p = data;
GimpHSV hsv;
GimpRGB rgb;
gdouble color[4];
gtk_color_selection_get_color (GTK_COLOR_SELECTION (p->selector), color);
rgb.r = color[0];
rgb.g = color[1];
rgb.b = color[2];
rgb.a = color[3];
gimp_rgb_to_hsv (&rgb, &hsv);
p->callback (p->client_data, &hsv, &rgb);
}
/* EEK */
static gboolean
colorsel_gtk_widget_idle_hide (gpointer data)
{
gtk_widget_hide (GTK_WIDGET (data));
return FALSE;
}
static void
colorsel_gtk_widget_hide (GtkWidget *widget,
gpointer data)
{
g_idle_add (colorsel_gtk_widget_idle_hide, widget);
}

2
modules/colorsel_triangle.c
View File

@ -34,7 +34,7 @@
#include "libgimpmodule/gimpmodule.h" #include "libgimpmodule/gimpmodule.h"
#include "libgimpwidgets/gimpwidgets.h" #include "libgimpwidgets/gimpwidgets.h"
#include "libgimp/gimpintl.h" #include "libgimp/libgimp-intl.h"
#define COLORWHEELRADIUS (GIMP_COLOR_SELECTOR_SIZE / 2) #define COLORWHEELRADIUS (GIMP_COLOR_SELECTOR_SIZE / 2)

2
modules/colorsel_water.c
View File

@ -34,7 +34,7 @@
#include "libgimpmodule/gimpmodule.h" #include "libgimpmodule/gimpmodule.h"
#include "libgimpwidgets/gimpwidgets.h" #include "libgimpwidgets/gimpwidgets.h"
#include "libgimp/gimpintl.h" #include "libgimp/libgimp-intl.h"
/* definitions and variables */ /* definitions and variables */

6
po-libgimp/ChangeLog
View File

@ -1,3 +1,9 @@
2002-10-30 Sven Neumann <sven@gimp.org>
* POTFILES.in: moved modules to libgimp translation domain.
* de.po: updated german translation.
2002-10-30 Wang Jian <lark@linux.net.cn> 2002-10-30 Wang Jian <lark@linux.net.cn>
* zh_CN.po: Updated Simplified Chinese translation by * zh_CN.po: Updated Simplified Chinese translation by

5
po-libgimp/POTFILES.in
View File

@ -13,3 +13,8 @@ libgimpwidgets/gimpquerybox.c
libgimpwidgets/gimpstock.c libgimpwidgets/gimpstock.c
libgimpwidgets/gimpunitmenu.c libgimpwidgets/gimpunitmenu.c
libgimpwidgets/gimpwidgets.c libgimpwidgets/gimpwidgets.c
modules/cdisplay_gamma.c
modules/cdisplay_highcontrast.c
modules/colorsel_triangle.c
modules/colorsel_water.c

110
po-libgimp/de.po
View File

@ -7,7 +7,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: GIMP 1.3.9\n" "Project-Id-Version: GIMP 1.3.9\n"
"POT-Creation-Date: 2002-10-29 11:31+0100\n" "POT-Creation-Date: 2002-10-30 16:03+0100\n"
"PO-Revision-Date: 2002-10-29 11:35+0100\n" "PO-Revision-Date: 2002-10-29 11:35+0100\n"
"Last-Translator: Christian Neumair <christian-neumair@web.de>\n" "Last-Translator: Christian Neumair <christian-neumair@web.de>\n"
"Language-Team: German <gnome-de@gnome.org>\n" "Language-Team: German <gnome-de@gnome.org>\n"
@ -215,69 +215,73 @@ msgid "/White"
msgstr "/Weiss" msgstr "/Weiss"
#. Hue #. Hue
#: libgimpwidgets/gimpcolorscales.c:152 #: libgimpwidgets/gimpcolorscales.c:156
msgid "H" msgid "_H"
msgstr "H" msgstr "_H"
#. Saturation #. Saturation
#: libgimpwidgets/gimpcolorscales.c:154 #: libgimpwidgets/gimpcolorscales.c:158
msgid "S" msgid "_S"
msgstr "S" msgstr "_S"
#. Value #. Value
#: libgimpwidgets/gimpcolorscales.c:156 #: libgimpwidgets/gimpcolorscales.c:160
msgid "V" msgid "_V"
msgstr "V" msgstr "_V"
#. Red #. Red
#: libgimpwidgets/gimpcolorscales.c:158 #: libgimpwidgets/gimpcolorscales.c:162
msgid "R" msgid "_R"
msgstr "R" msgstr "_R"
#. Green #. Green
#: libgimpwidgets/gimpcolorscales.c:160 #: libgimpwidgets/gimpcolorscales.c:164
msgid "G" msgid "_G"
msgstr "G" msgstr "_G"
#. Blue #. Blue
#: libgimpwidgets/gimpcolorscales.c:162 #: libgimpwidgets/gimpcolorscales.c:166
msgid "B" msgid "_B"
msgstr "B" msgstr "_B"
#. Alpha #. Alpha
#: libgimpwidgets/gimpcolorscales.c:164
msgid "A"
msgstr "A"
#: libgimpwidgets/gimpcolorscales.c:168 #: libgimpwidgets/gimpcolorscales.c:168
msgid "_A"
msgstr "_A"
#: libgimpwidgets/gimpcolorscales.c:172
msgid "Hue" msgid "Hue"
msgstr "Farbton" msgstr "Farbton"
#: libgimpwidgets/gimpcolorscales.c:169 #: libgimpwidgets/gimpcolorscales.c:173
msgid "Saturation" msgid "Saturation"
msgstr "Sättigung" msgstr "Sättigung"
#: libgimpwidgets/gimpcolorscales.c:170 #: libgimpwidgets/gimpcolorscales.c:174
msgid "Value" msgid "Value"
msgstr "Wert" msgstr "Wert"
#: libgimpwidgets/gimpcolorscales.c:171 #: libgimpwidgets/gimpcolorscales.c:175
msgid "Red" msgid "Red"
msgstr "Rot" msgstr "Rot"
#: libgimpwidgets/gimpcolorscales.c:172 #: libgimpwidgets/gimpcolorscales.c:176
msgid "Green" msgid "Green"
msgstr "Grün" msgstr "Grün"
#: libgimpwidgets/gimpcolorscales.c:173 #: libgimpwidgets/gimpcolorscales.c:177
msgid "Blue" msgid "Blue"
msgstr "Blau" msgstr "Blau"
#: libgimpwidgets/gimpcolorscales.c:174 #: libgimpwidgets/gimpcolorscales.c:178
msgid "Alpha" msgid "Alpha"
msgstr "Deckung" msgstr "Deckkraft"
#: libgimpwidgets/gimpcolorscales.c:243 #: libgimpwidgets/gimpcolorscales.c:248
msgid "Hexadecimal color notation as used in HTML"
msgstr "Hexadezimale Schreibweise wie in HTML"
#: libgimpwidgets/gimpcolorscales.c:262
msgid "He_x Triplet:" msgid "He_x Triplet:"
msgstr "He_xadezimal:" msgstr "He_xadezimal:"
@ -405,3 +409,47 @@ msgstr "MegaByte"
#: libgimpwidgets/gimpwidgets.c:1222 #: libgimpwidgets/gimpwidgets.c:1222
msgid "GigaBytes" msgid "GigaBytes"
msgstr "GigaByte" msgstr "GigaByte"
#: modules/cdisplay_gamma.c:89
msgid "Gamma color display filter"
msgstr "Gamma Anzeigenfarbfilter"
#: modules/cdisplay_gamma.c:155
msgid "Gamma"
msgstr "Gamma"
#: modules/cdisplay_gamma.c:316
msgid "Gamma:"
msgstr "Gamma:"
#: modules/cdisplay_highcontrast.c:89
msgid "High Contrast color display filter"
msgstr "Hochkontrast Anzeigenfarbfilter"
#: modules/cdisplay_highcontrast.c:155
msgid "Contrast"
msgstr "Kontrast"
#: modules/cdisplay_highcontrast.c:314
msgid "Contrast Cycles:"
msgstr "Kontrastverstärkung:"
#: modules/colorsel_triangle.c:107
msgid "Painter-style triangle color selector"
msgstr "Dreiecks-Farbauswahl im Stil von Painter"
#: modules/colorsel_triangle.c:179
msgid "_Triangle"
msgstr "_Dreieck"
#: modules/colorsel_water.c:103
msgid "Watercolor style color selector"
msgstr "Wasserfarben Farbmischer"
#: modules/colorsel_water.c:175
msgid "_Watercolor"
msgstr "_Wasserfarbe"
#: modules/colorsel_water.c:249
msgid "Pressure"
msgstr "Druck"

6
po/ChangeLog
View File

@ -1,3 +1,9 @@
2002-10-30 Sven Neumann <sven@gimp.org>
* POTFILES.in: moved modules to libgimp translation domain.
* de.po: updated german translation.
2002-10-30 Wang Jian <lark@linux.net.cn> 2002-10-30 Wang Jian <lark@linux.net.cn>
* zh_CN.po: Updated Simplified Chinese translation by * zh_CN.po: Updated Simplified Chinese translation by

5
po/POTFILES.in
View File

@ -202,11 +202,6 @@ app/xcf/xcf-load.c
app/xcf/xcf-read.c app/xcf/xcf-read.c
app/xcf/xcf.c app/xcf/xcf.c
modules/cdisplay_gamma.c
modules/cdisplay_highcontrast.c
modules/colorsel_triangle.c
modules/colorsel_water.c
data/misc/gimp.desktop.in.in data/misc/gimp.desktop.in.in
libgimptool/gimptoolenums.c libgimptool/gimptoolenums.c

52
po/de.po
View File

@ -8,7 +8,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: GIMP 1.3.9\n" "Project-Id-Version: GIMP 1.3.9\n"
"POT-Creation-Date: 2002-10-29 11:35+0100\n" "POT-Creation-Date: 2002-10-30 15:51+0100\n"
"PO-Revision-Date: 2002-10-29 11:43+0100\n" "PO-Revision-Date: 2002-10-29 11:43+0100\n"
"Last-Translator: Christian Neumair <chris@gnome-de.org>\n" "Last-Translator: Christian Neumair <chris@gnome-de.org>\n"
"Language-Team: German <gnome-de@gnome.org>\n" "Language-Team: German <gnome-de@gnome.org>\n"
@ -1642,19 +1642,19 @@ msgstr "Kanaleigenschaften"
msgid "Edit Channel Attributes" msgid "Edit Channel Attributes"
msgstr "Kanaleigenschaften ändern" msgstr "Kanaleigenschaften ändern"
#: app/gui/color-notebook.c:399 #: app/gui/color-notebook.c:398
msgid "Current:" msgid "Current:"
msgstr "Aktuell:" msgstr "Aktuell:"
#: app/gui/color-notebook.c:420 #: app/gui/color-notebook.c:419
msgid "Old:" msgid "Old:"
msgstr "Alt:" msgstr "Alt:"
#: app/gui/color-notebook.c:442 #: app/gui/color-notebook.c:441
msgid "Revert to old color" msgid "Revert to old color"
msgstr "Zurück zur alten Farbe" msgstr "Zurück zur alten Farbe"
#: app/gui/color-notebook.c:516 #: app/gui/color-notebook.c:515
msgid "Add the current color to the color history" msgid "Add the current color to the color history"
msgstr "Die aktuelle Farbe der Farbliste hinzufügen" msgstr "Die aktuelle Farbe der Farbliste hinzufügen"
@ -6389,7 +6389,7 @@ msgstr "Schwarz-Punkt wählen"
msgid "Pick Gray Point" msgid "Pick Gray Point"
msgstr "Grau-Punkt wählen" msgstr "Grau-Punkt wählen"
#: app/tools/gimplevelstool.c:527 modules/cdisplay_gamma.c:155 #: app/tools/gimplevelstool.c:527
msgid "Gamma" msgid "Gamma"
msgstr "Gamma" msgstr "Gamma"
@ -7467,46 +7467,6 @@ msgstr "XCF Fehler: nicht unterstützte XCF-Dateiversion %d aufgetreten"
msgid "open failed on %s: %s\n" msgid "open failed on %s: %s\n"
msgstr "%s konnte nicht geöffnet werden: %s\n" msgstr "%s konnte nicht geöffnet werden: %s\n"
#: modules/cdisplay_gamma.c:89
msgid "Gamma color display filter"
msgstr "Gamma Anzeigenfarbfilter"
#: modules/cdisplay_gamma.c:316
msgid "Gamma:"
msgstr "Gamma:"
#: modules/cdisplay_highcontrast.c:89
msgid "High Contrast color display filter"
msgstr "Hochkontrast Anzeigenfarbfilter"
#: modules/cdisplay_highcontrast.c:155
msgid "Contrast"
msgstr "Kontrast"
#: modules/cdisplay_highcontrast.c:314
msgid "Contrast Cycles:"
msgstr "Kontrastverstärkung:"
#: modules/colorsel_triangle.c:107
msgid "Painter-style triangle color selector"
msgstr "Dreiecks-Farbauswahl im Stil von Painter"
#: modules/colorsel_triangle.c:179
msgid "Triangle"
msgstr "Dreieck"
#: modules/colorsel_water.c:103
msgid "Watercolor style color selector"
msgstr "Wasserfarben Farbmischer"
#: modules/colorsel_water.c:175
msgid "Watercolor"
msgstr "Wasserfarbe"
#: modules/colorsel_water.c:249
msgid "Pressure"
msgstr "Druck"
#: data/misc/gimp.desktop.in.in.h:1 #: data/misc/gimp.desktop.in.in.h:1
msgid "Create and edit images or photographs" msgid "Create and edit images or photographs"
msgstr "Bilder und Photos bearbeiten und erstellen" msgstr "Bilder und Photos bearbeiten und erstellen"