From 1c0e9df23b98305f33c3622812cf2e6970233308 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Wed, 30 Oct 2002 15:12:30 +0000 Subject: [PATCH] use a mnemonic that doesn't collide with the rest of the dialog. 2002-10-30 Sven Neumann * 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. --- ChangeLog | 13 + .../libgimpwidgets/tmpl/gimpcolorscale.sgml | 5 +- libgimpwidgets/gimpcolorselect.c | 2 +- modules/Makefile.am | 6 - modules/cdisplay_gamma.c | 2 +- modules/cdisplay_highcontrast.c | 2 +- modules/colorsel_gtk.c | 242 ------------------ modules/colorsel_triangle.c | 2 +- modules/colorsel_water.c | 2 +- po-libgimp/ChangeLog | 6 + po-libgimp/POTFILES.in | 5 + po-libgimp/de.po | 110 +++++--- po/ChangeLog | 6 + po/POTFILES.in | 5 - po/de.po | 52 +--- 15 files changed, 124 insertions(+), 336 deletions(-) delete mode 100644 modules/colorsel_gtk.c diff --git a/ChangeLog b/ChangeLog index b8e0c3386c..e68683dd6b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2002-10-30 Sven Neumann + + * 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 * libgimpwidgets/gimpcolornotebook.c: create the notebook labels diff --git a/devel-docs/libgimpwidgets/tmpl/gimpcolorscale.sgml b/devel-docs/libgimpwidgets/tmpl/gimpcolorscale.sgml index 9892184a21..41dbe01b1e 100644 --- a/devel-docs/libgimpwidgets/tmpl/gimpcolorscale.sgml +++ b/devel-docs/libgimpwidgets/tmpl/gimpcolorscale.sgml @@ -19,13 +19,16 @@ GimpColorScale -@parent_instance: +@orientation: +@channel: +@rgb: +@hsv: @Returns: diff --git a/libgimpwidgets/gimpcolorselect.c b/libgimpwidgets/gimpcolorselect.c index 579a99d8e4..defc2fcd6c 100644 --- a/libgimpwidgets/gimpcolorselect.c +++ b/libgimpwidgets/gimpcolorselect.c @@ -248,7 +248,7 @@ gimp_color_select_class_init (GimpColorSelectClass *klass) 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->set_color = gimp_color_select_set_color; selector_class->set_channel = gimp_color_select_set_channel; diff --git a/modules/Makefile.am b/modules/Makefile.am index e8aae0bfe4..6ae9d31589 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -20,14 +20,8 @@ lib_LTLIBRARIES = \ libcdisplay_highcontrast.la \ libcolorsel_water.la -## libcolorsel_gtk.la \ - 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_LDFLAGS = -avoid-version -module libcolorsel_triangle_la_LIBADD = $(GTK_LIBS) diff --git a/modules/cdisplay_gamma.c b/modules/cdisplay_gamma.c index d841cca29b..9f9ca1cc33 100644 --- a/modules/cdisplay_gamma.c +++ b/modules/cdisplay_gamma.c @@ -27,7 +27,7 @@ #include "libgimpmodule/gimpmodule.h" #include "libgimpwidgets/gimpwidgets.h" -#include "libgimp/gimpintl.h" +#include "libgimp/libgimp-intl.h" #define DEFAULT_GAMMA 1.0 diff --git a/modules/cdisplay_highcontrast.c b/modules/cdisplay_highcontrast.c index 209a2092a8..393ff120fe 100644 --- a/modules/cdisplay_highcontrast.c +++ b/modules/cdisplay_highcontrast.c @@ -27,7 +27,7 @@ #include "libgimpmodule/gimpmodule.h" #include "libgimpwidgets/gimpwidgets.h" -#include "libgimp/gimpintl.h" +#include "libgimp/libgimp-intl.h" #define DEFAULT_CONTRAST 4.0 diff --git a/modules/colorsel_gtk.c b/modules/colorsel_gtk.c deleted file mode 100644 index 42051f5b07..0000000000 --- a/modules/colorsel_gtk.c +++ /dev/null @@ -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 - * - * 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 - -#include - -#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 ", - "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); -} diff --git a/modules/colorsel_triangle.c b/modules/colorsel_triangle.c index 1f224b72da..bca5d537ae 100644 --- a/modules/colorsel_triangle.c +++ b/modules/colorsel_triangle.c @@ -34,7 +34,7 @@ #include "libgimpmodule/gimpmodule.h" #include "libgimpwidgets/gimpwidgets.h" -#include "libgimp/gimpintl.h" +#include "libgimp/libgimp-intl.h" #define COLORWHEELRADIUS (GIMP_COLOR_SELECTOR_SIZE / 2) diff --git a/modules/colorsel_water.c b/modules/colorsel_water.c index 2b699f5d32..ab1726573b 100644 --- a/modules/colorsel_water.c +++ b/modules/colorsel_water.c @@ -34,7 +34,7 @@ #include "libgimpmodule/gimpmodule.h" #include "libgimpwidgets/gimpwidgets.h" -#include "libgimp/gimpintl.h" +#include "libgimp/libgimp-intl.h" /* definitions and variables */ diff --git a/po-libgimp/ChangeLog b/po-libgimp/ChangeLog index 2a58dd1b45..e4b5e0d465 100644 --- a/po-libgimp/ChangeLog +++ b/po-libgimp/ChangeLog @@ -1,3 +1,9 @@ +2002-10-30 Sven Neumann + + * POTFILES.in: moved modules to libgimp translation domain. + + * de.po: updated german translation. + 2002-10-30 Wang Jian * zh_CN.po: Updated Simplified Chinese translation by diff --git a/po-libgimp/POTFILES.in b/po-libgimp/POTFILES.in index 5638a634a6..a44b884a2f 100644 --- a/po-libgimp/POTFILES.in +++ b/po-libgimp/POTFILES.in @@ -13,3 +13,8 @@ libgimpwidgets/gimpquerybox.c libgimpwidgets/gimpstock.c libgimpwidgets/gimpunitmenu.c libgimpwidgets/gimpwidgets.c + +modules/cdisplay_gamma.c +modules/cdisplay_highcontrast.c +modules/colorsel_triangle.c +modules/colorsel_water.c diff --git a/po-libgimp/de.po b/po-libgimp/de.po index af16d8ec8f..a95cba91e3 100644 --- a/po-libgimp/de.po +++ b/po-libgimp/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "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" "Last-Translator: Christian Neumair \n" "Language-Team: German \n" @@ -215,69 +215,73 @@ msgid "/White" msgstr "/Weiss" #. Hue -#: libgimpwidgets/gimpcolorscales.c:152 -msgid "H" -msgstr "H" +#: libgimpwidgets/gimpcolorscales.c:156 +msgid "_H" +msgstr "_H" #. Saturation -#: libgimpwidgets/gimpcolorscales.c:154 -msgid "S" -msgstr "S" +#: libgimpwidgets/gimpcolorscales.c:158 +msgid "_S" +msgstr "_S" #. Value -#: libgimpwidgets/gimpcolorscales.c:156 -msgid "V" -msgstr "V" +#: libgimpwidgets/gimpcolorscales.c:160 +msgid "_V" +msgstr "_V" #. Red -#: libgimpwidgets/gimpcolorscales.c:158 -msgid "R" -msgstr "R" +#: libgimpwidgets/gimpcolorscales.c:162 +msgid "_R" +msgstr "_R" #. Green -#: libgimpwidgets/gimpcolorscales.c:160 -msgid "G" -msgstr "G" +#: libgimpwidgets/gimpcolorscales.c:164 +msgid "_G" +msgstr "_G" #. Blue -#: libgimpwidgets/gimpcolorscales.c:162 -msgid "B" -msgstr "B" +#: libgimpwidgets/gimpcolorscales.c:166 +msgid "_B" +msgstr "_B" #. Alpha -#: libgimpwidgets/gimpcolorscales.c:164 -msgid "A" -msgstr "A" - #: libgimpwidgets/gimpcolorscales.c:168 +msgid "_A" +msgstr "_A" + +#: libgimpwidgets/gimpcolorscales.c:172 msgid "Hue" msgstr "Farbton" -#: libgimpwidgets/gimpcolorscales.c:169 +#: libgimpwidgets/gimpcolorscales.c:173 msgid "Saturation" msgstr "Sättigung" -#: libgimpwidgets/gimpcolorscales.c:170 +#: libgimpwidgets/gimpcolorscales.c:174 msgid "Value" msgstr "Wert" -#: libgimpwidgets/gimpcolorscales.c:171 +#: libgimpwidgets/gimpcolorscales.c:175 msgid "Red" msgstr "Rot" -#: libgimpwidgets/gimpcolorscales.c:172 +#: libgimpwidgets/gimpcolorscales.c:176 msgid "Green" msgstr "Grün" -#: libgimpwidgets/gimpcolorscales.c:173 +#: libgimpwidgets/gimpcolorscales.c:177 msgid "Blue" msgstr "Blau" -#: libgimpwidgets/gimpcolorscales.c:174 +#: libgimpwidgets/gimpcolorscales.c:178 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:" msgstr "He_xadezimal:" @@ -405,3 +409,47 @@ msgstr "MegaByte" #: libgimpwidgets/gimpwidgets.c:1222 msgid "GigaBytes" 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" diff --git a/po/ChangeLog b/po/ChangeLog index 479f8efc35..451d592702 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,9 @@ +2002-10-30 Sven Neumann + + * POTFILES.in: moved modules to libgimp translation domain. + + * de.po: updated german translation. + 2002-10-30 Wang Jian * zh_CN.po: Updated Simplified Chinese translation by diff --git a/po/POTFILES.in b/po/POTFILES.in index 73e234216c..057556d616 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -202,11 +202,6 @@ app/xcf/xcf-load.c app/xcf/xcf-read.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 libgimptool/gimptoolenums.c diff --git a/po/de.po b/po/de.po index bfaedffb41..c82fd686ff 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "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" "Last-Translator: Christian Neumair \n" "Language-Team: German \n" @@ -1642,19 +1642,19 @@ msgstr "Kanaleigenschaften" msgid "Edit Channel Attributes" msgstr "Kanaleigenschaften ändern" -#: app/gui/color-notebook.c:399 +#: app/gui/color-notebook.c:398 msgid "Current:" msgstr "Aktuell:" -#: app/gui/color-notebook.c:420 +#: app/gui/color-notebook.c:419 msgid "Old:" msgstr "Alt:" -#: app/gui/color-notebook.c:442 +#: app/gui/color-notebook.c:441 msgid "Revert to old color" 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" msgstr "Die aktuelle Farbe der Farbliste hinzufügen" @@ -6389,7 +6389,7 @@ msgstr "Schwarz-Punkt wählen" msgid "Pick Gray Point" msgstr "Grau-Punkt wählen" -#: app/tools/gimplevelstool.c:527 modules/cdisplay_gamma.c:155 +#: app/tools/gimplevelstool.c:527 msgid "Gamma" msgstr "Gamma" @@ -7467,46 +7467,6 @@ msgstr "XCF Fehler: nicht unterstützte XCF-Dateiversion %d aufgetreten" msgid "open failed on %s: %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 msgid "Create and edit images or photographs" msgstr "Bilder und Photos bearbeiten und erstellen"