Commit 4ea88b2a authored by Sven Neumann's avatar Sven Neumann
Browse files

use gimpui functions to setup the dialogs, include cdisplay_highcontrast.c

in POTFILES.in, updates to the german translation


--Sven
parent 1f7902c4
2000-05-04 Sven Neumann <sven@gimp.org>
* modules/cdisplay_gamma.c:
* modules/cdisplay_highcontrast.c: use gimpui functions to set
up the dialogs
Wed May 3 14:49:09 PDT 2000 Manish Singh <yosh@gimp.org>
 
* gimp.m4: help spacing correction
......
......@@ -24,6 +24,7 @@
#include <libgimp/gimpintl.h>
#include <libgimp/gimpmodule.h>
#include <libgimp/parasite.h>
#include <libgimp/gimpui.h>
#include <gtk/gtk.h>
#include "modregister.h"
......@@ -63,9 +64,6 @@ static void gamma_configure_ok_callback (GtkWidget *widget,
gpointer data);
static void gamma_configure_cancel_callback (GtkWidget *widget,
gpointer data);
static gint gamma_configure_delete_callback (GtkWidget *widget,
GdkEvent *event,
gpointer data);
static void gamma_configure (gpointer cd_ID,
GFunc ok_func,
gpointer ok_data,
......@@ -73,7 +71,8 @@ static void gamma_configure (gpointer cd_ID,
gpointer cancel_data);
static void gamma_configure_cancel (gpointer cd_ID);
static GimpColorDisplayMethods methods = {
static GimpColorDisplayMethods methods =
{
NULL,
gamma_new,
gamma_clone,
......@@ -86,7 +85,8 @@ static GimpColorDisplayMethods methods = {
gamma_configure_cancel
};
static GimpModuleInfo info = {
static GimpModuleInfo info =
{
NULL,
N_("Gamma color display filter"),
"Manish Singh <yosh@gimp.org>",
......@@ -291,15 +291,6 @@ gamma_configure_cancel_callback (GtkWidget *widget,
context->cancel_func (context, context->cancel_data);
}
static gint
gamma_configure_delete_callback (GtkWidget *widget,
GdkEvent *event,
gpointer data)
{
gamma_configure_cancel_callback (widget, data);
return TRUE;
}
static void
gamma_configure (gpointer cd_ID,
GFunc ok_func,
......@@ -310,8 +301,6 @@ gamma_configure (gpointer cd_ID,
GammaContext *context = cd_ID;
GtkWidget *hbox;
GtkWidget *label;
GtkWidget *hbbox;
GtkWidget *button;
GtkObject *adjustment;
if (!context->shell)
......@@ -321,49 +310,35 @@ gamma_configure (gpointer cd_ID,
context->cancel_func = cancel_func;
context->cancel_data = cancel_data;
context->shell = gtk_dialog_new ();
gtk_window_set_wmclass (GTK_WINDOW (context->shell), "gamma", "Gimp");
gtk_window_set_title (GTK_WINDOW (context->shell), _("Gamma"));
context->shell = gimp_dialog_new (_("Gamma"), "gamma",
gimp_standard_help_func, "modules/gamma.html",
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
gtk_signal_connect (GTK_OBJECT (context->shell), "delete_event",
GTK_SIGNAL_FUNC (gamma_configure_delete_callback),
NULL);
_("OK"), gamma_configure_ok_callback,
cd_ID, NULL, NULL, TRUE, FALSE,
_("Cancel"), gamma_configure_cancel_callback,
cd_ID, NULL, NULL, FALSE, TRUE,
NULL);
hbox = gtk_hbox_new (TRUE, 2);
hbox = gtk_hbox_new (FALSE, 2);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (context->shell)->vbox),
hbox, FALSE, FALSE, 0);
label = gtk_label_new ( _("Gamma:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
adjustment = gtk_adjustment_new (1.0, 0.01, 10.0, 0.01, 0.1, 0.0);
context->spinner = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment),
0.1, 3);
gtk_widget_set_usize (context->spinner, 100, 0);
gtk_box_pack_start (GTK_BOX (hbox), context->spinner, TRUE, FALSE, 0);
hbbox = gtk_hbutton_box_new ();
gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
gtk_box_pack_end (GTK_BOX (GTK_DIALOG (context->shell)->action_area),
hbbox, FALSE, FALSE, 0);
button = gtk_button_new_with_label ( _("OK"));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (button), "clicked",
GTK_SIGNAL_FUNC (gamma_configure_ok_callback),
cd_ID);
button = gtk_button_new_with_label ( _("Cancel"));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (button), "clicked",
GTK_SIGNAL_FUNC (gamma_configure_cancel_callback),
cd_ID);
gtk_widget_show_all (context->shell);
gtk_box_pack_start (GTK_BOX (hbox), context->spinner, FALSE, FALSE, 0);
}
gtk_widget_show_all (context->shell);
}
static void
......
......@@ -24,6 +24,7 @@
#include <libgimp/gimpintl.h>
#include <libgimp/gimpmodule.h>
#include <libgimp/parasite.h>
#include <libgimp/gimpui.h>
#include <gtk/gtk.h>
#include "modregister.h"
......@@ -51,29 +52,27 @@ static gpointer contrast_clone (gpointer cd_ID);
static void contrast_create_lookup_table (ContrastContext *context);
static void contrast_destroy (gpointer cd_ID);
static void contrast_convert (gpointer cd_ID,
guchar *buf,
int w,
int h,
int bpp,
int bpl);
guchar *buf,
int w,
int h,
int bpp,
int bpl);
static void contrast_load (gpointer cd_ID,
Parasite *state);
Parasite *state);
static Parasite * contrast_save (gpointer cd_ID);
static void contrast_configure_ok_callback (GtkWidget *widget,
gpointer data);
gpointer data);
static void contrast_configure_cancel_callback (GtkWidget *widget,
gpointer data);
static gint contrast_configure_delete_callback (GtkWidget *widget,
GdkEvent *event,
gpointer data);
gpointer data);
static void contrast_configure (gpointer cd_ID,
GFunc ok_func,
gpointer ok_data,
GFunc cancel_func,
gpointer cancel_data);
GFunc ok_func,
gpointer ok_data,
GFunc cancel_func,
gpointer cancel_data);
static void contrast_configure_cancel (gpointer cd_ID);
static GimpColorDisplayMethods methods = {
static GimpColorDisplayMethods methods =
{
NULL,
contrast_new,
contrast_clone,
......@@ -86,7 +85,8 @@ static GimpColorDisplayMethods methods = {
contrast_configure_cancel
};
static GimpModuleInfo info = {
static GimpModuleInfo info =
{
NULL,
N_("High Contrast color display filter"),
"Jay Cox <jaycox@earthlink.net>",
......@@ -181,11 +181,11 @@ contrast_destroy (gpointer cd_ID)
static void
contrast_convert (gpointer cd_ID,
guchar *buf,
int width,
int height,
int bpp,
int bpl)
guchar *buf,
int width,
int height,
int bpp,
int bpl)
{
guchar *lookup = ((ContrastContext *) cd_ID)->lookup;
int i, j = height;
......@@ -218,7 +218,7 @@ contrast_convert (gpointer cd_ID,
static void
contrast_load (gpointer cd_ID,
Parasite *state)
Parasite *state)
{
ContrastContext *context = cd_ID;
......@@ -258,7 +258,7 @@ contrast_save (gpointer cd_ID)
static void
contrast_configure_ok_callback (GtkWidget *widget,
gpointer data)
gpointer data)
{
ContrastContext *context = data;
......@@ -274,7 +274,7 @@ contrast_configure_ok_callback (GtkWidget *widget,
static void
contrast_configure_cancel_callback (GtkWidget *widget,
gpointer data)
gpointer data)
{
ContrastContext *context = data;
......@@ -285,27 +285,16 @@ contrast_configure_cancel_callback (GtkWidget *widget,
context->cancel_func (context, context->cancel_data);
}
static gint
contrast_configure_delete_callback (GtkWidget *widget,
GdkEvent *event,
gpointer data)
{
contrast_configure_cancel_callback (widget, data);
return TRUE;
}
static void
contrast_configure (gpointer cd_ID,
GFunc ok_func,
gpointer ok_data,
GFunc cancel_func,
gpointer cancel_data)
GFunc ok_func,
gpointer ok_data,
GFunc cancel_func,
gpointer cancel_data)
{
ContrastContext *context = cd_ID;
GtkWidget *hbox;
GtkWidget *label;
GtkWidget *hbbox;
GtkWidget *button;
GtkObject *adjustment;
if (!context->shell)
......@@ -315,49 +304,35 @@ contrast_configure (gpointer cd_ID,
context->cancel_func = cancel_func;
context->cancel_data = cancel_data;
context->shell = gtk_dialog_new ();
gtk_window_set_wmclass (GTK_WINDOW (context->shell), "high contrast", "Gimp");
gtk_window_set_title (GTK_WINDOW (context->shell), _("High Contrast"));
context->shell = gimp_dialog_new (_("High Contrast"), "high contrast",
gimp_standard_help_func, "modules/highcontrast.html",
GTK_WIN_POS_MOUSE,
FALSE, TRUE, FALSE,
gtk_signal_connect (GTK_OBJECT (context->shell), "delete_event",
GTK_SIGNAL_FUNC (contrast_configure_delete_callback),
NULL);
_("OK"), contrast_configure_ok_callback,
cd_ID, NULL, NULL, TRUE, FALSE,
_("Cancel"), contrast_configure_cancel_callback,
cd_ID, NULL, NULL, FALSE, TRUE,
NULL);
hbox = gtk_hbox_new (TRUE, 2);
hbox = gtk_hbox_new (FALSE, 2);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (context->shell)->vbox),
hbox, FALSE, FALSE, 0);
label = gtk_label_new ( _("Contrast Cycles:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
adjustment = gtk_adjustment_new (4.0, 1.0, 20.0, 0.5, 1.0, 0.0);
context->spinner = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment),
0.1, 3);
gtk_widget_set_usize (context->spinner, 100, 0);
gtk_box_pack_start (GTK_BOX (hbox), context->spinner, TRUE, FALSE, 0);
hbbox = gtk_hbutton_box_new ();
gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
gtk_box_pack_end (GTK_BOX (GTK_DIALOG (context->shell)->action_area),
hbbox, FALSE, FALSE, 0);
button = gtk_button_new_with_label ( _("OK"));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (button), "clicked",
GTK_SIGNAL_FUNC (contrast_configure_ok_callback),
cd_ID);
button = gtk_button_new_with_label ( _("Cancel"));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (button), "clicked",
GTK_SIGNAL_FUNC (contrast_configure_cancel_callback),
cd_ID);
gtk_widget_show_all (context->shell);
gtk_box_pack_start (GTK_BOX (hbox), context->spinner, FALSE, FALSE, 0);
}
gtk_widget_show_all (context->shell);
}
static void
......
2000-05-04 Sven Neumann <sven@gimp.org>
* POTFILES.in: added modules/cdisplay_highcontrast.c
* de.po: updated german translation
2000-05-03 Sven Neumann <sven@gimp.org>
* de.po: updated german translation
......
......@@ -114,9 +114,7 @@ app/undo_history.c
app/user_install.c
app/xcf.c
modules/cdisplay_gamma.c
modules/cdisplay_highcontrast.c
modules/colorsel_gtk.c
modules/colorsel_triangle.c
modules/colorsel_water.c
......@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: GIMP 1.1.21\n"
"POT-Creation-Date: 2000-05-02 19:52+0200\n"
"PO-Revision-Date: 2000-05-03 12:37+02:00\n"
"POT-Creation-Date: 2000-05-04 10:29+0200\n"
"PO-Revision-Date: 2000-05-04 10:33+02:00\n"
"Last-Translator: Sven Neumann <sven@gimp.org>\n"
"Language-Team: German <de@li.org>\n"
"MIME-Version: 1.0\n"
......@@ -123,11 +123,12 @@ msgstr "Beenden"
#: app/gdisplay_color_ui.c:129 app/gdisplay_ops.c:305 app/gimpprogress.c:112
#: app/global_edit.c:772 app/gradient.c:1768 app/gradient.c:4840
#: app/gradient.c:5401 app/hue_saturation.c:374 app/interface.c:1035
#: app/layers_dialog.c:3437 app/layers_dialog.c:3619 app/layers_dialog.c:3711
#: app/layers_dialog.c:3963 app/levels.c:340 app/palette.c:1826
#: app/layers_dialog.c:3441 app/layers_dialog.c:3623 app/layers_dialog.c:3715
#: app/layers_dialog.c:3967 app/levels.c:340 app/palette.c:1826
#: app/posterize.c:202 app/preferences_dialog.c:1455 app/qmask.c:281
#: app/resize.c:195 app/resize.c:1341 app/threshold.c:275
#: app/user_install.c:548 app/user_install.c:1190 modules/cdisplay_gamma.c:358
#: modules/cdisplay_highcontrast.c:352
msgid "Cancel"
msgstr "Abbrechen"
......@@ -280,11 +281,12 @@ msgstr "Helligkeit-Kontrast funktioniert nicht bei indizierten Bildern."
#: app/color_balance.c:271 app/color_notebook.c:122 app/convert.c:504
#: app/curves.c:558 app/file_new_dialog.c:207 app/file_new_dialog.c:353
#: app/gdisplay_color_ui.c:127 app/gimpui.c:122 app/hue_saturation.c:370
#: app/layers_dialog.c:3435 app/layers_dialog.c:3617 app/layers_dialog.c:3709
#: app/layers_dialog.c:3961 app/levels.c:336 app/module_db.c:281
#: app/layers_dialog.c:3439 app/layers_dialog.c:3621 app/layers_dialog.c:3713
#: app/layers_dialog.c:3965 app/levels.c:336 app/module_db.c:281
#: app/posterize.c:198 app/preferences_dialog.c:1451 app/qmask.c:279
#: app/resize.c:193 app/resize.c:1341 app/threshold.c:271
#: app/user_install.c:1188 modules/cdisplay_gamma.c:351
#: modules/cdisplay_highcontrast.c:345
msgid "OK"
msgstr "OK"
......@@ -510,11 +512,11 @@ msgid "Wrap Around"
msgstr "Herumwickeln"
#: app/channel_ops.c:174 app/image_new.c:73 app/image_new.c:287
#: app/layers_dialog.c:3537
#: app/layers_dialog.c:3541
msgid "Background"
msgstr "Hintergrund"
#: app/channel_ops.c:175 app/image_new.c:83 app/layers_dialog.c:3539
#: app/channel_ops.c:175 app/image_new.c:83 app/layers_dialog.c:3543
msgid "Transparent"
msgstr "Transparent"
......@@ -936,7 +938,7 @@ msgid "Width:"
msgstr "Breite:"
#: app/crop.c:1079 app/file_new_dialog.c:395 app/file_new_dialog.c:413
#: app/layers_dialog.c:3478 app/resize.c:254 app/resize.c:279 app/resize.c:524
#: app/layers_dialog.c:3482 app/resize.c:254 app/resize.c:279 app/resize.c:524
#: app/scale_tool.c:79 app/scale_tool.c:86 app/tool_options.c:364
msgid "Height:"
msgstr "Hhe:"
......@@ -2215,11 +2217,11 @@ msgstr "S
msgid "Grayscale"
msgstr "Graustufen"
#: app/image_new.c:68 app/layers_dialog.c:3536
#: app/image_new.c:68 app/layers_dialog.c:3540
msgid "Foreground"
msgstr "Vordergrund"
#: app/image_new.c:78 app/layers_dialog.c:3538
#: app/image_new.c:78 app/layers_dialog.c:3542
msgid "White"
msgstr "Wei"
......@@ -2557,7 +2559,7 @@ msgstr "%s Maske"
msgid "Layer Select"
msgstr "Ebenenauswahl"
#: app/layers_dialog.c:262 app/layers_dialog.c:3468
#: app/layers_dialog.c:262 app/layers_dialog.c:3472
msgid "New Layer"
msgstr "Neue Ebene"
......@@ -2635,62 +2637,62 @@ msgstr "Nur Aufhellen"
msgid "Keep Trans."
msgstr "Erhalte Transp."
#: app/layers_dialog.c:1884
#: app/layers_dialog.c:1888
msgid "Empty Layer Copy"
msgstr "Leere Ebene Kopie"
#: app/layers_dialog.c:2145 app/layers_dialog.c:3279 app/layers_dialog.c:3646
#: app/layers_dialog.c:2149 app/layers_dialog.c:3283 app/layers_dialog.c:3650
msgid "Floating Selection"
msgstr "Schwebende Auswahl"
#: app/layers_dialog.c:3429
#: app/layers_dialog.c:3433
msgid "New Layer Options"
msgstr "Einstellungen fr neue Ebene"
#. The name label and entry
#: app/layers_dialog.c:3458
#: app/layers_dialog.c:3462
msgid "Layer Name:"
msgstr "Ebenenname:"
#. The size labels
#: app/layers_dialog.c:3472
#: app/layers_dialog.c:3476
msgid "Layer Width:"
msgstr "Ebenenbreite:"
#: app/layers_dialog.c:3532
#: app/layers_dialog.c:3536
msgid "Layer Fill Type"
msgstr "Ebenenfllung"
#: app/layers_dialog.c:3611
#: app/layers_dialog.c:3615
msgid "Edit Layer Attributes"
msgstr "Ebenenmerkmale verndern"
#: app/layers_dialog.c:3638
#: app/layers_dialog.c:3642
msgid "Layer name:"
msgstr "Ebenenname:"
#: app/layers_dialog.c:3703
#: app/layers_dialog.c:3707
msgid "Add Mask Options"
msgstr "Einstellungen fr neue Maske"
#. The radio frame and box
#: app/layers_dialog.c:3721
#: app/layers_dialog.c:3725
msgid "Initialize Layer Mask to:"
msgstr "Initialisierung Ebenenmaske nach:"
#: app/layers_dialog.c:3726
#: app/layers_dialog.c:3730
msgid "White (Full Opacity)"
msgstr "Wei (volle Deckkraft)"
#: app/layers_dialog.c:3728
#: app/layers_dialog.c:3732
msgid "Black (Full Transparency)"
msgstr "Schwarz (volle Transparenz)"
#: app/layers_dialog.c:3730
#: app/layers_dialog.c:3734
msgid "Layer's Alpha Channel"
msgstr "Alphakanal der Ebene"
#: app/layers_dialog.c:3788 app/layers_dialog.c:3870
#: app/layers_dialog.c:3792 app/layers_dialog.c:3874
msgid ""
"Invalid width or height.\n"
"Both must be positive."
......@@ -2698,27 +2700,27 @@ msgstr ""
"Ungltige Breite oder Hhe.\n"
"Beide mssen positiv sein."
#: app/layers_dialog.c:3955
#: app/layers_dialog.c:3959
msgid "Layer Merge Options"
msgstr "Ebenen vereinen"
#: app/layers_dialog.c:3980
#: app/layers_dialog.c:3984
msgid "Final, Merged Layer should be:"
msgstr "Die fertige, vereinte Ebene soll sein:"
#: app/layers_dialog.c:3981
#: app/layers_dialog.c:3985
msgid "Final, Anchored Layer should be:"
msgstr "Die fertige, verankerte Ebene soll sein:"
#: app/layers_dialog.c:3986
#: app/layers_dialog.c:3990
msgid "Expanded as necessary"
msgstr "Nach Bedarf erweitern"
#: app/layers_dialog.c:3988
#: app/layers_dialog.c:3992
msgid "Clipped to image"
msgstr "Auf Bild beschnitten"
#: app/layers_dialog.c:3990
#: app/layers_dialog.c:3994
msgid "Clipped to bottom layer"
msgstr "Auf oberste Ebene beschnitten"
......@@ -6271,6 +6273,18 @@ msgstr "Gamma"
msgid "Gamma:"
msgstr "Gamma:"
#: modules/cdisplay_highcontrast.c:91
msgid "High Contrast color display filter"
msgstr "Hochkontrast-Anzeigenfarbfilter"
#: modules/cdisplay_highcontrast.c:320
msgid "High Contrast"
msgstr "Hochkontrast"
#: modules/cdisplay_highcontrast.c:330
msgid "Contrast Cycles:"
msgstr "Kontrastverstrkung:"
#: modules/colorsel_gtk.c:48
msgid "GTK color selector as a pluggable color selector"
msgstr "Standard GTK Farbauswahl als ladbares Modul"
......
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