dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

This commit is contained in:
jtl 2000-04-16 12:10:24 +00:00
parent 7f5fbf42ff
commit 5c816c6b38
18 changed files with 1270 additions and 1335 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ChangeLog
View File

@ -1,3 +1,20 @@
2000-04-16 Sven Neumann <sven@gimp.org>
Jens Lautenbacher <jtl@gimp.org>
* app/ink.c: tweaked dialog layout
* app/interface.c: take theme's [xy]thickness into account when
setting up minimum sizes and size_increments
* app/tool_options.c: changed the term "Pressure" to "Hardness"
in the pressure sensitivity UI
* plug-ins/gap/iter_ALT/gen/plug_in_bump_map_iter_ALT.inc: removed
* plug-ins/gap/iter_ALT/mod/plug_in_bump_map_iter_ALT.inc: new file
* plug-ins/gap/Makefile.am
* plug-ins/gap/gap_filter_iterators.c: changed filter_iterator to
reflect changes in the bumpmap plug_in
2000-04-16 Jens Lautenbacher <jtl@gimp.org>
Sven Neumann <sven@gimp.org>

2
app/core/gimptooloptions.c
View File

@ -727,7 +727,7 @@ paint_pressure_options_new (ToolType tool_type)
case ERASER:
case PAINTBRUSH:
case SMUDGE:
pressure->pressure_w = gtk_check_button_new_with_label (_("Pressure"));
pressure->pressure_w = gtk_check_button_new_with_label (_("Hardness"));
gtk_container_add (GTK_CONTAINER (wbox), pressure->pressure_w);
gtk_signal_connect (GTK_OBJECT (pressure->pressure_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),

45
app/display/gimpdisplayshell-draw.c
View File

@ -521,27 +521,16 @@ create_toolbox (void)
GList *list;
GtkAccelGroup *table;
GdkGeometry geometry;
GtkStyle *style;
gint xthickness;
gint ythickness;
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
/* Register dialog */
dialog_register_toolbox (window);
gtk_window_set_wmclass (GTK_WINDOW (window), "toolbox", "Gimp");
gtk_window_set_title (GTK_WINDOW (window), _("The GIMP"));
gtk_window_set_policy (GTK_WINDOW (window), TRUE, TRUE, FALSE);
geometry.min_width = 30;
geometry.min_height = 102;
geometry.width_inc = 28;
geometry.height_inc = 28;
gtk_window_set_geometry_hints (GTK_WINDOW (window),
NULL,
&geometry,
GDK_HINT_MIN_SIZE | GDK_HINT_RESIZE_INC);
session_set_window_geometry (window, &toolbox_session_info, TRUE);
gtk_signal_connect (GTK_OBJECT (window), "delete_event",
GTK_SIGNAL_FUNC (toolbox_delete),
NULL);
@ -572,6 +561,29 @@ create_toolbox (void)
gtk_widget_set_events (window, GDK_POINTER_MOTION_MASK);
gtk_widget_set_extension_events (window, GDK_EXTENSION_EVENTS_CURSOR);
}
/* set up the window geometry after the events have been set,
since we need to realize the widget */
gtk_window_set_wmclass (GTK_WINDOW (window), "toolbox", "Gimp");
gtk_window_set_title (GTK_WINDOW (window), _("The GIMP"));
gtk_window_set_policy (GTK_WINDOW (window), TRUE, TRUE, FALSE);
gtk_widget_realize (window);
style = gtk_widget_get_style (window);
xthickness = ((GtkStyleClass *) style->klass)->xthickness;
ythickness = ((GtkStyleClass *) style->klass)->ythickness;
geometry.min_width = 2 + 24 + 2 * xthickness;
geometry.min_height = 100 + 24 + 2 * ythickness;
geometry.width_inc = 24 + 2 * xthickness;
geometry.height_inc = 24 + 2 * ythickness;
gtk_window_set_geometry_hints (GTK_WINDOW (window),
NULL,
&geometry,
GDK_HINT_MIN_SIZE | GDK_HINT_RESIZE_INC);
session_set_window_geometry (window, &toolbox_session_info, TRUE);
main_vbox = gtk_vbox_new (FALSE, 1);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 1);
@ -602,7 +614,8 @@ create_toolbox (void)
wbox = gtk_hwrap_box_new (FALSE);
gtk_wrap_box_set_justify (GTK_WRAP_BOX (wbox), GTK_JUSTIFY_TOP);
gtk_wrap_box_set_line_justify (GTK_WRAP_BOX (wbox), GTK_JUSTIFY_LEFT);
gtk_wrap_box_set_aspect_ratio (GTK_WRAP_BOX (wbox), 140.0 / 192.0); /* 5x5 tools */
/* magic number to set a default 5x5 layout */
gtk_wrap_box_set_aspect_ratio (GTK_WRAP_BOX (wbox), 5.0 / 5.9);
gtk_container_set_border_width (GTK_CONTAINER (wbox), 0);
gtk_box_pack_start (GTK_BOX (main_vbox), wbox, TRUE, TRUE, 0);
gtk_widget_show (wbox);

45
app/display/gimpdisplayshell.c
View File

@ -521,27 +521,16 @@ create_toolbox (void)
GList *list;
GtkAccelGroup *table;
GdkGeometry geometry;
GtkStyle *style;
gint xthickness;
gint ythickness;
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
/* Register dialog */
dialog_register_toolbox (window);
gtk_window_set_wmclass (GTK_WINDOW (window), "toolbox", "Gimp");
gtk_window_set_title (GTK_WINDOW (window), _("The GIMP"));
gtk_window_set_policy (GTK_WINDOW (window), TRUE, TRUE, FALSE);
geometry.min_width = 30;
geometry.min_height = 102;
geometry.width_inc = 28;
geometry.height_inc = 28;
gtk_window_set_geometry_hints (GTK_WINDOW (window),
NULL,
&geometry,
GDK_HINT_MIN_SIZE | GDK_HINT_RESIZE_INC);
session_set_window_geometry (window, &toolbox_session_info, TRUE);
gtk_signal_connect (GTK_OBJECT (window), "delete_event",
GTK_SIGNAL_FUNC (toolbox_delete),
NULL);
@ -572,6 +561,29 @@ create_toolbox (void)
gtk_widget_set_events (window, GDK_POINTER_MOTION_MASK);
gtk_widget_set_extension_events (window, GDK_EXTENSION_EVENTS_CURSOR);
}
/* set up the window geometry after the events have been set,
since we need to realize the widget */
gtk_window_set_wmclass (GTK_WINDOW (window), "toolbox", "Gimp");
gtk_window_set_title (GTK_WINDOW (window), _("The GIMP"));
gtk_window_set_policy (GTK_WINDOW (window), TRUE, TRUE, FALSE);
gtk_widget_realize (window);
style = gtk_widget_get_style (window);
xthickness = ((GtkStyleClass *) style->klass)->xthickness;
ythickness = ((GtkStyleClass *) style->klass)->ythickness;
geometry.min_width = 2 + 24 + 2 * xthickness;
geometry.min_height = 100 + 24 + 2 * ythickness;
geometry.width_inc = 24 + 2 * xthickness;
geometry.height_inc = 24 + 2 * ythickness;
gtk_window_set_geometry_hints (GTK_WINDOW (window),
NULL,
&geometry,
GDK_HINT_MIN_SIZE | GDK_HINT_RESIZE_INC);
session_set_window_geometry (window, &toolbox_session_info, TRUE);
main_vbox = gtk_vbox_new (FALSE, 1);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 1);
@ -602,7 +614,8 @@ create_toolbox (void)
wbox = gtk_hwrap_box_new (FALSE);
gtk_wrap_box_set_justify (GTK_WRAP_BOX (wbox), GTK_JUSTIFY_TOP);
gtk_wrap_box_set_line_justify (GTK_WRAP_BOX (wbox), GTK_JUSTIFY_LEFT);
gtk_wrap_box_set_aspect_ratio (GTK_WRAP_BOX (wbox), 140.0 / 192.0); /* 5x5 tools */
/* magic number to set a default 5x5 layout */
gtk_wrap_box_set_aspect_ratio (GTK_WRAP_BOX (wbox), 5.0 / 5.9);
gtk_container_set_border_width (GTK_CONTAINER (wbox), 0);
gtk_box_pack_start (GTK_BOX (main_vbox), wbox, TRUE, TRUE, 0);
gtk_widget_show (wbox);

225
app/ink.c
View File

@ -258,8 +258,8 @@ ink_options_new (void)
GtkWidget *table;
GtkWidget *vbox;
GtkWidget *abox;
GtkWidget *label;
GtkWidget *hbox;
GtkWidget *hbox2;
GtkWidget *radio_button;
GtkWidget *pixmap_widget;
GtkWidget *slider;
@ -281,151 +281,117 @@ ink_options_new (void)
options->aspect = options->aspect_d = 1.0;
options->angle = options->angle_d = 0.0;
/* the main table */
table = gtk_table_new (9, 2, FALSE);
gtk_table_set_col_spacing (GTK_TABLE (table), 0, 4);
gtk_table_set_row_spacing (GTK_TABLE (table), 0, 2);
gtk_table_set_row_spacing (GTK_TABLE (table), 1, 2);
gtk_table_set_row_spacing (GTK_TABLE (table), 3, 2);
gtk_table_set_row_spacing (GTK_TABLE (table), 5, 2);
gtk_table_set_row_spacing (GTK_TABLE (table), 7, 4);
gtk_box_pack_start (GTK_BOX (((ToolOptions *) options)->main_vbox), table,
FALSE, FALSE, 0);
/* the main vbox */
vbox = gtk_vbox_new (FALSE, 2);
gtk_box_pack_start (GTK_BOX (((ToolOptions *) options)->main_vbox), vbox,
TRUE, TRUE, 0);
gtk_widget_show (vbox);
/* adjust sliders */
frame = gtk_frame_new (_("Adjustment"));
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
gtk_widget_show (frame);
table = gtk_table_new (2, 2, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_container_set_border_width (GTK_CONTAINER (table), 2);
gtk_container_add (GTK_CONTAINER (frame), table);
gtk_widget_show (table);
/* size slider */
label = gtk_label_new (_("Size:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (label);
options->size_w =
gtk_adjustment_new (options->size_d, 0.0, 20.0, 1.0, 2.0, 0.0);
slider = gtk_hscale_new (GTK_ADJUSTMENT (options->size_w));
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
gtk_table_attach_defaults (GTK_TABLE (table), slider, 1, 2, 0, 1);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Size:"), 1.0, 1.0,
slider, 1, FALSE);
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->size_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->size);
gtk_widget_show (slider);
/* sens slider */
label = gtk_label_new (_("Sensitivity:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (label);
options->sensitivity_w =
gtk_adjustment_new (options->sensitivity_d, 0.0, 1.0, 0.01, 0.1, 0.0);
slider = gtk_hscale_new (GTK_ADJUSTMENT (options->sensitivity_w));
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
gtk_table_attach_defaults (GTK_TABLE (table), slider, 1, 2, 1, 2);
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->sensitivity_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->sensitivity);
gtk_widget_show (slider);
/* tilt sens slider */
label = gtk_label_new (_("Tilt"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 1.0);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3,
GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_widget_show (label);
label = gtk_label_new (_("Sensitivity:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4,
GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_widget_show (label);
abox = gtk_alignment_new (0.5, 1.0, 1.0, 0.0);
gtk_table_attach (GTK_TABLE (table), abox, 1, 2, 2, 4,
GTK_EXPAND | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (abox);
options->tilt_sensitivity_w =
gtk_adjustment_new (options->tilt_sensitivity_d, 0.0, 1.0, 0.01, 0.1, 0.0);
slider = gtk_hscale_new (GTK_ADJUSTMENT (options->tilt_sensitivity_w));
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
gtk_container_add (GTK_CONTAINER (abox), slider);
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->tilt_sensitivity_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->tilt_sensitivity);
gtk_widget_show (slider);
/* velocity sens slider */
label = gtk_label_new (_("Speed"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 1.0);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 4, 5,
GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_widget_show (label);
label = gtk_label_new (_("Sensitivity:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 5, 6,
GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_widget_show (label);
abox = gtk_alignment_new (0.5, 1.0, 1.0, 0.0);
gtk_table_attach (GTK_TABLE (table), abox, 1, 2, 4, 6,
GTK_EXPAND | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (abox);
options->vel_sensitivity_w =
gtk_adjustment_new (options->vel_sensitivity_d, 0.0, 1.0, 0.01, 0.1, 0.0);
slider = gtk_hscale_new (GTK_ADJUSTMENT (options->vel_sensitivity_w));
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
gtk_container_add (GTK_CONTAINER (abox), slider);
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->vel_sensitivity_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->vel_sensitivity);
gtk_widget_show (slider);
/* angle adjust slider */
label = gtk_label_new (_("Angle"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 1.0);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 6, 7,
GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_widget_show (label);
label = gtk_label_new (_("Adjust:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 7, 8,
GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_widget_show (label);
abox = gtk_alignment_new (0.5, 1.0, 1.0, 0.0);
gtk_table_attach (GTK_TABLE (table), abox, 1, 2, 6, 8,
GTK_EXPAND | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (abox);
options->tilt_angle_w =
gtk_adjustment_new (options->tilt_angle_d, -90.0, 90.0, 1, 10.0, 0.0);
slider = gtk_hscale_new (GTK_ADJUSTMENT (options->tilt_angle_w));
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
gtk_container_add (GTK_CONTAINER (abox), slider);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Angle:"), 1.0, 1.0,
slider, 1, FALSE);
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->tilt_angle_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->tilt_angle);
/* Brush type radiobuttons */
frame = gtk_frame_new (_("Type"));
gtk_table_attach (GTK_TABLE (table), frame, 0, 1, 8, 9,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
/* sens sliders */
frame = gtk_frame_new (_("Sensitivity"));
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
gtk_widget_show (frame);
table = gtk_table_new (3, 2, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_container_set_border_width (GTK_CONTAINER (table), 2);
gtk_container_add (GTK_CONTAINER (frame), table);
gtk_widget_show (table);
/* size sens slider */
options->sensitivity_w =
gtk_adjustment_new (options->sensitivity_d, 0.0, 1.0, 0.01, 0.1, 0.0);
slider = gtk_hscale_new (GTK_ADJUSTMENT (options->sensitivity_w));
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Size:"), 1.0, 1.0,
slider, 1, FALSE);
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->sensitivity_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->sensitivity);
/* tilt sens slider */
options->tilt_sensitivity_w =
gtk_adjustment_new (options->tilt_sensitivity_d, 0.0, 1.0, 0.01, 0.1, 0.0);
slider = gtk_hscale_new (GTK_ADJUSTMENT (options->tilt_sensitivity_w));
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Tilt:"), 1.0, 1.0,
slider, 1, FALSE);
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->tilt_sensitivity_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->tilt_sensitivity);
/* velocity sens slider */
options->vel_sensitivity_w =
gtk_adjustment_new (options->vel_sensitivity_d, 0.0, 1.0, 0.01, 0.1, 0.0);
slider = gtk_hscale_new (GTK_ADJUSTMENT (options->vel_sensitivity_w));
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 3,
_("Speed:"), 1.0, 1.0,
slider, 1, FALSE);
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->vel_sensitivity_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->vel_sensitivity);
/* bottom hbox */
hbox = gtk_hbox_new (FALSE, 2);
gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
gtk_widget_show (hbox);
/* Brush type radiobuttons */
frame = gtk_frame_new (_("Type"));
gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
gtk_widget_show (frame);
hbox2 = gtk_hbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (frame), hbox2);
vbox = gtk_vbox_new (FALSE, 2);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 2);
gtk_container_add (GTK_CONTAINER (frame), vbox);
gtk_box_pack_start (GTK_BOX (hbox2), vbox, FALSE, FALSE, 0);
gtk_widget_show (vbox);
pixmap = blob_pixmap (gtk_widget_get_colormap (vbox),
@ -434,6 +400,7 @@ ink_options_new (void)
pixmap_widget = gtk_pixmap_new (pixmap, NULL);
gdk_pixmap_unref (pixmap);
gtk_misc_set_padding (GTK_MISC (pixmap_widget), 6, 0);
radio_button = gtk_radio_button_new (NULL);
gtk_signal_connect (GTK_OBJECT (radio_button), "toggled",
@ -451,6 +418,7 @@ ink_options_new (void)
pixmap_widget = gtk_pixmap_new (pixmap, NULL);
gdk_pixmap_unref (pixmap);
gtk_misc_set_padding (GTK_MISC (pixmap_widget), 6, 0);
radio_button =
gtk_radio_button_new_from_widget (GTK_RADIO_BUTTON (radio_button));
@ -469,6 +437,7 @@ ink_options_new (void)
pixmap_widget = gtk_pixmap_new (pixmap, NULL);
gdk_pixmap_unref (pixmap);
gtk_misc_set_padding (GTK_MISC (pixmap_widget), 6, 0);
radio_button =
gtk_radio_button_new_from_widget (GTK_RADIO_BUTTON (radio_button));
@ -483,7 +452,7 @@ ink_options_new (void)
/* Brush shape widget */
frame = gtk_frame_new (_("Shape"));
gtk_table_attach_defaults (GTK_TABLE (table), frame, 1, 2, 8, 9);
gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
gtk_widget_show (frame);
vbox = gtk_vbox_new (FALSE, 2);
@ -491,13 +460,13 @@ ink_options_new (void)
gtk_container_add (GTK_CONTAINER (frame), vbox);
gtk_widget_show (vbox);
options->brush_w = g_new (BrushWidget, 1);
options->brush_w->state = FALSE;
frame = gtk_aspect_frame_new (NULL, 0.5, 0.5, 1.0, FALSE);
frame = gtk_aspect_frame_new (NULL, 0.0, 0.5, 1.0, FALSE);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
options->brush_w = g_new (BrushWidget, 1);
options->brush_w->state = FALSE;
darea = gtk_drawing_area_new();
options->brush_w->widget = darea;
@ -523,7 +492,7 @@ ink_options_new (void)
GTK_SIGNAL_FUNC (brush_widget_realize),
options->brush_w);
gtk_widget_show_all (table);
gtk_widget_show_all (hbox);
return options;
}

45
app/interface.c
View File

@ -521,27 +521,16 @@ create_toolbox (void)
GList *list;
GtkAccelGroup *table;
GdkGeometry geometry;
GtkStyle *style;
gint xthickness;
gint ythickness;
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
/* Register dialog */
dialog_register_toolbox (window);
gtk_window_set_wmclass (GTK_WINDOW (window), "toolbox", "Gimp");
gtk_window_set_title (GTK_WINDOW (window), _("The GIMP"));
gtk_window_set_policy (GTK_WINDOW (window), TRUE, TRUE, FALSE);
geometry.min_width = 30;
geometry.min_height = 102;
geometry.width_inc = 28;
geometry.height_inc = 28;
gtk_window_set_geometry_hints (GTK_WINDOW (window),
NULL,
&geometry,
GDK_HINT_MIN_SIZE | GDK_HINT_RESIZE_INC);
session_set_window_geometry (window, &toolbox_session_info, TRUE);
gtk_signal_connect (GTK_OBJECT (window), "delete_event",
GTK_SIGNAL_FUNC (toolbox_delete),
NULL);
@ -572,6 +561,29 @@ create_toolbox (void)
gtk_widget_set_events (window, GDK_POINTER_MOTION_MASK);
gtk_widget_set_extension_events (window, GDK_EXTENSION_EVENTS_CURSOR);
}
/* set up the window geometry after the events have been set,
since we need to realize the widget */
gtk_window_set_wmclass (GTK_WINDOW (window), "toolbox", "Gimp");
gtk_window_set_title (GTK_WINDOW (window), _("The GIMP"));
gtk_window_set_policy (GTK_WINDOW (window), TRUE, TRUE, FALSE);
gtk_widget_realize (window);
style = gtk_widget_get_style (window);
xthickness = ((GtkStyleClass *) style->klass)->xthickness;
ythickness = ((GtkStyleClass *) style->klass)->ythickness;
geometry.min_width = 2 + 24 + 2 * xthickness;
geometry.min_height = 100 + 24 + 2 * ythickness;
geometry.width_inc = 24 + 2 * xthickness;
geometry.height_inc = 24 + 2 * ythickness;
gtk_window_set_geometry_hints (GTK_WINDOW (window),
NULL,
&geometry,
GDK_HINT_MIN_SIZE | GDK_HINT_RESIZE_INC);
session_set_window_geometry (window, &toolbox_session_info, TRUE);
main_vbox = gtk_vbox_new (FALSE, 1);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 1);
@ -602,7 +614,8 @@ create_toolbox (void)
wbox = gtk_hwrap_box_new (FALSE);
gtk_wrap_box_set_justify (GTK_WRAP_BOX (wbox), GTK_JUSTIFY_TOP);
gtk_wrap_box_set_line_justify (GTK_WRAP_BOX (wbox), GTK_JUSTIFY_LEFT);
gtk_wrap_box_set_aspect_ratio (GTK_WRAP_BOX (wbox), 140.0 / 192.0); /* 5x5 tools */
/* magic number to set a default 5x5 layout */
gtk_wrap_box_set_aspect_ratio (GTK_WRAP_BOX (wbox), 5.0 / 5.9);
gtk_container_set_border_width (GTK_CONTAINER (wbox), 0);
gtk_box_pack_start (GTK_BOX (main_vbox), wbox, TRUE, TRUE, 0);
gtk_widget_show (wbox);

225
app/paint/gimpink.c
View File

@ -258,8 +258,8 @@ ink_options_new (void)
GtkWidget *table;
GtkWidget *vbox;
GtkWidget *abox;
GtkWidget *label;
GtkWidget *hbox;
GtkWidget *hbox2;
GtkWidget *radio_button;
GtkWidget *pixmap_widget;
GtkWidget *slider;
@ -281,151 +281,117 @@ ink_options_new (void)
options->aspect = options->aspect_d = 1.0;
options->angle = options->angle_d = 0.0;
/* the main table */
table = gtk_table_new (9, 2, FALSE);
gtk_table_set_col_spacing (GTK_TABLE (table), 0, 4);
gtk_table_set_row_spacing (GTK_TABLE (table), 0, 2);
gtk_table_set_row_spacing (GTK_TABLE (table), 1, 2);
gtk_table_set_row_spacing (GTK_TABLE (table), 3, 2);
gtk_table_set_row_spacing (GTK_TABLE (table), 5, 2);
gtk_table_set_row_spacing (GTK_TABLE (table), 7, 4);
gtk_box_pack_start (GTK_BOX (((ToolOptions *) options)->main_vbox), table,
FALSE, FALSE, 0);
/* the main vbox */
vbox = gtk_vbox_new (FALSE, 2);
gtk_box_pack_start (GTK_BOX (((ToolOptions *) options)->main_vbox), vbox,
TRUE, TRUE, 0);
gtk_widget_show (vbox);
/* adjust sliders */
frame = gtk_frame_new (_("Adjustment"));
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
gtk_widget_show (frame);
table = gtk_table_new (2, 2, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_container_set_border_width (GTK_CONTAINER (table), 2);
gtk_container_add (GTK_CONTAINER (frame), table);
gtk_widget_show (table);
/* size slider */
label = gtk_label_new (_("Size:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (label);
options->size_w =
gtk_adjustment_new (options->size_d, 0.0, 20.0, 1.0, 2.0, 0.0);
slider = gtk_hscale_new (GTK_ADJUSTMENT (options->size_w));
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
gtk_table_attach_defaults (GTK_TABLE (table), slider, 1, 2, 0, 1);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Size:"), 1.0, 1.0,
slider, 1, FALSE);
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->size_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->size);
gtk_widget_show (slider);
/* sens slider */
label = gtk_label_new (_("Sensitivity:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (label);
options->sensitivity_w =
gtk_adjustment_new (options->sensitivity_d, 0.0, 1.0, 0.01, 0.1, 0.0);
slider = gtk_hscale_new (GTK_ADJUSTMENT (options->sensitivity_w));
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
gtk_table_attach_defaults (GTK_TABLE (table), slider, 1, 2, 1, 2);
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->sensitivity_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->sensitivity);
gtk_widget_show (slider);
/* tilt sens slider */
label = gtk_label_new (_("Tilt"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 1.0);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3,
GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_widget_show (label);
label = gtk_label_new (_("Sensitivity:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4,
GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_widget_show (label);
abox = gtk_alignment_new (0.5, 1.0, 1.0, 0.0);
gtk_table_attach (GTK_TABLE (table), abox, 1, 2, 2, 4,
GTK_EXPAND | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (abox);
options->tilt_sensitivity_w =
gtk_adjustment_new (options->tilt_sensitivity_d, 0.0, 1.0, 0.01, 0.1, 0.0);
slider = gtk_hscale_new (GTK_ADJUSTMENT (options->tilt_sensitivity_w));
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
gtk_container_add (GTK_CONTAINER (abox), slider);
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->tilt_sensitivity_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->tilt_sensitivity);
gtk_widget_show (slider);
/* velocity sens slider */
label = gtk_label_new (_("Speed"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 1.0);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 4, 5,
GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_widget_show (label);
label = gtk_label_new (_("Sensitivity:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 5, 6,
GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_widget_show (label);
abox = gtk_alignment_new (0.5, 1.0, 1.0, 0.0);
gtk_table_attach (GTK_TABLE (table), abox, 1, 2, 4, 6,
GTK_EXPAND | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (abox);
options->vel_sensitivity_w =
gtk_adjustment_new (options->vel_sensitivity_d, 0.0, 1.0, 0.01, 0.1, 0.0);
slider = gtk_hscale_new (GTK_ADJUSTMENT (options->vel_sensitivity_w));
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
gtk_container_add (GTK_CONTAINER (abox), slider);
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->vel_sensitivity_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->vel_sensitivity);
gtk_widget_show (slider);
/* angle adjust slider */
label = gtk_label_new (_("Angle"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 1.0);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 6, 7,
GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_widget_show (label);
label = gtk_label_new (_("Adjust:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 7, 8,
GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_widget_show (label);
abox = gtk_alignment_new (0.5, 1.0, 1.0, 0.0);
gtk_table_attach (GTK_TABLE (table), abox, 1, 2, 6, 8,
GTK_EXPAND | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (abox);
options->tilt_angle_w =
gtk_adjustment_new (options->tilt_angle_d, -90.0, 90.0, 1, 10.0, 0.0);
slider = gtk_hscale_new (GTK_ADJUSTMENT (options->tilt_angle_w));
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
gtk_container_add (GTK_CONTAINER (abox), slider);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Angle:"), 1.0, 1.0,
slider, 1, FALSE);
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->tilt_angle_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->tilt_angle);
/* Brush type radiobuttons */
frame = gtk_frame_new (_("Type"));
gtk_table_attach (GTK_TABLE (table), frame, 0, 1, 8, 9,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
/* sens sliders */
frame = gtk_frame_new (_("Sensitivity"));
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
gtk_widget_show (frame);
table = gtk_table_new (3, 2, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_container_set_border_width (GTK_CONTAINER (table), 2);
gtk_container_add (GTK_CONTAINER (frame), table);
gtk_widget_show (table);
/* size sens slider */
options->sensitivity_w =
gtk_adjustment_new (options->sensitivity_d, 0.0, 1.0, 0.01, 0.1, 0.0);
slider = gtk_hscale_new (GTK_ADJUSTMENT (options->sensitivity_w));
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Size:"), 1.0, 1.0,
slider, 1, FALSE);
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->sensitivity_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->sensitivity);
/* tilt sens slider */
options->tilt_sensitivity_w =
gtk_adjustment_new (options->tilt_sensitivity_d, 0.0, 1.0, 0.01, 0.1, 0.0);
slider = gtk_hscale_new (GTK_ADJUSTMENT (options->tilt_sensitivity_w));
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Tilt:"), 1.0, 1.0,
slider, 1, FALSE);
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->tilt_sensitivity_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->tilt_sensitivity);
/* velocity sens slider */
options->vel_sensitivity_w =
gtk_adjustment_new (options->vel_sensitivity_d, 0.0, 1.0, 0.01, 0.1, 0.0);
slider = gtk_hscale_new (GTK_ADJUSTMENT (options->vel_sensitivity_w));
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 3,
_("Speed:"), 1.0, 1.0,
slider, 1, FALSE);
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->vel_sensitivity_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->vel_sensitivity);
/* bottom hbox */
hbox = gtk_hbox_new (FALSE, 2);
gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
gtk_widget_show (hbox);
/* Brush type radiobuttons */
frame = gtk_frame_new (_("Type"));
gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
gtk_widget_show (frame);
hbox2 = gtk_hbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (frame), hbox2);
vbox = gtk_vbox_new (FALSE, 2);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 2);
gtk_container_add (GTK_CONTAINER (frame), vbox);
gtk_box_pack_start (GTK_BOX (hbox2), vbox, FALSE, FALSE, 0);
gtk_widget_show (vbox);
pixmap = blob_pixmap (gtk_widget_get_colormap (vbox),
@ -434,6 +400,7 @@ ink_options_new (void)
pixmap_widget = gtk_pixmap_new (pixmap, NULL);
gdk_pixmap_unref (pixmap);
gtk_misc_set_padding (GTK_MISC (pixmap_widget), 6, 0);
radio_button = gtk_radio_button_new (NULL);
gtk_signal_connect (GTK_OBJECT (radio_button), "toggled",
@ -451,6 +418,7 @@ ink_options_new (void)
pixmap_widget = gtk_pixmap_new (pixmap, NULL);
gdk_pixmap_unref (pixmap);
gtk_misc_set_padding (GTK_MISC (pixmap_widget), 6, 0);
radio_button =
gtk_radio_button_new_from_widget (GTK_RADIO_BUTTON (radio_button));
@ -469,6 +437,7 @@ ink_options_new (void)
pixmap_widget = gtk_pixmap_new (pixmap, NULL);
gdk_pixmap_unref (pixmap);
gtk_misc_set_padding (GTK_MISC (pixmap_widget), 6, 0);
radio_button =
gtk_radio_button_new_from_widget (GTK_RADIO_BUTTON (radio_button));
@ -483,7 +452,7 @@ ink_options_new (void)
/* Brush shape widget */
frame = gtk_frame_new (_("Shape"));
gtk_table_attach_defaults (GTK_TABLE (table), frame, 1, 2, 8, 9);
gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
gtk_widget_show (frame);
vbox = gtk_vbox_new (FALSE, 2);
@ -491,13 +460,13 @@ ink_options_new (void)
gtk_container_add (GTK_CONTAINER (frame), vbox);
gtk_widget_show (vbox);
options->brush_w = g_new (BrushWidget, 1);
options->brush_w->state = FALSE;
frame = gtk_aspect_frame_new (NULL, 0.5, 0.5, 1.0, FALSE);
frame = gtk_aspect_frame_new (NULL, 0.0, 0.5, 1.0, FALSE);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
options->brush_w = g_new (BrushWidget, 1);
options->brush_w->state = FALSE;
darea = gtk_drawing_area_new();
options->brush_w->widget = darea;
@ -523,7 +492,7 @@ ink_options_new (void)
GTK_SIGNAL_FUNC (brush_widget_realize),
options->brush_w);
gtk_widget_show_all (table);
gtk_widget_show_all (hbox);
return options;
}

2
app/tool_options.c
View File

@ -727,7 +727,7 @@ paint_pressure_options_new (ToolType tool_type)
case ERASER:
case PAINTBRUSH:
case SMUDGE:
pressure->pressure_w = gtk_check_button_new_with_label (_("Pressure"));
pressure->pressure_w = gtk_check_button_new_with_label (_("Hardness"));
gtk_container_add (GTK_CONTAINER (wbox), pressure->pressure_w);
gtk_signal_connect (GTK_OBJECT (pressure->pressure_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),

225
app/tools/gimpinktool.c
View File

@ -258,8 +258,8 @@ ink_options_new (void)
GtkWidget *table;
GtkWidget *vbox;
GtkWidget *abox;
GtkWidget *label;
GtkWidget *hbox;
GtkWidget *hbox2;
GtkWidget *radio_button;
GtkWidget *pixmap_widget;
GtkWidget *slider;
@ -281,151 +281,117 @@ ink_options_new (void)
options->aspect = options->aspect_d = 1.0;
options->angle = options->angle_d = 0.0;
/* the main table */
table = gtk_table_new (9, 2, FALSE);
gtk_table_set_col_spacing (GTK_TABLE (table), 0, 4);
gtk_table_set_row_spacing (GTK_TABLE (table), 0, 2);
gtk_table_set_row_spacing (GTK_TABLE (table), 1, 2);
gtk_table_set_row_spacing (GTK_TABLE (table), 3, 2);
gtk_table_set_row_spacing (GTK_TABLE (table), 5, 2);
gtk_table_set_row_spacing (GTK_TABLE (table), 7, 4);
gtk_box_pack_start (GTK_BOX (((ToolOptions *) options)->main_vbox), table,
FALSE, FALSE, 0);
/* the main vbox */
vbox = gtk_vbox_new (FALSE, 2);
gtk_box_pack_start (GTK_BOX (((ToolOptions *) options)->main_vbox), vbox,
TRUE, TRUE, 0);
gtk_widget_show (vbox);
/* adjust sliders */
frame = gtk_frame_new (_("Adjustment"));
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
gtk_widget_show (frame);
table = gtk_table_new (2, 2, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_container_set_border_width (GTK_CONTAINER (table), 2);
gtk_container_add (GTK_CONTAINER (frame), table);
gtk_widget_show (table);
/* size slider */
label = gtk_label_new (_("Size:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (label);
options->size_w =
gtk_adjustment_new (options->size_d, 0.0, 20.0, 1.0, 2.0, 0.0);
slider = gtk_hscale_new (GTK_ADJUSTMENT (options->size_w));
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
gtk_table_attach_defaults (GTK_TABLE (table), slider, 1, 2, 0, 1);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Size:"), 1.0, 1.0,
slider, 1, FALSE);
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->size_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->size);
gtk_widget_show (slider);
/* sens slider */
label = gtk_label_new (_("Sensitivity:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (label);
options->sensitivity_w =
gtk_adjustment_new (options->sensitivity_d, 0.0, 1.0, 0.01, 0.1, 0.0);
slider = gtk_hscale_new (GTK_ADJUSTMENT (options->sensitivity_w));
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
gtk_table_attach_defaults (GTK_TABLE (table), slider, 1, 2, 1, 2);
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->sensitivity_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->sensitivity);
gtk_widget_show (slider);
/* tilt sens slider */
label = gtk_label_new (_("Tilt"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 1.0);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3,
GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_widget_show (label);
label = gtk_label_new (_("Sensitivity:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4,
GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_widget_show (label);
abox = gtk_alignment_new (0.5, 1.0, 1.0, 0.0);
gtk_table_attach (GTK_TABLE (table), abox, 1, 2, 2, 4,
GTK_EXPAND | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (abox);
options->tilt_sensitivity_w =
gtk_adjustment_new (options->tilt_sensitivity_d, 0.0, 1.0, 0.01, 0.1, 0.0);
slider = gtk_hscale_new (GTK_ADJUSTMENT (options->tilt_sensitivity_w));
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
gtk_container_add (GTK_CONTAINER (abox), slider);
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->tilt_sensitivity_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->tilt_sensitivity);
gtk_widget_show (slider);
/* velocity sens slider */
label = gtk_label_new (_("Speed"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 1.0);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 4, 5,
GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_widget_show (label);
label = gtk_label_new (_("Sensitivity:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 5, 6,
GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_widget_show (label);
abox = gtk_alignment_new (0.5, 1.0, 1.0, 0.0);
gtk_table_attach (GTK_TABLE (table), abox, 1, 2, 4, 6,
GTK_EXPAND | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (abox);
options->vel_sensitivity_w =
gtk_adjustment_new (options->vel_sensitivity_d, 0.0, 1.0, 0.01, 0.1, 0.0);
slider = gtk_hscale_new (GTK_ADJUSTMENT (options->vel_sensitivity_w));
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
gtk_container_add (GTK_CONTAINER (abox), slider);
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->vel_sensitivity_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->vel_sensitivity);
gtk_widget_show (slider);
/* angle adjust slider */
label = gtk_label_new (_("Angle"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 1.0);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 6, 7,
GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_widget_show (label);
label = gtk_label_new (_("Adjust:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 7, 8,
GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_widget_show (label);
abox = gtk_alignment_new (0.5, 1.0, 1.0, 0.0);
gtk_table_attach (GTK_TABLE (table), abox, 1, 2, 6, 8,
GTK_EXPAND | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (abox);
options->tilt_angle_w =
gtk_adjustment_new (options->tilt_angle_d, -90.0, 90.0, 1, 10.0, 0.0);
slider = gtk_hscale_new (GTK_ADJUSTMENT (options->tilt_angle_w));
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
gtk_container_add (GTK_CONTAINER (abox), slider);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Angle:"), 1.0, 1.0,
slider, 1, FALSE);
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->tilt_angle_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->tilt_angle);
/* Brush type radiobuttons */
frame = gtk_frame_new (_("Type"));
gtk_table_attach (GTK_TABLE (table), frame, 0, 1, 8, 9,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
/* sens sliders */
frame = gtk_frame_new (_("Sensitivity"));
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
gtk_widget_show (frame);
table = gtk_table_new (3, 2, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_container_set_border_width (GTK_CONTAINER (table), 2);
gtk_container_add (GTK_CONTAINER (frame), table);
gtk_widget_show (table);
/* size sens slider */
options->sensitivity_w =
gtk_adjustment_new (options->sensitivity_d, 0.0, 1.0, 0.01, 0.1, 0.0);
slider = gtk_hscale_new (GTK_ADJUSTMENT (options->sensitivity_w));
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Size:"), 1.0, 1.0,
slider, 1, FALSE);
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->sensitivity_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->sensitivity);
/* tilt sens slider */
options->tilt_sensitivity_w =
gtk_adjustment_new (options->tilt_sensitivity_d, 0.0, 1.0, 0.01, 0.1, 0.0);
slider = gtk_hscale_new (GTK_ADJUSTMENT (options->tilt_sensitivity_w));
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Tilt:"), 1.0, 1.0,
slider, 1, FALSE);
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->tilt_sensitivity_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->tilt_sensitivity);
/* velocity sens slider */
options->vel_sensitivity_w =
gtk_adjustment_new (options->vel_sensitivity_d, 0.0, 1.0, 0.01, 0.1, 0.0);
slider = gtk_hscale_new (GTK_ADJUSTMENT (options->vel_sensitivity_w));
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 3,
_("Speed:"), 1.0, 1.0,
slider, 1, FALSE);
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->vel_sensitivity_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->vel_sensitivity);
/* bottom hbox */
hbox = gtk_hbox_new (FALSE, 2);
gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
gtk_widget_show (hbox);
/* Brush type radiobuttons */
frame = gtk_frame_new (_("Type"));
gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
gtk_widget_show (frame);
hbox2 = gtk_hbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (frame), hbox2);
vbox = gtk_vbox_new (FALSE, 2);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 2);
gtk_container_add (GTK_CONTAINER (frame), vbox);
gtk_box_pack_start (GTK_BOX (hbox2), vbox, FALSE, FALSE, 0);
gtk_widget_show (vbox);
pixmap = blob_pixmap (gtk_widget_get_colormap (vbox),
@ -434,6 +400,7 @@ ink_options_new (void)
pixmap_widget = gtk_pixmap_new (pixmap, NULL);
gdk_pixmap_unref (pixmap);
gtk_misc_set_padding (GTK_MISC (pixmap_widget), 6, 0);
radio_button = gtk_radio_button_new (NULL);
gtk_signal_connect (GTK_OBJECT (radio_button), "toggled",
@ -451,6 +418,7 @@ ink_options_new (void)
pixmap_widget = gtk_pixmap_new (pixmap, NULL);
gdk_pixmap_unref (pixmap);
gtk_misc_set_padding (GTK_MISC (pixmap_widget), 6, 0);
radio_button =
gtk_radio_button_new_from_widget (GTK_RADIO_BUTTON (radio_button));
@ -469,6 +437,7 @@ ink_options_new (void)
pixmap_widget = gtk_pixmap_new (pixmap, NULL);
gdk_pixmap_unref (pixmap);
gtk_misc_set_padding (GTK_MISC (pixmap_widget), 6, 0);
radio_button =
gtk_radio_button_new_from_widget (GTK_RADIO_BUTTON (radio_button));
@ -483,7 +452,7 @@ ink_options_new (void)
/* Brush shape widget */
frame = gtk_frame_new (_("Shape"));
gtk_table_attach_defaults (GTK_TABLE (table), frame, 1, 2, 8, 9);
gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
gtk_widget_show (frame);
vbox = gtk_vbox_new (FALSE, 2);
@ -491,13 +460,13 @@ ink_options_new (void)
gtk_container_add (GTK_CONTAINER (frame), vbox);
gtk_widget_show (vbox);
options->brush_w = g_new (BrushWidget, 1);
options->brush_w->state = FALSE;
frame = gtk_aspect_frame_new (NULL, 0.5, 0.5, 1.0, FALSE);
frame = gtk_aspect_frame_new (NULL, 0.0, 0.5, 1.0, FALSE);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
options->brush_w = g_new (BrushWidget, 1);
options->brush_w->state = FALSE;
darea = gtk_drawing_area_new();
options->brush_w->widget = darea;
@ -523,7 +492,7 @@ ink_options_new (void)
GTK_SIGNAL_FUNC (brush_widget_realize),
options->brush_w);
gtk_widget_show_all (table);
gtk_widget_show_all (hbox);
return options;
}

225
app/tools/ink.c
View File

@ -258,8 +258,8 @@ ink_options_new (void)
GtkWidget *table;
GtkWidget *vbox;
GtkWidget *abox;
GtkWidget *label;
GtkWidget *hbox;
GtkWidget *hbox2;
GtkWidget *radio_button;
GtkWidget *pixmap_widget;
GtkWidget *slider;
@ -281,151 +281,117 @@ ink_options_new (void)
options->aspect = options->aspect_d = 1.0;
options->angle = options->angle_d = 0.0;
/* the main table */
table = gtk_table_new (9, 2, FALSE);
gtk_table_set_col_spacing (GTK_TABLE (table), 0, 4);
gtk_table_set_row_spacing (GTK_TABLE (table), 0, 2);
gtk_table_set_row_spacing (GTK_TABLE (table), 1, 2);
gtk_table_set_row_spacing (GTK_TABLE (table), 3, 2);
gtk_table_set_row_spacing (GTK_TABLE (table), 5, 2);
gtk_table_set_row_spacing (GTK_TABLE (table), 7, 4);
gtk_box_pack_start (GTK_BOX (((ToolOptions *) options)->main_vbox), table,
FALSE, FALSE, 0);
/* the main vbox */
vbox = gtk_vbox_new (FALSE, 2);
gtk_box_pack_start (GTK_BOX (((ToolOptions *) options)->main_vbox), vbox,
TRUE, TRUE, 0);
gtk_widget_show (vbox);
/* adjust sliders */
frame = gtk_frame_new (_("Adjustment"));
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
gtk_widget_show (frame);
table = gtk_table_new (2, 2, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_container_set_border_width (GTK_CONTAINER (table), 2);
gtk_container_add (GTK_CONTAINER (frame), table);
gtk_widget_show (table);
/* size slider */
label = gtk_label_new (_("Size:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (label);
options->size_w =
gtk_adjustment_new (options->size_d, 0.0, 20.0, 1.0, 2.0, 0.0);
slider = gtk_hscale_new (GTK_ADJUSTMENT (options->size_w));
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
gtk_table_attach_defaults (GTK_TABLE (table), slider, 1, 2, 0, 1);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Size:"), 1.0, 1.0,
slider, 1, FALSE);
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->size_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->size);
gtk_widget_show (slider);
/* sens slider */
label = gtk_label_new (_("Sensitivity:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (label);
options->sensitivity_w =
gtk_adjustment_new (options->sensitivity_d, 0.0, 1.0, 0.01, 0.1, 0.0);
slider = gtk_hscale_new (GTK_ADJUSTMENT (options->sensitivity_w));
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
gtk_table_attach_defaults (GTK_TABLE (table), slider, 1, 2, 1, 2);
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->sensitivity_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->sensitivity);
gtk_widget_show (slider);
/* tilt sens slider */
label = gtk_label_new (_("Tilt"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 1.0);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3,
GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_widget_show (label);
label = gtk_label_new (_("Sensitivity:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4,
GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_widget_show (label);
abox = gtk_alignment_new (0.5, 1.0, 1.0, 0.0);
gtk_table_attach (GTK_TABLE (table), abox, 1, 2, 2, 4,
GTK_EXPAND | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (abox);
options->tilt_sensitivity_w =
gtk_adjustment_new (options->tilt_sensitivity_d, 0.0, 1.0, 0.01, 0.1, 0.0);
slider = gtk_hscale_new (GTK_ADJUSTMENT (options->tilt_sensitivity_w));
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
gtk_container_add (GTK_CONTAINER (abox), slider);
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->tilt_sensitivity_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->tilt_sensitivity);
gtk_widget_show (slider);
/* velocity sens slider */
label = gtk_label_new (_("Speed"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 1.0);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 4, 5,
GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_widget_show (label);
label = gtk_label_new (_("Sensitivity:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 5, 6,
GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_widget_show (label);
abox = gtk_alignment_new (0.5, 1.0, 1.0, 0.0);
gtk_table_attach (GTK_TABLE (table), abox, 1, 2, 4, 6,
GTK_EXPAND | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (abox);
options->vel_sensitivity_w =
gtk_adjustment_new (options->vel_sensitivity_d, 0.0, 1.0, 0.01, 0.1, 0.0);
slider = gtk_hscale_new (GTK_ADJUSTMENT (options->vel_sensitivity_w));
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
gtk_container_add (GTK_CONTAINER (abox), slider);
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->vel_sensitivity_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->vel_sensitivity);
gtk_widget_show (slider);
/* angle adjust slider */
label = gtk_label_new (_("Angle"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 1.0);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 6, 7,
GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_widget_show (label);
label = gtk_label_new (_("Adjust:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 7, 8,
GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
gtk_widget_show (label);
abox = gtk_alignment_new (0.5, 1.0, 1.0, 0.0);
gtk_table_attach (GTK_TABLE (table), abox, 1, 2, 6, 8,
GTK_EXPAND | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (abox);
options->tilt_angle_w =
gtk_adjustment_new (options->tilt_angle_d, -90.0, 90.0, 1, 10.0, 0.0);
slider = gtk_hscale_new (GTK_ADJUSTMENT (options->tilt_angle_w));
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
gtk_container_add (GTK_CONTAINER (abox), slider);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Angle:"), 1.0, 1.0,
slider, 1, FALSE);
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->tilt_angle_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->tilt_angle);
/* Brush type radiobuttons */
frame = gtk_frame_new (_("Type"));
gtk_table_attach (GTK_TABLE (table), frame, 0, 1, 8, 9,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
/* sens sliders */
frame = gtk_frame_new (_("Sensitivity"));
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
gtk_widget_show (frame);
table = gtk_table_new (3, 2, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_container_set_border_width (GTK_CONTAINER (table), 2);
gtk_container_add (GTK_CONTAINER (frame), table);
gtk_widget_show (table);
/* size sens slider */
options->sensitivity_w =
gtk_adjustment_new (options->sensitivity_d, 0.0, 1.0, 0.01, 0.1, 0.0);
slider = gtk_hscale_new (GTK_ADJUSTMENT (options->sensitivity_w));
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Size:"), 1.0, 1.0,
slider, 1, FALSE);
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->sensitivity_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->sensitivity);
/* tilt sens slider */
options->tilt_sensitivity_w =
gtk_adjustment_new (options->tilt_sensitivity_d, 0.0, 1.0, 0.01, 0.1, 0.0);
slider = gtk_hscale_new (GTK_ADJUSTMENT (options->tilt_sensitivity_w));
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Tilt:"), 1.0, 1.0,
slider, 1, FALSE);
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->tilt_sensitivity_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->tilt_sensitivity);
/* velocity sens slider */
options->vel_sensitivity_w =
gtk_adjustment_new (options->vel_sensitivity_d, 0.0, 1.0, 0.01, 0.1, 0.0);
slider = gtk_hscale_new (GTK_ADJUSTMENT (options->vel_sensitivity_w));
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 3,
_("Speed:"), 1.0, 1.0,
slider, 1, FALSE);
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->vel_sensitivity_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->vel_sensitivity);
/* bottom hbox */
hbox = gtk_hbox_new (FALSE, 2);
gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
gtk_widget_show (hbox);
/* Brush type radiobuttons */
frame = gtk_frame_new (_("Type"));
gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
gtk_widget_show (frame);
hbox2 = gtk_hbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (frame), hbox2);
vbox = gtk_vbox_new (FALSE, 2);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 2);
gtk_container_add (GTK_CONTAINER (frame), vbox);
gtk_box_pack_start (GTK_BOX (hbox2), vbox, FALSE, FALSE, 0);
gtk_widget_show (vbox);
pixmap = blob_pixmap (gtk_widget_get_colormap (vbox),
@ -434,6 +400,7 @@ ink_options_new (void)
pixmap_widget = gtk_pixmap_new (pixmap, NULL);
gdk_pixmap_unref (pixmap);
gtk_misc_set_padding (GTK_MISC (pixmap_widget), 6, 0);
radio_button = gtk_radio_button_new (NULL);
gtk_signal_connect (GTK_OBJECT (radio_button), "toggled",
@ -451,6 +418,7 @@ ink_options_new (void)
pixmap_widget = gtk_pixmap_new (pixmap, NULL);
gdk_pixmap_unref (pixmap);
gtk_misc_set_padding (GTK_MISC (pixmap_widget), 6, 0);
radio_button =
gtk_radio_button_new_from_widget (GTK_RADIO_BUTTON (radio_button));
@ -469,6 +437,7 @@ ink_options_new (void)
pixmap_widget = gtk_pixmap_new (pixmap, NULL);
gdk_pixmap_unref (pixmap);
gtk_misc_set_padding (GTK_MISC (pixmap_widget), 6, 0);
radio_button =
gtk_radio_button_new_from_widget (GTK_RADIO_BUTTON (radio_button));
@ -483,7 +452,7 @@ ink_options_new (void)
/* Brush shape widget */
frame = gtk_frame_new (_("Shape"));
gtk_table_attach_defaults (GTK_TABLE (table), frame, 1, 2, 8, 9);
gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
gtk_widget_show (frame);
vbox = gtk_vbox_new (FALSE, 2);
@ -491,13 +460,13 @@ ink_options_new (void)
gtk_container_add (GTK_CONTAINER (frame), vbox);
gtk_widget_show (vbox);
options->brush_w = g_new (BrushWidget, 1);
options->brush_w->state = FALSE;
frame = gtk_aspect_frame_new (NULL, 0.5, 0.5, 1.0, FALSE);
frame = gtk_aspect_frame_new (NULL, 0.0, 0.5, 1.0, FALSE);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
options->brush_w = g_new (BrushWidget, 1);
options->brush_w->state = FALSE;
darea = gtk_drawing_area_new();
options->brush_w->widget = darea;
@ -523,7 +492,7 @@ ink_options_new (void)
GTK_SIGNAL_FUNC (brush_widget_realize),
options->brush_w);
gtk_widget_show_all (table);
gtk_widget_show_all (hbox);
return options;
}

2
app/tools/tool_options.c
View File

@ -727,7 +727,7 @@ paint_pressure_options_new (ToolType tool_type)
case ERASER:
case PAINTBRUSH:
case SMUDGE:
pressure->pressure_w = gtk_check_button_new_with_label (_("Pressure"));
pressure->pressure_w = gtk_check_button_new_with_label (_("Hardness"));
gtk_container_add (GTK_CONTAINER (wbox), pressure->pressure_w);
gtk_signal_connect (GTK_OBJECT (pressure->pressure_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),

2
plug-ins/gap/Makefile.am
View File

@ -15,7 +15,6 @@ EXTRA_DIST = \
iter_ALT/gen/plug_in_alpha2color_iter_ALT.inc \
iter_ALT/gen/plug_in_blinds_iter_ALT.inc \
iter_ALT/gen/plug_in_borderaverage_iter_ALT.inc \
iter_ALT/gen/plug_in_bump_map_iter_ALT.inc \
iter_ALT/gen/plug_in_checkerboard_iter_ALT.inc \
iter_ALT/gen/plug_in_color_map_iter_ALT.inc \
iter_ALT/gen/plug_in_colorify_iter_ALT.inc \
@ -58,6 +57,7 @@ EXTRA_DIST = \
iter_ALT/mod/plug_in_alienmap_iter_ALT.inc \
iter_ALT/mod/plug_in_applylens_iter_ALT.inc \
iter_ALT/mod/plug_in_blur_iter_ALT.inc \
iter_ALT/mod/plug_in_bump_map_iter_ALT.inc \
iter_ALT/mod/plug_in_convmatrix_iter_ALT.inc \
iter_ALT/mod/plug_in_depth_merge_iter_ALT.inc \
iter_ALT/mod/plug_in_despeckle_iter_ALT.inc \

2
plug-ins/gap/gap_filter_iterators.c
View File

@ -414,6 +414,7 @@ static void p_delta_LightSettings(t_LightSettings *val, t_LightSettings *val_fro
#include "iter_ALT/mod/plug_in_alienmap_iter_ALT.inc"
#include "iter_ALT/mod/plug_in_applylens_iter_ALT.inc"
#include "iter_ALT/mod/plug_in_blur_iter_ALT.inc"
#include "iter_ALT/mod/plug_in_bump_map_iter_ALT.inc"
#include "iter_ALT/mod/plug_in_convmatrix_iter_ALT.inc"
#include "iter_ALT/mod/plug_in_depth_merge_iter_ALT.inc"
#include "iter_ALT/mod/plug_in_despeckle_iter_ALT.inc"
@ -457,7 +458,6 @@ static void p_delta_LightSettings(t_LightSettings *val, t_LightSettings *val_fro
#include "iter_ALT/gen/plug_in_alpha2color_iter_ALT.inc"
#include "iter_ALT/gen/plug_in_blinds_iter_ALT.inc"
#include "iter_ALT/gen/plug_in_borderaverage_iter_ALT.inc"
#include "iter_ALT/gen/plug_in_bump_map_iter_ALT.inc"
#include "iter_ALT/gen/plug_in_checkerboard_iter_ALT.inc"
#include "iter_ALT/gen/plug_in_color_map_iter_ALT.inc"
#include "iter_ALT/gen/plug_in_colorify_iter_ALT.inc"

1
plug-ins/gap/iter_ALT/gen/plug_in_bump_map_iter_ALT.inc → plug-ins/gap/iter_ALT/mod/plug_in_bump_map_iter_ALT.inc
View File

@ -17,6 +17,7 @@ gint p_plug_in_bump_map_iter_ALT(GRunModeType run_mode, gint32 total_steps, gdou
long compensate;
long invert;
long type;
long tiled;
} t_plug_in_bump_map_Vals;
t_plug_in_bump_map_Vals buf, *buf_from, *buf_to;

4
po-plug-ins/ChangeLog
View File

@ -1,3 +1,7 @@
2000-04-16 Sven Neumann <sven@gimp.org>
* de.po: updated german translation
2000-04-14 Kjartan Maraas <kmaraas@online.no>
* no.po: Updated Norwegian translation.

107
po-plug-ins/de.po
View File

@ -8,8 +8,8 @@
msgid ""
msgstr ""
"Project-Id-Version: GIMP 1.1.19\n"
"POT-Creation-Date: 2000-04-12 16:36+0200\n"
"PO-Revision-Date: 2000-04-13 12:15+02:00\n"
"POT-Creation-Date: 2000-04-16 14:17+0200\n"
"PO-Revision-Date: 2000-04-16 14:27+02:00\n"
"Last-Translator: Sven Neumann <sven@gimp.org>\n"
"Language-Team: German <de@li.org>\n"
"MIME-Version: 1.0\n"
@ -49,7 +49,7 @@ msgstr "
#: plug-ins/common/CML_explorer.c:2266 plug-ins/common/aa.c:363
#: plug-ins/common/align_layers.c:420 plug-ins/common/apply_lens.c:404
#: plug-ins/common/blinds.c:342 plug-ins/common/blur.c:622
#: plug-ins/common/bumpmap.c:806 plug-ins/common/checkerboard.c:359
#: plug-ins/common/bumpmap.c:868 plug-ins/common/checkerboard.c:359
#: plug-ins/common/colorify.c:333 plug-ins/common/colortoalpha.c:423
#: plug-ins/common/compose.c:785 plug-ins/common/convmatrix.c:810
#: plug-ins/common/csource.c:670 plug-ins/common/cubism.c:316
@ -76,7 +76,7 @@ msgstr "
#: plug-ins/common/noisify.c:333 plug-ins/common/nova.c:364
#: plug-ins/common/oilify.c:462 plug-ins/common/papertile.c:248
#: plug-ins/common/pat.c:428 plug-ins/common/pixelize.c:289
#: plug-ins/common/plasma.c:295 plug-ins/common/png.c:1003
#: plug-ins/common/plasma.c:295 plug-ins/common/png.c:1020
#: plug-ins/common/pnm.c:950 plug-ins/common/polar.c:943
#: plug-ins/common/ps.c:2550 plug-ins/common/ps.c:2731
#: plug-ins/common/psp.c:443 plug-ins/common/randomize.c:710
@ -93,7 +93,7 @@ msgstr "
#: plug-ins/common/vpropagate.c:942 plug-ins/common/warp.c:443
#: plug-ins/common/waves.c:356 plug-ins/common/whirlpinch.c:829
#: plug-ins/common/wind.c:719 plug-ins/common/wmf.c:938
#: plug-ins/common/xbm.c:1144 plug-ins/common/xpm.c:801
#: plug-ins/common/xbm.c:1144 plug-ins/common/xpm.c:815
#: plug-ins/fits/fits.c:1003 plug-ins/flame/flame.c:624
#: plug-ins/flame/flame.c:929 plug-ins/fp/fp_gtk.c:913
#: plug-ins/gap/gap_arr_dialog.c:768 plug-ins/gap/gap_arr_dialog.c:1010
@ -130,7 +130,7 @@ msgstr "OK"
#: plug-ins/common/CML_explorer.c:1190 plug-ins/common/CML_explorer.c:2268
#: plug-ins/common/aa.c:365 plug-ins/common/align_layers.c:422
#: plug-ins/common/apply_lens.c:406 plug-ins/common/blinds.c:344
#: plug-ins/common/blur.c:624 plug-ins/common/bumpmap.c:808
#: plug-ins/common/blur.c:624 plug-ins/common/bumpmap.c:870
#: plug-ins/common/checkerboard.c:361 plug-ins/common/colorify.c:335
#: plug-ins/common/colortoalpha.c:425 plug-ins/common/compose.c:787
#: plug-ins/common/convmatrix.c:814 plug-ins/common/csource.c:672
@ -158,7 +158,7 @@ msgstr "OK"
#: plug-ins/common/nova.c:366 plug-ins/common/oilify.c:464
#: plug-ins/common/papertile.c:250 plug-ins/common/pat.c:430
#: plug-ins/common/pixelize.c:291 plug-ins/common/plasma.c:297
#: plug-ins/common/png.c:1005 plug-ins/common/pnm.c:952
#: plug-ins/common/png.c:1022 plug-ins/common/pnm.c:952
#: plug-ins/common/polar.c:945 plug-ins/common/ps.c:2552
#: plug-ins/common/ps.c:2733 plug-ins/common/psp.c:445
#: plug-ins/common/randomize.c:712 plug-ins/common/ripple.c:598
@ -176,7 +176,7 @@ msgstr "OK"
#: plug-ins/common/waves.c:358 plug-ins/common/whirlpinch.c:831
#: plug-ins/common/wind.c:721 plug-ins/common/wmf.c:940
#: plug-ins/common/xbm.c:894 plug-ins/common/xbm.c:1146
#: plug-ins/common/xpm.c:803 plug-ins/fits/fits.c:1005
#: plug-ins/common/xpm.c:817 plug-ins/fits/fits.c:1005
#: plug-ins/flame/flame.c:626 plug-ins/flame/flame.c:931
#: plug-ins/fp/fp_gtk.c:917 plug-ins/gap/gap_arr_dialog.c:1012
#: plug-ins/gap/gap_dbbrowser_utils.c:211
@ -444,17 +444,17 @@ msgstr "
#. Preview
#: plug-ins/FractalExplorer/Dialogs.c:324 plug-ins/Lighting/lighting_ui.c:1093
#: plug-ins/MapObject/mapobject_ui.c:1399 plug-ins/common/CML_explorer.c:1214
#: plug-ins/common/blinds.c:362 plug-ins/common/bumpmap.c:828
#: plug-ins/common/curve_bend.c:1523 plug-ins/common/destripe.c:597
#: plug-ins/common/emboss.c:762 plug-ins/common/exchange.c:313
#: plug-ins/common/fractaltrace.c:759 plug-ins/common/iwarp.c:1173
#: plug-ins/common/mapcolor.c:596 plug-ins/common/nlfilt.c:586
#: plug-ins/common/polar.c:964 plug-ins/common/ps.c:2869
#: plug-ins/common/sharpen.c:567 plug-ins/common/spheredesigner.c:2258
#: plug-ins/common/tileit.c:426 plug-ins/common/waves.c:593
#: plug-ins/common/whirlpinch.c:847 plug-ins/flame/flame.c:949
#: plug-ins/gfig/gfig.c:3981 plug-ins/gflare/gflare.c:2518
#: plug-ins/gflare/gflare.c:3526 plug-ins/gimpressionist/orientmap.c:502
#: plug-ins/common/blinds.c:362 plug-ins/common/curve_bend.c:1523
#: plug-ins/common/destripe.c:597 plug-ins/common/emboss.c:762
#: plug-ins/common/exchange.c:313 plug-ins/common/fractaltrace.c:759
#: plug-ins/common/iwarp.c:1173 plug-ins/common/mapcolor.c:596
#: plug-ins/common/nlfilt.c:586 plug-ins/common/polar.c:964
#: plug-ins/common/ps.c:2869 plug-ins/common/sharpen.c:567
#: plug-ins/common/spheredesigner.c:2258 plug-ins/common/tileit.c:426
#: plug-ins/common/waves.c:593 plug-ins/common/whirlpinch.c:847
#: plug-ins/flame/flame.c:949 plug-ins/gfig/gfig.c:3981
#: plug-ins/gflare/gflare.c:2518 plug-ins/gflare/gflare.c:3526
#: plug-ins/gimpressionist/orientmap.c:502
#: plug-ins/gimpressionist/preview.c:106 plug-ins/gimpressionist/sizemap.c:402
#: plug-ins/ifscompose/ifscompose.c:912
#: plug-ins/imagemap/imap_edit_area_info.c:287
@ -1021,7 +1021,7 @@ msgid "Enable/disable jagged edges removal (antialiasing)"
msgstr "De-/Aktiviere Entfernung von Treppeneffekten (Kantenglättung)"
#: plug-ins/Lighting/lighting_ui.c:511 plug-ins/MapObject/mapobject_ui.c:647
#: plug-ins/common/bumpmap.c:962 plug-ins/common/emboss.c:602
#: plug-ins/common/bumpmap.c:1061 plug-ins/common/emboss.c:602
#: plug-ins/struc/struc.c:304
msgid "Depth:"
msgstr "Tiefe:"
@ -1151,7 +1151,7 @@ msgid "Intensity Levels"
msgstr "Intensitätsstufen"
#: plug-ins/Lighting/lighting_ui.c:740 plug-ins/MapObject/mapobject_ui.c:873
#: plug-ins/common/bumpmap.c:998
#: plug-ins/common/bumpmap.c:1101
msgid "Ambient:"
msgstr "Ambient:"
@ -1463,7 +1463,7 @@ msgstr "Zeige/Verberge Vorschau-Drahtgitter"
#: plug-ins/common/png.c:421 plug-ins/common/pnm.c:416
#: plug-ins/common/psd.c:1708 plug-ins/common/sunras.c:443
#: plug-ins/common/tga.c:430 plug-ins/common/tiff.c:441
#: plug-ins/common/xbm.c:675 plug-ins/common/xpm.c:328
#: plug-ins/common/xbm.c:675 plug-ins/common/xpm.c:335
#: plug-ins/common/xwd.c:448 plug-ins/faxg3/faxg3.c:191
#: plug-ins/gfli/gfli.c:471 plug-ins/sgi/sgi.c:331 plug-ins/sgi/sgi.c:333
#: plug-ins/xjt/xjt.c:3253
@ -1539,7 +1539,7 @@ msgstr "kann %s nicht
#: plug-ins/common/pnm.c:788 plug-ins/common/ps.c:1002
#: plug-ins/common/sunras.c:526 plug-ins/common/tga.c:1197
#: plug-ins/common/tiff.c:1225 plug-ins/common/xbm.c:959
#: plug-ins/common/xpm.c:645 plug-ins/common/xwd.c:552
#: plug-ins/common/xpm.c:654 plug-ins/common/xwd.c:552
#: plug-ins/fits/fits.c:473 plug-ins/gfli/gfli.c:691 plug-ins/sgi/sgi.c:549
#: plug-ins/sgi/sgi.c:551 plug-ins/xjt/xjt.c:1635
#, c-format
@ -2130,7 +2130,7 @@ msgstr "Sichtbare Ebenen anordnen"
#.
#: plug-ins/common/align_layers.c:431 plug-ins/common/apply_lens.c:415
#: plug-ins/common/blinds.c:424 plug-ins/common/blur.c:640
#: plug-ins/common/bumpmap.c:903 plug-ins/common/checkerboard.c:371
#: plug-ins/common/bumpmap.c:1002 plug-ins/common/checkerboard.c:371
#: plug-ins/common/cubism.c:328 plug-ins/common/despeckle.c:747
#: plug-ins/common/destripe.c:658 plug-ins/common/edge.c:668
#: plug-ins/common/emboss.c:572 plug-ins/common/engrave.c:246
@ -2140,7 +2140,7 @@ msgstr "Sichtbare Ebenen anordnen"
#: plug-ins/common/max_rgb.c:277 plug-ins/common/nlfilt.c:400
#: plug-ins/common/noisify.c:345 plug-ins/common/nova.c:376
#: plug-ins/common/oilify.c:474 plug-ins/common/pixelize.c:301
#: plug-ins/common/plasma.c:309 plug-ins/common/png.c:1014
#: plug-ins/common/plasma.c:309 plug-ins/common/png.c:1031
#: plug-ins/common/polar.c:984 plug-ins/common/randomize.c:728
#: plug-ins/common/ripple.c:692 plug-ins/common/scatter_hsv.c:445
#: plug-ins/common/sel_gauss.c:258 plug-ins/common/sharpen.c:627
@ -2150,7 +2150,7 @@ msgstr "Sichtbare Ebenen anordnen"
#: plug-ins/common/unsharp.c:805 plug-ins/common/video.c:2187
#: plug-ins/common/vpropagate.c:984 plug-ins/common/waves.c:406
#: plug-ins/common/whirlpinch.c:868 plug-ins/common/wind.c:733
#: plug-ins/common/xpm.c:813 plug-ins/maze/maze_face.c:212
#: plug-ins/common/xpm.c:827 plug-ins/maze/maze_face.c:212
#: plug-ins/mosaic/mosaic.c:660 plug-ins/struc/struc.c:273
#: plug-ins/xjt/xjt.c:812
msgid "Parameter Settings"
@ -2404,65 +2404,70 @@ msgstr "Wiederholen:"
msgid "Number of times to apply filter"
msgstr "wie oft der Filter angewendet werden soll"
#: plug-ins/common/bumpmap.c:339
#: plug-ins/common/bumpmap.c:363
msgid "<Image>/Filters/Map/Bump Map..."
msgstr "<Image>/Filter/Abbilden/Bumpmap..."
#: plug-ins/common/bumpmap.c:474
#: plug-ins/common/bumpmap.c:518
msgid "Bump-mapping..."
msgstr "Wende Bumpmap-Effekt an..."
#: plug-ins/common/bumpmap.c:801
#: plug-ins/common/bumpmap.c:863
msgid "Bump Map"
msgstr "Bumpmap"
#: plug-ins/common/bumpmap.c:864
#: plug-ins/common/bumpmap.c:954
msgid "Map Type"
msgstr "Map Typ"
#: plug-ins/common/bumpmap.c:868
#: plug-ins/common/bumpmap.c:958
msgid "Linear Map"
msgstr "Lineare Abb."
#: plug-ins/common/bumpmap.c:869
#: plug-ins/common/bumpmap.c:959
msgid "Spherical Map"
msgstr "Spherische Abb."
#: plug-ins/common/bumpmap.c:870
#: plug-ins/common/bumpmap.c:960
msgid "Sinuosidal Map"
msgstr "Sinusförmige Abb."
#. Compensate darkening
#: plug-ins/common/bumpmap.c:884
#: plug-ins/common/bumpmap.c:973
msgid "Compensate for Darkening"
msgstr "Verdunkelung kompensieren"
#. Invert bumpmap
#: plug-ins/common/bumpmap.c:894
#: plug-ins/common/bumpmap.c:983
msgid "Invert Bumpmap"
msgstr "Bumpmap invertieren"
#: plug-ins/common/bumpmap.c:925
msgid "Bump Map:"
msgstr "Bump Map:"
#. Tile bumpmap
#: plug-ins/common/bumpmap.c:993
msgid "Tile Bumpmap"
msgstr "Bumpmap kacheln"
#: plug-ins/common/bumpmap.c:944 plug-ins/common/emboss.c:584
#: plug-ins/common/bumpmap.c:1024
msgid "Bump Map:"
msgstr "Bumpmap:"
#: plug-ins/common/bumpmap.c:1043 plug-ins/common/emboss.c:584
msgid "Azimuth:"
msgstr "Längengrad (Azimuth):"
#: plug-ins/common/bumpmap.c:953 plug-ins/common/emboss.c:593
#: plug-ins/common/bumpmap.c:1052 plug-ins/common/emboss.c:593
msgid "Elevation:"
msgstr "Breitengrad (Elevation):"
#: plug-ins/common/bumpmap.c:971 plug-ins/gap/resize.c:197
#: plug-ins/common/bumpmap.c:1072 plug-ins/gap/resize.c:197
msgid "X Offset:"
msgstr "X-Versatz:"
#: plug-ins/common/bumpmap.c:980 plug-ins/gap/resize.c:214
#: plug-ins/common/bumpmap.c:1082 plug-ins/gap/resize.c:214
msgid "Y Offset:"
msgstr "Y-Versatz:"
#: plug-ins/common/bumpmap.c:989
#: plug-ins/common/bumpmap.c:1092
msgid "Waterlevel:"
msgstr "Wasserhöhe:"
@ -2521,7 +2526,7 @@ msgid "Colorify"
msgstr "Einfärben"
#: plug-ins/common/colorify.c:344 plug-ins/common/colortoalpha.c:434
#: plug-ins/common/ps.c:2642 plug-ins/common/xpm.c:433
#: plug-ins/common/ps.c:2642 plug-ins/common/xpm.c:440
#: plug-ins/gap/gap_mov_dialog.c:251 plug-ins/gimpressionist/color.c:51
#: plug-ins/gimpressionist/color.c:56 plug-ins/imagemap/imap_menu.c:325
#: plug-ins/print/gimp_main_window.c:425
@ -5009,19 +5014,19 @@ msgstr ""
"%s\n"
"PNG fehler. Datei korrupt?"
#: plug-ins/common/png.c:998
#: plug-ins/common/png.c:1015
msgid "Save as PNG"
msgstr "Als PNG sichern"
#: plug-ins/common/png.c:1027
#: plug-ins/common/png.c:1044
msgid "Interlacing (Adam7)"
msgstr "Interlacing (Adam7)"
#: plug-ins/common/png.c:1036
#: plug-ins/common/png.c:1053
msgid "Skip Ancillary Chunks"
msgstr "Untergeordnete Blöcke überspringen"
#: plug-ins/common/png.c:1053
#: plug-ins/common/png.c:1070
msgid "Compression Level:"
msgstr "Kompressionsgrad:"
@ -6876,11 +6881,11 @@ msgstr "Hot Spot Koordinaten schreiben"
msgid "Hot Spot X:"
msgstr "Hot Spot X:"
#: plug-ins/common/xpm.c:796
#: plug-ins/common/xpm.c:810
msgid "Save as XPM"
msgstr "Als XPM sichern"
#: plug-ins/common/xpm.c:826
#: plug-ins/common/xpm.c:840
msgid "Alpha Threshold:"
msgstr "Alpha-Schwellwert:"
@ -12102,7 +12107,7 @@ msgstr "Ausgew
msgid "Constructing maze using Prim's Algorithm..."
msgstr "Erstelle Labyrinth mit dem Prim'schen Algorithmus..."
#: plug-ins/maze/algorithms.c:454
#: plug-ins/maze/algorithms.c:458
msgid "Constructing tileable maze using Prim's Algorithm..."
msgstr "Erstelle nahtloses Labyrinth mit dem Prim'schen Algorithmus..."

6
po/ChangeLog
View File

@ -1,7 +1,7 @@
2000-04-14 Kjartan Maraas <kmaraas@online.no>
2000-04-16 Sven Neumann <sven@gimp.org>
* de.po: updated german translation
* no.po: Updated Norwegian translation.
2000-04-13 Yuri Syrota <rasta@renome.rovno.ua>
* uk.po: Updated translation.

1425
po/de.po
View File

File diff suppressed because it is too large Load Diff