graphics/gimp
graphics/gimp
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp synced 2024-10-19 14:23:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

merged the table attach helper functions into one function.

Browse source 
2000-02-01  Michael Natterer  <mitch@gimp.org>

	* libgimp/gimpwidgets.[ch]: merged the table attach helper
	functions into one function.

	* app/*
	* plug-ins/*: changed the calls to gimp_table_attach_aligned()
	accordingly. Did minimal ui updates (spacing and stuff) in some
	files.
This commit is contained in:
Michael Natterer 2000-01-31 03:13:02 +00:00 committed by Michael Natterer
parent 734d4c42b0
commit 03015f85d7
61 changed files with 537 additions and 667 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2000-02-01 Michael Natterer <mitch@gimp.org>
* libgimp/gimpwidgets.[ch]: merged the table attach helper
functions into one function.
* app/*
* plug-ins/*: changed the calls to gimp_table_attach_aligned()
accordingly. Did minimal ui updates (spacing and stuff) in some
files.
Mon Jan 31 23:24:44 CET 2000 Marc Lehmann <pcg@goof.com>
* MapObject/mapobject_main.c: add missing N_.

8
app/airbrush.c
View file

@ -137,9 +137,9 @@ airbrush_options_new (void)
gtk_signal_connect (GTK_OBJECT (options->rate_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->rate);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Rate:"), 1.0, 1.0,
scale, FALSE);
scale, 1, FALSE);
/* the pressure scale */
options->pressure_w =
@ -150,9 +150,9 @@ airbrush_options_new (void)
gtk_signal_connect (GTK_OBJECT (options->pressure_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->pressure);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Pressure:"), 1.0, 1.0,
scale, FALSE);
scale, 1, FALSE);
gtk_widget_show (table);

24
app/blend.c
View file

@ -330,9 +330,9 @@ blend_options_new ()
scale = gtk_hscale_new (GTK_ADJUSTMENT (options->offset_w));
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Offset:"), 1.0, 1.0,
scale, FALSE);
scale, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (options->offset_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->offset);
@ -341,25 +341,25 @@ blend_options_new ()
options->blend_mode_w = gtk_option_menu_new ();
menu = build_menu (blend_option_items, NULL);
gtk_option_menu_set_menu (GTK_OPTION_MENU (options->blend_mode_w), menu);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Blend:"), 1.0, 0.5,
options->blend_mode_w, TRUE);
options->blend_mode_w, 1, TRUE);
/* the gradient type menu */
options->gradient_type_w = gtk_option_menu_new ();
menu = build_menu (gradient_option_items, NULL);
gtk_option_menu_set_menu (GTK_OPTION_MENU (options->gradient_type_w), menu);
gimp_table_attach_aligned (GTK_TABLE (table), 2,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Gradient:"), 1.0, 0.5,
options->gradient_type_w, TRUE);
options->gradient_type_w, 1, TRUE);
/* the repeat option */
options->repeat_w = gtk_option_menu_new ();
menu = build_menu (repeat_option_items, NULL);
gtk_option_menu_set_menu (GTK_OPTION_MENU (options->repeat_w), menu);
gimp_table_attach_aligned (GTK_TABLE (table), 3,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 3,
_("Repeat:"), 1.0, 0.5,
options->repeat_w, TRUE);
options->repeat_w, 1, TRUE);
/* show the table */
gtk_widget_show (table);
@ -404,9 +404,9 @@ blend_options_new ()
scale = gtk_hscale_new (GTK_ADJUSTMENT (options->max_depth_w));
gtk_scale_set_digits (GTK_SCALE (scale), 0);
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Max Depth:"), 1.0, 1.0,
scale, FALSE);
scale, 1, FALSE);
gtk_signal_connect (GTK_OBJECT(options->max_depth_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&options->max_depth);
@ -417,9 +417,9 @@ blend_options_new ()
scale = gtk_hscale_new (GTK_ADJUSTMENT (options->threshold_w));
gtk_scale_set_digits (GTK_SCALE (scale), 2);
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Threshold:"), 1.0, 1.0,
scale, FALSE);
scale, 1, FALSE);
gtk_signal_connect (GTK_OBJECT(options->threshold_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->threshold);

16
app/brush_edit.c
View file

@ -271,9 +271,9 @@ brush_edit_generated_new (void)
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (begw->radius_data), "value_changed",
(GtkSignalFunc) update_brush_callback, begw);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Radius:"), 1.0, 1.0,
slider, FALSE);
slider, 1, FALSE);
/* brush hardness scale */
begw->hardness_data =
@ -283,9 +283,9 @@ brush_edit_generated_new (void)
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (begw->hardness_data), "value_changed",
(GtkSignalFunc) update_brush_callback, begw);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Hardness:"), 1.0, 1.0,
slider, FALSE);
slider, 1, FALSE);
/* brush aspect ratio scale */
begw->aspect_ratio_data =
@ -295,9 +295,9 @@ brush_edit_generated_new (void)
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (begw->aspect_ratio_data), "value_changed",
(GtkSignalFunc) update_brush_callback, begw);
gimp_table_attach_aligned (GTK_TABLE (table), 3,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 3,
_("Aspect Ratio:"), 1.0, 1.0,
slider, FALSE);
slider, 1, FALSE);
/* brush angle scale */
begw->angle_data =
@ -307,9 +307,9 @@ brush_edit_generated_new (void)
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (begw->angle_data), "value_changed",
(GtkSignalFunc) update_brush_callback, begw);
gimp_table_attach_aligned (GTK_TABLE (table), 2,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Angle:"), 1.0, 1.0,
slider, FALSE);
slider, 1, FALSE);
gtk_table_set_row_spacings (GTK_TABLE (table), 3);
gtk_table_set_col_spacing (GTK_TABLE (table), 0, 4);

12
app/brush_select.c
View file

@ -442,9 +442,9 @@ brush_select_new (gchar *title,
gtk_signal_connect (GTK_OBJECT (bsp->opacity_data), "value_changed",
GTK_SIGNAL_FUNC (opacity_scale_update),
bsp);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Opacity:"), 1.0, 1.0,
slider, FALSE);
slider, 1, FALSE);
/* Create the paint mode option menu */
menu = paint_mode_menu_new (paint_mode_menu_callback, (gpointer) bsp);
@ -452,9 +452,9 @@ brush_select_new (gchar *title,
gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu), menu);
gtk_option_menu_set_history (GTK_OPTION_MENU (option_menu),
gimp_context_get_paint_mode (bsp->context));
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Mode:"), 1.0, 0.5,
option_menu, TRUE);
option_menu, 1, TRUE);
gtk_widget_show (table);
gtk_widget_show (bsp->paint_options_box);
@ -506,9 +506,9 @@ brush_select_new (gchar *title,
gtk_signal_connect (GTK_OBJECT (bsp->spacing_data), "value_changed",
GTK_SIGNAL_FUNC (spacing_scale_update),
bsp);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Spacing:"), 1.0, 1.0,
slider, FALSE);
slider, 1, FALSE);
gtk_widget_show (table);

24
app/core/gimpdrawable-blend.c
View file

@ -330,9 +330,9 @@ blend_options_new ()
scale = gtk_hscale_new (GTK_ADJUSTMENT (options->offset_w));
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Offset:"), 1.0, 1.0,
scale, FALSE);
scale, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (options->offset_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->offset);
@ -341,25 +341,25 @@ blend_options_new ()
options->blend_mode_w = gtk_option_menu_new ();
menu = build_menu (blend_option_items, NULL);
gtk_option_menu_set_menu (GTK_OPTION_MENU (options->blend_mode_w), menu);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Blend:"), 1.0, 0.5,
options->blend_mode_w, TRUE);
options->blend_mode_w, 1, TRUE);
/* the gradient type menu */
options->gradient_type_w = gtk_option_menu_new ();
menu = build_menu (gradient_option_items, NULL);
gtk_option_menu_set_menu (GTK_OPTION_MENU (options->gradient_type_w), menu);
gimp_table_attach_aligned (GTK_TABLE (table), 2,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Gradient:"), 1.0, 0.5,
options->gradient_type_w, TRUE);
options->gradient_type_w, 1, TRUE);
/* the repeat option */
options->repeat_w = gtk_option_menu_new ();
menu = build_menu (repeat_option_items, NULL);
gtk_option_menu_set_menu (GTK_OPTION_MENU (options->repeat_w), menu);
gimp_table_attach_aligned (GTK_TABLE (table), 3,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 3,
_("Repeat:"), 1.0, 0.5,
options->repeat_w, TRUE);
options->repeat_w, 1, TRUE);
/* show the table */
gtk_widget_show (table);
@ -404,9 +404,9 @@ blend_options_new ()
scale = gtk_hscale_new (GTK_ADJUSTMENT (options->max_depth_w));
gtk_scale_set_digits (GTK_SCALE (scale), 0);
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Max Depth:"), 1.0, 1.0,
scale, FALSE);
scale, 1, FALSE);
gtk_signal_connect (GTK_OBJECT(options->max_depth_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&options->max_depth);
@ -417,9 +417,9 @@ blend_options_new ()
scale = gtk_hscale_new (GTK_ADJUSTMENT (options->threshold_w));
gtk_scale_set_digits (GTK_SCALE (scale), 2);
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Threshold:"), 1.0, 1.0,
scale, FALSE);
scale, 1, FALSE);
gtk_signal_connect (GTK_OBJECT(options->threshold_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->threshold);

20
app/core/gimptooloptions.c
View file

@ -302,9 +302,9 @@ selection_options_init (SelectionOptions *options,
gtk_signal_connect (GTK_OBJECT (options->fixed_width_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->fixed_width);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Width:"), 1.0, 0.5,
width_spinbutton, FALSE);
width_spinbutton, 1, FALSE);
options->fixed_height_w =
gtk_adjustment_new (options->fixed_height_d, 1e-5, 32767.0,
@ -318,9 +318,9 @@ selection_options_init (SelectionOptions *options,
gtk_signal_connect (GTK_OBJECT (options->fixed_height_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->fixed_height);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Height:"), 1.0, 0.5,
height_spinbutton, FALSE);
height_spinbutton, 1, FALSE);
options->fixed_unit_w =
gimp_unit_menu_new ("%a", options->fixed_unit_d, TRUE, TRUE, TRUE);
@ -331,9 +331,9 @@ selection_options_init (SelectionOptions *options,
width_spinbutton);
gtk_object_set_data (GTK_OBJECT (width_spinbutton), "set_digits",
height_spinbutton);
gimp_table_attach_aligned (GTK_TABLE (table), 2,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Unit:"), 1.0, 0.5,
options->fixed_unit_w, FALSE);
options->fixed_unit_w, 1, FALSE);
gtk_widget_show (table);
}
@ -474,9 +474,9 @@ paint_options_init (PaintOptions *options,
gtk_signal_connect (GTK_OBJECT (options->opacity_w), "value_changed",
GTK_SIGNAL_FUNC (tool_options_opacity_adjustment_update),
tool_context);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Opacity:"), 1.0, 1.0,
scale, FALSE);
scale, 1, FALSE);
/* the paint mode menu */
switch (tool_type)
@ -497,9 +497,9 @@ paint_options_init (PaintOptions *options,
gtk_option_menu_set_menu (GTK_OPTION_MENU (options->paint_mode_w), menu);
gtk_option_menu_set_history (GTK_OPTION_MENU (options->paint_mode_w),
gimp_context_get_paint_mode (tool_context));
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Mode:"), 1.0, 0.5,
options->paint_mode_w, TRUE);
options->paint_mode_w, 1, TRUE);
/* eek */
gtk_object_set_data (GTK_OBJECT (options->paint_mode_w), "tool_context",

75
app/dialogs/preferences-dialog.c
View file

@ -1635,9 +1635,9 @@ file_pref_cmd_callback (GtkWidget *widget,
_("Grayscale"), (gpointer) GRAY, NULL,
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Default Image Type:"), 1.0, 0.5,
optionmenu, TRUE);
optionmenu, 1, TRUE);
/* The maximum size of a new image */
mem_size_unit = 1;
@ -1679,8 +1679,9 @@ file_pref_cmd_callback (GtkWidget *widget,
NULL);
gtk_box_pack_start (GTK_BOX (hbox), optionmenu, FALSE, FALSE, 0);
gtk_widget_show (optionmenu);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
_("Maximum Image Size:"), 1.0, 0.5, hbox, TRUE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Maximum Image Size:"), 1.0, 0.5,
hbox, 1, TRUE);
/* Display page */
@ -1722,9 +1723,9 @@ file_pref_cmd_callback (GtkWidget *widget,
_("Black Only"), (gpointer) BLACK_ONLY, NULL,
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Transparency Type:"), 1.0, 0.5,
optionmenu, TRUE);
optionmenu, 1, TRUE);
optionmenu =
gimp_option_menu_new2 (FALSE, file_prefs_toggle_callback,
@ -1735,8 +1736,9 @@ file_pref_cmd_callback (GtkWidget *widget,
_("Large"), (gpointer) LARGE_CHECKS, NULL,
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
_("Check Size:"), 1.0, 0.5, optionmenu, TRUE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Check Size:"), 1.0, 0.5,
optionmenu, 1, TRUE);
vbox2 = file_prefs_frame_new (_("8-Bit Displays"), GTK_BOX (vbox));
@ -1808,8 +1810,9 @@ file_pref_cmd_callback (GtkWidget *widget,
_("Huge"), (gpointer) 128, NULL,
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
_("Preview Size:"), 1.0, 0.5, optionmenu, TRUE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Preview Size:"), 1.0, 0.5,
optionmenu, 1, TRUE);
optionmenu =
gimp_option_menu_new2 (FALSE, file_prefs_nav_preview_size_callback,
@ -1820,8 +1823,9 @@ file_pref_cmd_callback (GtkWidget *widget,
_("Large"), (gpointer) 112, NULL,
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
_("Nav Preview Size:"), 1.0, 0.5, optionmenu, TRUE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Nav Preview Size:"), 1.0, 0.5,
optionmenu, 1, TRUE);
spinbutton =
gimp_spin_button_new (&adjustment, edit_last_opened_size,
@ -1829,9 +1833,9 @@ file_pref_cmd_callback (GtkWidget *widget,
gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&edit_last_opened_size);
gimp_table_attach_aligned (GTK_TABLE (table), 3,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 3,
_("Recent Documents List Size:"), 1.0, 0.5,
spinbutton, TRUE);
spinbutton, 1, TRUE);
/* Indicators */
vbox2 = file_prefs_frame_new (_("Toolbox"), GTK_BOX (vbox));
@ -1915,9 +1919,9 @@ file_pref_cmd_callback (GtkWidget *widget,
_("Netscape"), (gpointer) HELP_BROWSER_NETSCAPE, NULL,
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Help Browser to Use:"), 1.0, 0.5,
optionmenu, TRUE);
optionmenu, 1, TRUE);
/* Interface / Image Windows */
vbox = file_prefs_notebook_append_page (GTK_NOTEBOOK (notebook),
@ -1983,9 +1987,9 @@ file_pref_cmd_callback (GtkWidget *widget,
gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&marching_speed);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Marching Ants Speed:"), 1.0, 0.5,
spinbutton, TRUE);
spinbutton, 1, TRUE);
/* The title format string */
combo = gtk_combo_new ();
@ -2023,8 +2027,9 @@ file_pref_cmd_callback (GtkWidget *widget,
GTK_SIGNAL_FUNC (file_prefs_string_callback),
&image_title_format);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
_("Image Title Format:"), 1.0, 0.5, combo, FALSE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Image Title Format:"), 1.0, 0.5,
combo, 1, FALSE);
/* End of the title format string */
vbox2 = file_prefs_frame_new (_("Pointer Movement Feedback"), GTK_BOX (vbox));
@ -2118,8 +2123,9 @@ file_pref_cmd_callback (GtkWidget *widget,
gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&levels_of_undo);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
_("Levels of Undo:"), 1.0, 0.5, spinbutton, TRUE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Levels of Undo:"), 1.0, 0.5,
spinbutton, 1, TRUE);
/* The tile cache size */
mem_size_unit = 1;
@ -2161,8 +2167,9 @@ file_pref_cmd_callback (GtkWidget *widget,
NULL);
gtk_box_pack_start (GTK_BOX (hbox), optionmenu, FALSE, FALSE, 0);
gtk_widget_show (optionmenu);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
_("Tile Cache Size:"), 1.0, 0.5, hbox, TRUE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Tile Cache Size:"), 1.0, 0.5,
hbox, 1, TRUE);
#ifdef ENABLE_MP
spinbutton =
@ -2171,9 +2178,9 @@ file_pref_cmd_callback (GtkWidget *widget,
gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&edit_num_processors);
gimp_table_attach_aligned (GTK_TABLE (table), 2,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Number of Processors to Use:"), 1.0, 0.5,
spinbutton, TRUE);
spinbutton, 1, TRUE);
#endif /* ENABLE_MP */
frame = gtk_frame_new (_("Scaling"));
@ -2202,9 +2209,9 @@ file_pref_cmd_callback (GtkWidget *widget,
(gpointer) CUBIC_INTERPOLATION, NULL,
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Interpolation Type:"), 1.0, 0.5,
optionmenu, TRUE);
optionmenu, 1, TRUE);
vbox2 = file_prefs_frame_new (_("File Saving"), GTK_BOX (vbox));
@ -2227,9 +2234,9 @@ file_pref_cmd_callback (GtkWidget *widget,
_("Never"), (gpointer) 0, NULL,
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Try to Write a Thumbnail File:"), 1.0, 0.5,
optionmenu, TRUE);
optionmenu, 1, TRUE);
optionmenu =
gimp_option_menu_new2 (FALSE, file_prefs_toggle_callback,
@ -2239,9 +2246,9 @@ file_pref_cmd_callback (GtkWidget *widget,
_("Always"), (gpointer) 0, NULL,
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("\"File > Save\" Saves the Image:"), 1.0, 0.5,
optionmenu, TRUE);
optionmenu, 1, TRUE);
/* Session Management */
@ -2432,9 +2439,9 @@ file_pref_cmd_callback (GtkWidget *widget,
gtk_signal_connect (GTK_OBJECT (fileselection), "filename_changed",
GTK_SIGNAL_FUNC (file_prefs_filename_callback),
dirs[i].mdir);
gimp_table_attach_aligned (GTK_TABLE (table), i,
gimp_table_attach_aligned (GTK_TABLE (table), 0, i,
gettext(dirs[i].label), 1.0, 0.5,
fileselection, FALSE);
fileselection, 1, FALSE);
}
}

11
app/gimpui.h
View file

@ -96,15 +96,4 @@ GtkWidget * gimp_message_box (gchar *message,
GtkCallback callback,
gpointer data);
/* helper functions */
/* add aligned label & widget to a two-column table */
void gimp_table_attach_aligned (GtkTable *table,
gint row,
gchar *text,
gfloat xalign,
gfloat yalign,
GtkWidget *widget,
gboolean left_adjust);
#endif /* __GIMP_UI_H__ */

16
app/gui/brush-editor.c
View file

@ -271,9 +271,9 @@ brush_edit_generated_new (void)
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (begw->radius_data), "value_changed",
(GtkSignalFunc) update_brush_callback, begw);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Radius:"), 1.0, 1.0,
slider, FALSE);
slider, 1, FALSE);
/* brush hardness scale */
begw->hardness_data =
@ -283,9 +283,9 @@ brush_edit_generated_new (void)
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (begw->hardness_data), "value_changed",
(GtkSignalFunc) update_brush_callback, begw);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Hardness:"), 1.0, 1.0,
slider, FALSE);
slider, 1, FALSE);
/* brush aspect ratio scale */
begw->aspect_ratio_data =
@ -295,9 +295,9 @@ brush_edit_generated_new (void)
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (begw->aspect_ratio_data), "value_changed",
(GtkSignalFunc) update_brush_callback, begw);
gimp_table_attach_aligned (GTK_TABLE (table), 3,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 3,
_("Aspect Ratio:"), 1.0, 1.0,
slider, FALSE);
slider, 1, FALSE);
/* brush angle scale */
begw->angle_data =
@ -307,9 +307,9 @@ brush_edit_generated_new (void)
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (begw->angle_data), "value_changed",
(GtkSignalFunc) update_brush_callback, begw);
gimp_table_attach_aligned (GTK_TABLE (table), 2,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Angle:"), 1.0, 1.0,
slider, FALSE);
slider, 1, FALSE);
gtk_table_set_row_spacings (GTK_TABLE (table), 3);
gtk_table_set_col_spacing (GTK_TABLE (table), 0, 4);

12
app/gui/brush-select.c
View file

@ -442,9 +442,9 @@ brush_select_new (gchar *title,
gtk_signal_connect (GTK_OBJECT (bsp->opacity_data), "value_changed",
GTK_SIGNAL_FUNC (opacity_scale_update),
bsp);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Opacity:"), 1.0, 1.0,
slider, FALSE);
slider, 1, FALSE);
/* Create the paint mode option menu */
menu = paint_mode_menu_new (paint_mode_menu_callback, (gpointer) bsp);
@ -452,9 +452,9 @@ brush_select_new (gchar *title,
gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu), menu);
gtk_option_menu_set_history (GTK_OPTION_MENU (option_menu),
gimp_context_get_paint_mode (bsp->context));
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Mode:"), 1.0, 0.5,
option_menu, TRUE);
option_menu, 1, TRUE);
gtk_widget_show (table);
gtk_widget_show (bsp->paint_options_box);
@ -506,9 +506,9 @@ brush_select_new (gchar *title,
gtk_signal_connect (GTK_OBJECT (bsp->spacing_data), "value_changed",
GTK_SIGNAL_FUNC (spacing_scale_update),
bsp);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Spacing:"), 1.0, 1.0,
slider, FALSE);
slider, 1, FALSE);
gtk_widget_show (table);

40
app/gui/palette-select.c
View file

@ -37,13 +37,14 @@ PaletteSelect *
palette_select_new (gchar *title,
gchar *initial_palette)
{
PaletteSelect *psp;
PaletteEntries *p_entries = NULL;
PaletteSelect *psp;
GSList *list;
GtkWidget *vbox;
GtkWidget *hbox;
GtkWidget *scrolled_win;
PaletteEntries *p_entries = NULL;
gint select_pos;
gchar *titles[3];
gint select_pos;
palette_select_palette_init ();
@ -69,32 +70,29 @@ palette_select_new (gchar *title,
gtk_container_set_border_width (GTK_CONTAINER (vbox), 1);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (psp->shell)->vbox), vbox);
/* clist preview of gradients */
scrolled_win = gtk_scrolled_window_new (NULL, NULL);
psp->clist = gtk_clist_new (3);
gtk_clist_set_shadow_type (GTK_CLIST (psp->clist), GTK_SHADOW_IN);
gtk_clist_set_row_height (GTK_CLIST (psp->clist), SM_PREVIEW_HEIGHT + 2);
gtk_widget_set_usize (psp->clist, 203, 200);
gtk_clist_set_column_title (GTK_CLIST (psp->clist), 0, _("Palette"));
gtk_clist_set_column_title (GTK_CLIST (psp->clist), 1, _("Ncols"));
gtk_clist_set_column_title (GTK_CLIST (psp->clist), 2, _("Name"));
gtk_clist_column_titles_show (GTK_CLIST(psp->clist));
gtk_clist_set_column_width (GTK_CLIST (psp->clist), 0, SM_PREVIEW_WIDTH + 2);
hbox = gtk_hbox_new (FALSE, 8);
gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (hbox), scrolled_win, TRUE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (scrolled_win), psp->clist);
/* clist preview of gradients */
scrolled_win = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_ALWAYS);
gtk_box_pack_start (GTK_BOX (hbox), scrolled_win, TRUE, TRUE, 0);
gtk_widget_show (scrolled_win);
titles[0] = _("Palette");
titles[1] = _("Ncols");
titles[2] = _("Name");
psp->clist = gtk_clist_new_with_titles (3, titles);
gtk_clist_set_shadow_type (GTK_CLIST (psp->clist), GTK_SHADOW_IN);
gtk_clist_set_row_height (GTK_CLIST (psp->clist), SM_PREVIEW_HEIGHT + 2);
gtk_clist_set_use_drag_icons (GTK_CLIST (psp->clist), FALSE);
gtk_clist_column_titles_passive (GTK_CLIST (psp->clist));
gtk_widget_set_usize (psp->clist, 203, 200);
gtk_clist_set_column_width (GTK_CLIST (psp->clist), 0, SM_PREVIEW_WIDTH + 2);
gtk_container_add (GTK_CONTAINER (scrolled_win), psp->clist);
gtk_widget_show (psp->clist);
select_pos = -1;

75
app/gui/preferences-dialog.c
View file

@ -1635,9 +1635,9 @@ file_pref_cmd_callback (GtkWidget *widget,
_("Grayscale"), (gpointer) GRAY, NULL,
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Default Image Type:"), 1.0, 0.5,
optionmenu, TRUE);
optionmenu, 1, TRUE);
/* The maximum size of a new image */
mem_size_unit = 1;
@ -1679,8 +1679,9 @@ file_pref_cmd_callback (GtkWidget *widget,
NULL);
gtk_box_pack_start (GTK_BOX (hbox), optionmenu, FALSE, FALSE, 0);
gtk_widget_show (optionmenu);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
_("Maximum Image Size:"), 1.0, 0.5, hbox, TRUE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Maximum Image Size:"), 1.0, 0.5,
hbox, 1, TRUE);
/* Display page */
@ -1722,9 +1723,9 @@ file_pref_cmd_callback (GtkWidget *widget,
_("Black Only"), (gpointer) BLACK_ONLY, NULL,
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Transparency Type:"), 1.0, 0.5,
optionmenu, TRUE);
optionmenu, 1, TRUE);
optionmenu =
gimp_option_menu_new2 (FALSE, file_prefs_toggle_callback,
@ -1735,8 +1736,9 @@ file_pref_cmd_callback (GtkWidget *widget,
_("Large"), (gpointer) LARGE_CHECKS, NULL,
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
_("Check Size:"), 1.0, 0.5, optionmenu, TRUE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Check Size:"), 1.0, 0.5,
optionmenu, 1, TRUE);
vbox2 = file_prefs_frame_new (_("8-Bit Displays"), GTK_BOX (vbox));
@ -1808,8 +1810,9 @@ file_pref_cmd_callback (GtkWidget *widget,
_("Huge"), (gpointer) 128, NULL,
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
_("Preview Size:"), 1.0, 0.5, optionmenu, TRUE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Preview Size:"), 1.0, 0.5,
optionmenu, 1, TRUE);
optionmenu =
gimp_option_menu_new2 (FALSE, file_prefs_nav_preview_size_callback,
@ -1820,8 +1823,9 @@ file_pref_cmd_callback (GtkWidget *widget,
_("Large"), (gpointer) 112, NULL,
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
_("Nav Preview Size:"), 1.0, 0.5, optionmenu, TRUE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Nav Preview Size:"), 1.0, 0.5,
optionmenu, 1, TRUE);
spinbutton =
gimp_spin_button_new (&adjustment, edit_last_opened_size,
@ -1829,9 +1833,9 @@ file_pref_cmd_callback (GtkWidget *widget,
gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&edit_last_opened_size);
gimp_table_attach_aligned (GTK_TABLE (table), 3,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 3,
_("Recent Documents List Size:"), 1.0, 0.5,
spinbutton, TRUE);
spinbutton, 1, TRUE);
/* Indicators */
vbox2 = file_prefs_frame_new (_("Toolbox"), GTK_BOX (vbox));
@ -1915,9 +1919,9 @@ file_pref_cmd_callback (GtkWidget *widget,
_("Netscape"), (gpointer) HELP_BROWSER_NETSCAPE, NULL,
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Help Browser to Use:"), 1.0, 0.5,
optionmenu, TRUE);
optionmenu, 1, TRUE);
/* Interface / Image Windows */
vbox = file_prefs_notebook_append_page (GTK_NOTEBOOK (notebook),
@ -1983,9 +1987,9 @@ file_pref_cmd_callback (GtkWidget *widget,
gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&marching_speed);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Marching Ants Speed:"), 1.0, 0.5,
spinbutton, TRUE);
spinbutton, 1, TRUE);
/* The title format string */
combo = gtk_combo_new ();
@ -2023,8 +2027,9 @@ file_pref_cmd_callback (GtkWidget *widget,
GTK_SIGNAL_FUNC (file_prefs_string_callback),
&image_title_format);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
_("Image Title Format:"), 1.0, 0.5, combo, FALSE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Image Title Format:"), 1.0, 0.5,
combo, 1, FALSE);
/* End of the title format string */
vbox2 = file_prefs_frame_new (_("Pointer Movement Feedback"), GTK_BOX (vbox));
@ -2118,8 +2123,9 @@ file_pref_cmd_callback (GtkWidget *widget,
gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&levels_of_undo);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
_("Levels of Undo:"), 1.0, 0.5, spinbutton, TRUE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Levels of Undo:"), 1.0, 0.5,
spinbutton, 1, TRUE);
/* The tile cache size */
mem_size_unit = 1;
@ -2161,8 +2167,9 @@ file_pref_cmd_callback (GtkWidget *widget,
NULL);
gtk_box_pack_start (GTK_BOX (hbox), optionmenu, FALSE, FALSE, 0);
gtk_widget_show (optionmenu);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
_("Tile Cache Size:"), 1.0, 0.5, hbox, TRUE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Tile Cache Size:"), 1.0, 0.5,
hbox, 1, TRUE);
#ifdef ENABLE_MP
spinbutton =
@ -2171,9 +2178,9 @@ file_pref_cmd_callback (GtkWidget *widget,
gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&edit_num_processors);
gimp_table_attach_aligned (GTK_TABLE (table), 2,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Number of Processors to Use:"), 1.0, 0.5,
spinbutton, TRUE);
spinbutton, 1, TRUE);
#endif /* ENABLE_MP */
frame = gtk_frame_new (_("Scaling"));
@ -2202,9 +2209,9 @@ file_pref_cmd_callback (GtkWidget *widget,
(gpointer) CUBIC_INTERPOLATION, NULL,
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Interpolation Type:"), 1.0, 0.5,
optionmenu, TRUE);
optionmenu, 1, TRUE);
vbox2 = file_prefs_frame_new (_("File Saving"), GTK_BOX (vbox));
@ -2227,9 +2234,9 @@ file_pref_cmd_callback (GtkWidget *widget,
_("Never"), (gpointer) 0, NULL,
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Try to Write a Thumbnail File:"), 1.0, 0.5,
optionmenu, TRUE);
optionmenu, 1, TRUE);
optionmenu =
gimp_option_menu_new2 (FALSE, file_prefs_toggle_callback,
@ -2239,9 +2246,9 @@ file_pref_cmd_callback (GtkWidget *widget,
_("Always"), (gpointer) 0, NULL,
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("\"File > Save\" Saves the Image:"), 1.0, 0.5,
optionmenu, TRUE);
optionmenu, 1, TRUE);
/* Session Management */
@ -2432,9 +2439,9 @@ file_pref_cmd_callback (GtkWidget *widget,
gtk_signal_connect (GTK_OBJECT (fileselection), "filename_changed",
GTK_SIGNAL_FUNC (file_prefs_filename_callback),
dirs[i].mdir);
gimp_table_attach_aligned (GTK_TABLE (table), i,
gimp_table_attach_aligned (GTK_TABLE (table), 0, i,
gettext(dirs[i].label), 1.0, 0.5,
fileselection, FALSE);
fileselection, 1, FALSE);
}
}

8
app/paint/gimpairbrush.c
View file

@ -137,9 +137,9 @@ airbrush_options_new (void)
gtk_signal_connect (GTK_OBJECT (options->rate_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->rate);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Rate:"), 1.0, 1.0,
scale, FALSE);
scale, 1, FALSE);
/* the pressure scale */
options->pressure_w =
@ -150,9 +150,9 @@ airbrush_options_new (void)
gtk_signal_connect (GTK_OBJECT (options->pressure_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->pressure);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Pressure:"), 1.0, 1.0,
scale, FALSE);
scale, 1, FALSE);
gtk_widget_show (table);

40
app/palette_select.c
View file

@ -37,13 +37,14 @@ PaletteSelect *
palette_select_new (gchar *title,
gchar *initial_palette)
{
PaletteSelect *psp;
PaletteEntries *p_entries = NULL;
PaletteSelect *psp;
GSList *list;
GtkWidget *vbox;
GtkWidget *hbox;
GtkWidget *scrolled_win;
PaletteEntries *p_entries = NULL;
gint select_pos;
gchar *titles[3];
gint select_pos;
palette_select_palette_init ();
@ -69,32 +70,29 @@ palette_select_new (gchar *title,
gtk_container_set_border_width (GTK_CONTAINER (vbox), 1);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (psp->shell)->vbox), vbox);
/* clist preview of gradients */
scrolled_win = gtk_scrolled_window_new (NULL, NULL);
psp->clist = gtk_clist_new (3);
gtk_clist_set_shadow_type (GTK_CLIST (psp->clist), GTK_SHADOW_IN);
gtk_clist_set_row_height (GTK_CLIST (psp->clist), SM_PREVIEW_HEIGHT + 2);
gtk_widget_set_usize (psp->clist, 203, 200);
gtk_clist_set_column_title (GTK_CLIST (psp->clist), 0, _("Palette"));
gtk_clist_set_column_title (GTK_CLIST (psp->clist), 1, _("Ncols"));
gtk_clist_set_column_title (GTK_CLIST (psp->clist), 2, _("Name"));
gtk_clist_column_titles_show (GTK_CLIST(psp->clist));
gtk_clist_set_column_width (GTK_CLIST (psp->clist), 0, SM_PREVIEW_WIDTH + 2);
hbox = gtk_hbox_new (FALSE, 8);
gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (hbox), scrolled_win, TRUE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (scrolled_win), psp->clist);
/* clist preview of gradients */
scrolled_win = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_ALWAYS);
gtk_box_pack_start (GTK_BOX (hbox), scrolled_win, TRUE, TRUE, 0);
gtk_widget_show (scrolled_win);
titles[0] = _("Palette");
titles[1] = _("Ncols");
titles[2] = _("Name");
psp->clist = gtk_clist_new_with_titles (3, titles);
gtk_clist_set_shadow_type (GTK_CLIST (psp->clist), GTK_SHADOW_IN);
gtk_clist_set_row_height (GTK_CLIST (psp->clist), SM_PREVIEW_HEIGHT + 2);
gtk_clist_set_use_drag_icons (GTK_CLIST (psp->clist), FALSE);
gtk_clist_column_titles_passive (GTK_CLIST (psp->clist));
gtk_widget_set_usize (psp->clist, 203, 200);
gtk_clist_set_column_width (GTK_CLIST (psp->clist), 0, SM_PREVIEW_WIDTH + 2);
gtk_container_add (GTK_CONTAINER (scrolled_win), psp->clist);
gtk_widget_show (psp->clist);
select_pos = -1;

75
app/preferences_dialog.c
View file

@ -1635,9 +1635,9 @@ file_pref_cmd_callback (GtkWidget *widget,
_("Grayscale"), (gpointer) GRAY, NULL,
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Default Image Type:"), 1.0, 0.5,
optionmenu, TRUE);
optionmenu, 1, TRUE);
/* The maximum size of a new image */
mem_size_unit = 1;
@ -1679,8 +1679,9 @@ file_pref_cmd_callback (GtkWidget *widget,
NULL);
gtk_box_pack_start (GTK_BOX (hbox), optionmenu, FALSE, FALSE, 0);
gtk_widget_show (optionmenu);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
_("Maximum Image Size:"), 1.0, 0.5, hbox, TRUE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Maximum Image Size:"), 1.0, 0.5,
hbox, 1, TRUE);
/* Display page */
@ -1722,9 +1723,9 @@ file_pref_cmd_callback (GtkWidget *widget,
_("Black Only"), (gpointer) BLACK_ONLY, NULL,
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Transparency Type:"), 1.0, 0.5,
optionmenu, TRUE);
optionmenu, 1, TRUE);
optionmenu =
gimp_option_menu_new2 (FALSE, file_prefs_toggle_callback,
@ -1735,8 +1736,9 @@ file_pref_cmd_callback (GtkWidget *widget,
_("Large"), (gpointer) LARGE_CHECKS, NULL,
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
_("Check Size:"), 1.0, 0.5, optionmenu, TRUE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Check Size:"), 1.0, 0.5,
optionmenu, 1, TRUE);
vbox2 = file_prefs_frame_new (_("8-Bit Displays"), GTK_BOX (vbox));
@ -1808,8 +1810,9 @@ file_pref_cmd_callback (GtkWidget *widget,
_("Huge"), (gpointer) 128, NULL,
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
_("Preview Size:"), 1.0, 0.5, optionmenu, TRUE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Preview Size:"), 1.0, 0.5,
optionmenu, 1, TRUE);
optionmenu =
gimp_option_menu_new2 (FALSE, file_prefs_nav_preview_size_callback,
@ -1820,8 +1823,9 @@ file_pref_cmd_callback (GtkWidget *widget,
_("Large"), (gpointer) 112, NULL,
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
_("Nav Preview Size:"), 1.0, 0.5, optionmenu, TRUE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Nav Preview Size:"), 1.0, 0.5,
optionmenu, 1, TRUE);
spinbutton =
gimp_spin_button_new (&adjustment, edit_last_opened_size,
@ -1829,9 +1833,9 @@ file_pref_cmd_callback (GtkWidget *widget,
gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&edit_last_opened_size);
gimp_table_attach_aligned (GTK_TABLE (table), 3,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 3,
_("Recent Documents List Size:"), 1.0, 0.5,
spinbutton, TRUE);
spinbutton, 1, TRUE);
/* Indicators */
vbox2 = file_prefs_frame_new (_("Toolbox"), GTK_BOX (vbox));
@ -1915,9 +1919,9 @@ file_pref_cmd_callback (GtkWidget *widget,
_("Netscape"), (gpointer) HELP_BROWSER_NETSCAPE, NULL,
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Help Browser to Use:"), 1.0, 0.5,
optionmenu, TRUE);
optionmenu, 1, TRUE);
/* Interface / Image Windows */
vbox = file_prefs_notebook_append_page (GTK_NOTEBOOK (notebook),
@ -1983,9 +1987,9 @@ file_pref_cmd_callback (GtkWidget *widget,
gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&marching_speed);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Marching Ants Speed:"), 1.0, 0.5,
spinbutton, TRUE);
spinbutton, 1, TRUE);
/* The title format string */
combo = gtk_combo_new ();
@ -2023,8 +2027,9 @@ file_pref_cmd_callback (GtkWidget *widget,
GTK_SIGNAL_FUNC (file_prefs_string_callback),
&image_title_format);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
_("Image Title Format:"), 1.0, 0.5, combo, FALSE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Image Title Format:"), 1.0, 0.5,
combo, 1, FALSE);
/* End of the title format string */
vbox2 = file_prefs_frame_new (_("Pointer Movement Feedback"), GTK_BOX (vbox));
@ -2118,8 +2123,9 @@ file_pref_cmd_callback (GtkWidget *widget,
gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&levels_of_undo);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
_("Levels of Undo:"), 1.0, 0.5, spinbutton, TRUE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Levels of Undo:"), 1.0, 0.5,
spinbutton, 1, TRUE);
/* The tile cache size */
mem_size_unit = 1;
@ -2161,8 +2167,9 @@ file_pref_cmd_callback (GtkWidget *widget,
NULL);
gtk_box_pack_start (GTK_BOX (hbox), optionmenu, FALSE, FALSE, 0);
gtk_widget_show (optionmenu);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
_("Tile Cache Size:"), 1.0, 0.5, hbox, TRUE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Tile Cache Size:"), 1.0, 0.5,
hbox, 1, TRUE);
#ifdef ENABLE_MP
spinbutton =
@ -2171,9 +2178,9 @@ file_pref_cmd_callback (GtkWidget *widget,
gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&edit_num_processors);
gimp_table_attach_aligned (GTK_TABLE (table), 2,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Number of Processors to Use:"), 1.0, 0.5,
spinbutton, TRUE);
spinbutton, 1, TRUE);
#endif /* ENABLE_MP */
frame = gtk_frame_new (_("Scaling"));
@ -2202,9 +2209,9 @@ file_pref_cmd_callback (GtkWidget *widget,
(gpointer) CUBIC_INTERPOLATION, NULL,
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Interpolation Type:"), 1.0, 0.5,
optionmenu, TRUE);
optionmenu, 1, TRUE);
vbox2 = file_prefs_frame_new (_("File Saving"), GTK_BOX (vbox));
@ -2227,9 +2234,9 @@ file_pref_cmd_callback (GtkWidget *widget,
_("Never"), (gpointer) 0, NULL,
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Try to Write a Thumbnail File:"), 1.0, 0.5,
optionmenu, TRUE);
optionmenu, 1, TRUE);
optionmenu =
gimp_option_menu_new2 (FALSE, file_prefs_toggle_callback,
@ -2239,9 +2246,9 @@ file_pref_cmd_callback (GtkWidget *widget,
_("Always"), (gpointer) 0, NULL,
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("\"File > Save\" Saves the Image:"), 1.0, 0.5,
optionmenu, TRUE);
optionmenu, 1, TRUE);
/* Session Management */
@ -2432,9 +2439,9 @@ file_pref_cmd_callback (GtkWidget *widget,
gtk_signal_connect (GTK_OBJECT (fileselection), "filename_changed",
GTK_SIGNAL_FUNC (file_prefs_filename_callback),
dirs[i].mdir);
gimp_table_attach_aligned (GTK_TABLE (table), i,
gimp_table_attach_aligned (GTK_TABLE (table), 0, i,
gettext(dirs[i].label), 1.0, 0.5,
fileselection, FALSE);
fileselection, 1, FALSE);
}
}

20
app/tool_options.c
View file

@ -302,9 +302,9 @@ selection_options_init (SelectionOptions *options,
gtk_signal_connect (GTK_OBJECT (options->fixed_width_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->fixed_width);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Width:"), 1.0, 0.5,
width_spinbutton, FALSE);
width_spinbutton, 1, FALSE);
options->fixed_height_w =
gtk_adjustment_new (options->fixed_height_d, 1e-5, 32767.0,
@ -318,9 +318,9 @@ selection_options_init (SelectionOptions *options,
gtk_signal_connect (GTK_OBJECT (options->fixed_height_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->fixed_height);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Height:"), 1.0, 0.5,
height_spinbutton, FALSE);
height_spinbutton, 1, FALSE);
options->fixed_unit_w =
gimp_unit_menu_new ("%a", options->fixed_unit_d, TRUE, TRUE, TRUE);
@ -331,9 +331,9 @@ selection_options_init (SelectionOptions *options,
width_spinbutton);
gtk_object_set_data (GTK_OBJECT (width_spinbutton), "set_digits",
height_spinbutton);
gimp_table_attach_aligned (GTK_TABLE (table), 2,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Unit:"), 1.0, 0.5,
options->fixed_unit_w, FALSE);
options->fixed_unit_w, 1, FALSE);
gtk_widget_show (table);
}
@ -474,9 +474,9 @@ paint_options_init (PaintOptions *options,
gtk_signal_connect (GTK_OBJECT (options->opacity_w), "value_changed",
GTK_SIGNAL_FUNC (tool_options_opacity_adjustment_update),
tool_context);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Opacity:"), 1.0, 1.0,
scale, FALSE);
scale, 1, FALSE);
/* the paint mode menu */
switch (tool_type)
@ -497,9 +497,9 @@ paint_options_init (PaintOptions *options,
gtk_option_menu_set_menu (GTK_OPTION_MENU (options->paint_mode_w), menu);
gtk_option_menu_set_history (GTK_OPTION_MENU (options->paint_mode_w),
gimp_context_get_paint_mode (tool_context));
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Mode:"), 1.0, 0.5,
options->paint_mode_w, TRUE);
options->paint_mode_w, 1, TRUE);
/* eek */
gtk_object_set_data (GTK_OBJECT (options->paint_mode_w), "tool_context",

8
app/tools/airbrush.c
View file

@ -137,9 +137,9 @@ airbrush_options_new (void)
gtk_signal_connect (GTK_OBJECT (options->rate_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->rate);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Rate:"), 1.0, 1.0,
scale, FALSE);
scale, 1, FALSE);
/* the pressure scale */
options->pressure_w =
@ -150,9 +150,9 @@ airbrush_options_new (void)
gtk_signal_connect (GTK_OBJECT (options->pressure_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->pressure);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Pressure:"), 1.0, 1.0,
scale, FALSE);
scale, 1, FALSE);
gtk_widget_show (table);

24
app/tools/blend.c
View file

@ -330,9 +330,9 @@ blend_options_new ()
scale = gtk_hscale_new (GTK_ADJUSTMENT (options->offset_w));
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Offset:"), 1.0, 1.0,
scale, FALSE);
scale, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (options->offset_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->offset);
@ -341,25 +341,25 @@ blend_options_new ()
options->blend_mode_w = gtk_option_menu_new ();
menu = build_menu (blend_option_items, NULL);
gtk_option_menu_set_menu (GTK_OPTION_MENU (options->blend_mode_w), menu);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Blend:"), 1.0, 0.5,
options->blend_mode_w, TRUE);
options->blend_mode_w, 1, TRUE);
/* the gradient type menu */
options->gradient_type_w = gtk_option_menu_new ();
menu = build_menu (gradient_option_items, NULL);
gtk_option_menu_set_menu (GTK_OPTION_MENU (options->gradient_type_w), menu);
gimp_table_attach_aligned (GTK_TABLE (table), 2,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Gradient:"), 1.0, 0.5,
options->gradient_type_w, TRUE);
options->gradient_type_w, 1, TRUE);
/* the repeat option */
options->repeat_w = gtk_option_menu_new ();
menu = build_menu (repeat_option_items, NULL);
gtk_option_menu_set_menu (GTK_OPTION_MENU (options->repeat_w), menu);
gimp_table_attach_aligned (GTK_TABLE (table), 3,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 3,
_("Repeat:"), 1.0, 0.5,
options->repeat_w, TRUE);
options->repeat_w, 1, TRUE);
/* show the table */
gtk_widget_show (table);
@ -404,9 +404,9 @@ blend_options_new ()
scale = gtk_hscale_new (GTK_ADJUSTMENT (options->max_depth_w));
gtk_scale_set_digits (GTK_SCALE (scale), 0);
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Max Depth:"), 1.0, 1.0,
scale, FALSE);
scale, 1, FALSE);
gtk_signal_connect (GTK_OBJECT(options->max_depth_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&options->max_depth);
@ -417,9 +417,9 @@ blend_options_new ()
scale = gtk_hscale_new (GTK_ADJUSTMENT (options->threshold_w));
gtk_scale_set_digits (GTK_SCALE (scale), 2);
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Threshold:"), 1.0, 1.0,
scale, FALSE);
scale, 1, FALSE);
gtk_signal_connect (GTK_OBJECT(options->threshold_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->threshold);

8
app/tools/gimpairbrushtool.c
View file

@ -137,9 +137,9 @@ airbrush_options_new (void)
gtk_signal_connect (GTK_OBJECT (options->rate_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->rate);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Rate:"), 1.0, 1.0,
scale, FALSE);
scale, 1, FALSE);
/* the pressure scale */
options->pressure_w =
@ -150,9 +150,9 @@ airbrush_options_new (void)
gtk_signal_connect (GTK_OBJECT (options->pressure_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->pressure);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Pressure:"), 1.0, 1.0,
scale, FALSE);
scale, 1, FALSE);
gtk_widget_show (table);

24
app/tools/gimpblendtool.c
View file

@ -330,9 +330,9 @@ blend_options_new ()
scale = gtk_hscale_new (GTK_ADJUSTMENT (options->offset_w));
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Offset:"), 1.0, 1.0,
scale, FALSE);
scale, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (options->offset_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->offset);
@ -341,25 +341,25 @@ blend_options_new ()
options->blend_mode_w = gtk_option_menu_new ();
menu = build_menu (blend_option_items, NULL);
gtk_option_menu_set_menu (GTK_OPTION_MENU (options->blend_mode_w), menu);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Blend:"), 1.0, 0.5,
options->blend_mode_w, TRUE);
options->blend_mode_w, 1, TRUE);
/* the gradient type menu */
options->gradient_type_w = gtk_option_menu_new ();
menu = build_menu (gradient_option_items, NULL);
gtk_option_menu_set_menu (GTK_OPTION_MENU (options->gradient_type_w), menu);
gimp_table_attach_aligned (GTK_TABLE (table), 2,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Gradient:"), 1.0, 0.5,
options->gradient_type_w, TRUE);
options->gradient_type_w, 1, TRUE);
/* the repeat option */
options->repeat_w = gtk_option_menu_new ();
menu = build_menu (repeat_option_items, NULL);
gtk_option_menu_set_menu (GTK_OPTION_MENU (options->repeat_w), menu);
gimp_table_attach_aligned (GTK_TABLE (table), 3,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 3,
_("Repeat:"), 1.0, 0.5,
options->repeat_w, TRUE);
options->repeat_w, 1, TRUE);
/* show the table */
gtk_widget_show (table);
@ -404,9 +404,9 @@ blend_options_new ()
scale = gtk_hscale_new (GTK_ADJUSTMENT (options->max_depth_w));
gtk_scale_set_digits (GTK_SCALE (scale), 0);
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Max Depth:"), 1.0, 1.0,
scale, FALSE);
scale, 1, FALSE);
gtk_signal_connect (GTK_OBJECT(options->max_depth_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&options->max_depth);
@ -417,9 +417,9 @@ blend_options_new ()
scale = gtk_hscale_new (GTK_ADJUSTMENT (options->threshold_w));
gtk_scale_set_digits (GTK_SCALE (scale), 2);
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Threshold:"), 1.0, 1.0,
scale, FALSE);
scale, 1, FALSE);
gtk_signal_connect (GTK_OBJECT(options->threshold_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->threshold);

20
app/tools/tool_options.c
View file

@ -302,9 +302,9 @@ selection_options_init (SelectionOptions *options,
gtk_signal_connect (GTK_OBJECT (options->fixed_width_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->fixed_width);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Width:"), 1.0, 0.5,
width_spinbutton, FALSE);
width_spinbutton, 1, FALSE);
options->fixed_height_w =
gtk_adjustment_new (options->fixed_height_d, 1e-5, 32767.0,
@ -318,9 +318,9 @@ selection_options_init (SelectionOptions *options,
gtk_signal_connect (GTK_OBJECT (options->fixed_height_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->fixed_height);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Height:"), 1.0, 0.5,
height_spinbutton, FALSE);
height_spinbutton, 1, FALSE);
options->fixed_unit_w =
gimp_unit_menu_new ("%a", options->fixed_unit_d, TRUE, TRUE, TRUE);
@ -331,9 +331,9 @@ selection_options_init (SelectionOptions *options,
width_spinbutton);
gtk_object_set_data (GTK_OBJECT (width_spinbutton), "set_digits",
height_spinbutton);
gimp_table_attach_aligned (GTK_TABLE (table), 2,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Unit:"), 1.0, 0.5,
options->fixed_unit_w, FALSE);
options->fixed_unit_w, 1, FALSE);
gtk_widget_show (table);
}
@ -474,9 +474,9 @@ paint_options_init (PaintOptions *options,
gtk_signal_connect (GTK_OBJECT (options->opacity_w), "value_changed",
GTK_SIGNAL_FUNC (tool_options_opacity_adjustment_update),
tool_context);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Opacity:"), 1.0, 1.0,
scale, FALSE);
scale, 1, FALSE);
/* the paint mode menu */
switch (tool_type)
@ -497,9 +497,9 @@ paint_options_init (PaintOptions *options,
gtk_option_menu_set_menu (GTK_OPTION_MENU (options->paint_mode_w), menu);
gtk_option_menu_set_history (GTK_OPTION_MENU (options->paint_mode_w),
gimp_context_get_paint_mode (tool_context));
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Mode:"), 1.0, 0.5,
options->paint_mode_w, TRUE);
options->paint_mode_w, 1, TRUE);
/* eek */
gtk_object_set_data (GTK_OBJECT (options->paint_mode_w), "tool_context",

16
app/widgets/gimpbrusheditor.c
View file

@ -271,9 +271,9 @@ brush_edit_generated_new (void)
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (begw->radius_data), "value_changed",
(GtkSignalFunc) update_brush_callback, begw);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Radius:"), 1.0, 1.0,
slider, FALSE);
slider, 1, FALSE);
/* brush hardness scale */
begw->hardness_data =
@ -283,9 +283,9 @@ brush_edit_generated_new (void)
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (begw->hardness_data), "value_changed",
(GtkSignalFunc) update_brush_callback, begw);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Hardness:"), 1.0, 1.0,
slider, FALSE);
slider, 1, FALSE);
/* brush aspect ratio scale */
begw->aspect_ratio_data =
@ -295,9 +295,9 @@ brush_edit_generated_new (void)
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (begw->aspect_ratio_data), "value_changed",
(GtkSignalFunc) update_brush_callback, begw);
gimp_table_attach_aligned (GTK_TABLE (table), 3,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 3,
_("Aspect Ratio:"), 1.0, 1.0,
slider, FALSE);
slider, 1, FALSE);
/* brush angle scale */
begw->angle_data =
@ -307,9 +307,9 @@ brush_edit_generated_new (void)
gtk_range_set_update_policy (GTK_RANGE (slider), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (begw->angle_data), "value_changed",
(GtkSignalFunc) update_brush_callback, begw);
gimp_table_attach_aligned (GTK_TABLE (table), 2,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Angle:"), 1.0, 1.0,
slider, FALSE);
slider, 1, FALSE);
gtk_table_set_row_spacings (GTK_TABLE (table), 3);
gtk_table_set_col_spacing (GTK_TABLE (table), 0, 4);

11
app/widgets/gimpwidgets-utils.h
View file

@ -96,15 +96,4 @@ GtkWidget * gimp_message_box (gchar *message,
GtkCallback callback,
gpointer data);
/* helper functions */
/* add aligned label & widget to a two-column table */
void gimp_table_attach_aligned (GtkTable *table,
gint row,
gchar *text,
gfloat xalign,
gfloat yalign,
GtkWidget *widget,
gboolean left_adjust);
#endif /* __GIMP_UI_H__ */

58
libgimp/gimpwidgets.c
View file

@ -658,15 +658,17 @@ gimp_unit_menu_update (GtkWidget *widget,
* Helper Functions
*/
/* add aligned label & widget to a two-column table */
/* add aligned label & widget to a table */
void
gimp_table_attach_aligned (GtkTable *table,
gint column,
gint row,
gchar *label_text,
gfloat xalign,
gfloat yalign,
GtkWidget *widget,
gboolean left_adjust)
gint colspan,
gboolean left_align)
{
if (label_text)
{
@ -675,62 +677,20 @@ gimp_table_attach_aligned (GtkTable *table,
label = gtk_label_new (label_text);
gtk_misc_set_alignment (GTK_MISC (label), xalign, yalign);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_RIGHT);
gtk_table_attach (table, GTK_WIDGET (label), 0, 1, row, row + 1,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (label);
}
if (left_adjust)
{
GtkWidget *alignment;
alignment = gtk_alignment_new (0.0, 0.5, 0.0, 0.0);
gtk_table_attach (table, alignment, 1, 2, row, row + 1,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (alignment);
gtk_container_add (GTK_CONTAINER (alignment), widget);
}
else
{
gtk_table_attach_defaults (table, widget, 1, 2, row, row + 1);
}
gtk_widget_show (widget);
}
/* add aligned label & widget to a table */
void
gimp_table_attach_aligned2 (GtkTable *table,
gint row,
gchar *label_text,
gfloat xalign,
gfloat yalign,
GtkWidget *widget,
gint widget_left,
gint widget_right,
gboolean left_adjust)
{
if (label_text)
{
GtkWidget *label;
label = gtk_label_new (label_text);
gtk_misc_set_alignment (GTK_MISC (label), xalign, yalign);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_RIGHT);
gtk_table_attach (table, GTK_WIDGET (label),
widget_left - 1, widget_left,
gtk_table_attach (table, label,
column, column + 1,
row, row + 1,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (label);
}
if (left_adjust)
if (left_align)
{
GtkWidget *alignment;
alignment = gtk_alignment_new (0.0, 0.5, 0.0, 0.0);
gtk_table_attach (table, alignment,
widget_left, widget_right,
column + 1, column + 1 + colspan,
row, row + 1,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (alignment);
@ -739,7 +699,7 @@ gimp_table_attach_aligned2 (GtkTable *table,
else
{
gtk_table_attach_defaults (table, widget,
widget_left, widget_right,
column + 1, column + 1 + colspan,
row, row + 1);
}

17
libgimp/gimpwidgets.h
View file

@ -147,25 +147,16 @@ void gimp_unit_menu_update (GtkWidget *widget,
* Helper Functions
*/
/* add aligned label & widget to a two-column table */
void gimp_table_attach_aligned (GtkTable *table,
gint row,
gchar *label_text,
gfloat xalign,
gfloat yalign,
GtkWidget *widget,
gboolean left_adjust);
/* add aligned label & widget to a table */
void gimp_table_attach_aligned2 (GtkTable *table,
void gimp_table_attach_aligned (GtkTable *table,
gint column,
gint row,
gchar *label_text,
gfloat xalign,
gfloat yalign,
GtkWidget *widget,
gint widget_left,
gint widget_right,
gboolean left_adjust);
gint colspan,
gboolean left_align);
#ifdef __cplusplus
}

58
libgimpwidgets/gimpwidgets.c
View file

@ -658,15 +658,17 @@ gimp_unit_menu_update (GtkWidget *widget,
* Helper Functions
*/
/* add aligned label & widget to a two-column table */
/* add aligned label & widget to a table */
void
gimp_table_attach_aligned (GtkTable *table,
gint column,
gint row,
gchar *label_text,
gfloat xalign,
gfloat yalign,
GtkWidget *widget,
gboolean left_adjust)
gint colspan,
gboolean left_align)
{
if (label_text)
{
@ -675,62 +677,20 @@ gimp_table_attach_aligned (GtkTable *table,
label = gtk_label_new (label_text);
gtk_misc_set_alignment (GTK_MISC (label), xalign, yalign);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_RIGHT);
gtk_table_attach (table, GTK_WIDGET (label), 0, 1, row, row + 1,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (label);
}
if (left_adjust)
{
GtkWidget *alignment;
alignment = gtk_alignment_new (0.0, 0.5, 0.0, 0.0);
gtk_table_attach (table, alignment, 1, 2, row, row + 1,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (alignment);
gtk_container_add (GTK_CONTAINER (alignment), widget);
}
else
{
gtk_table_attach_defaults (table, widget, 1, 2, row, row + 1);
}
gtk_widget_show (widget);
}
/* add aligned label & widget to a table */
void
gimp_table_attach_aligned2 (GtkTable *table,
gint row,
gchar *label_text,
gfloat xalign,
gfloat yalign,
GtkWidget *widget,
gint widget_left,
gint widget_right,
gboolean left_adjust)
{
if (label_text)
{
GtkWidget *label;
label = gtk_label_new (label_text);
gtk_misc_set_alignment (GTK_MISC (label), xalign, yalign);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_RIGHT);
gtk_table_attach (table, GTK_WIDGET (label),
widget_left - 1, widget_left,
gtk_table_attach (table, label,
column, column + 1,
row, row + 1,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (label);
}
if (left_adjust)
if (left_align)
{
GtkWidget *alignment;
alignment = gtk_alignment_new (0.0, 0.5, 0.0, 0.0);
gtk_table_attach (table, alignment,
widget_left, widget_right,
column + 1, column + 1 + colspan,
row, row + 1,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (alignment);
@ -739,7 +699,7 @@ gimp_table_attach_aligned2 (GtkTable *table,
else
{
gtk_table_attach_defaults (table, widget,
widget_left, widget_right,
column + 1, column + 1 + colspan,
row, row + 1);
}

17
libgimpwidgets/gimpwidgets.h
View file

@ -147,25 +147,16 @@ void gimp_unit_menu_update (GtkWidget *widget,
* Helper Functions
*/
/* add aligned label & widget to a two-column table */
void gimp_table_attach_aligned (GtkTable *table,
gint row,
gchar *label_text,
gfloat xalign,
gfloat yalign,
GtkWidget *widget,
gboolean left_adjust);
/* add aligned label & widget to a table */
void gimp_table_attach_aligned2 (GtkTable *table,
void gimp_table_attach_aligned (GtkTable *table,
gint column,
gint row,
gchar *label_text,
gfloat xalign,
gfloat yalign,
GtkWidget *widget,
gint widget_left,
gint widget_right,
gboolean left_adjust);
gint colspan,
gboolean left_align);
#ifdef __cplusplus
}

7
plug-ins/FractalExplorer/Dialogs.c
View file

@ -394,7 +394,7 @@ explorer_dialog (void)
gtk_container_add (GTK_CONTAINER (frame), vbox);
gtk_widget_show (vbox);
button = gtk_button_new_with_label (_("Undo zoom"));
button = gtk_button_new_with_label (_("Undo Zoom"));
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (button), "clicked",
GTK_SIGNAL_FUNC (dialog_undo_zoom_callback),
@ -402,7 +402,7 @@ explorer_dialog (void)
gtk_widget_show (button);
gimp_help_set_help_data (button, _("Undo last zoom"), NULL);
button = gtk_button_new_with_label (_("Redo zoom"));
button = gtk_button_new_with_label (_("Redo Zoom"));
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (button), "clicked",
GTK_SIGNAL_FUNC (dialog_redo_zoom_callback),
@ -921,7 +921,7 @@ explorer_dialog (void)
gtk_label_new (_("Fractals")));
gtk_widget_show (frame);
gtk_notebook_set_page (GTK_NOTEBOOK (notebook), 0);
gtk_notebook_set_page (GTK_NOTEBOOK (notebook), 1);
/* Done */
@ -933,7 +933,6 @@ explorer_dialog (void)
ready_now = TRUE;
set_cmap_preview ();
dialog_update_preview ();
gtk_main ();

40
plug-ins/common/CML_explorer.c
View file

@ -1376,9 +1376,9 @@ CML_explorer_dialog (void)
NULL);
CML_explorer_menu_entry_init (&widget_pointers[3][0],
optionmenu, &VALS.initial_value);
gimp_table_attach_aligned2 (GTK_TABLE (table), 0,
_("Initial Value:"), 1.0, 0.5,
optionmenu, 1, 3, FALSE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Initial Value:"), 1.0, 0.5,
optionmenu, 2, FALSE);
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1,
_("Zoom Scale:"), SCALE_WIDTH, 0,
@ -1477,9 +1477,9 @@ CML_explorer_dialog (void)
(gpointer) 2, NULL,
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Source Channel:"), 1.0, 0.5,
optionmenu, TRUE);
optionmenu, 1, TRUE);
optionmenu = gimp_option_menu_new2 (FALSE, gimp_menu_item_update,
&copy_destination,
@ -1493,9 +1493,9 @@ CML_explorer_dialog (void)
(gpointer) 2, NULL,
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Destination Channel:"), 1.0, 0.5,
optionmenu, TRUE);
optionmenu, 1, TRUE);
button = gtk_button_new_with_label (_("Copy Parameters"));
gtk_table_attach (GTK_TABLE (table), button, 0, 2, 2, 3,
@ -1530,9 +1530,9 @@ CML_explorer_dialog (void)
(gpointer) 3, NULL,
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Source Channel in File:"), 1.0, 0.5,
optionmenu, TRUE);
optionmenu, 1, TRUE);
optionmenu = gimp_option_menu_new2 (FALSE, gimp_menu_item_update,
&selective_load_destination,
@ -1548,9 +1548,9 @@ CML_explorer_dialog (void)
(gpointer) 3, NULL,
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Destination Channel:"), 1.0, 0.5,
optionmenu, TRUE);
optionmenu, 1, TRUE);
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), frame,
gtk_label_new (_("Misc Ops.")));
@ -1646,9 +1646,9 @@ CML_dialog_channel_panel_new (gchar *name,
NULL);
CML_explorer_menu_entry_init (&widget_pointers[channel_id][index],
optionmenu, &param->function);
gimp_table_attach_aligned2 (GTK_TABLE (table), index,
_("Function Type:"), 1.0, 0.5,
optionmenu, 1, 3, FALSE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, index,
_("Function Type:"), 1.0, 0.5,
optionmenu, 2, FALSE);
index++;
optionmenu =
@ -1703,9 +1703,9 @@ CML_dialog_channel_panel_new (gchar *name,
NULL);
CML_explorer_menu_entry_init (&widget_pointers[channel_id][index],
optionmenu, &param->composition);
gimp_table_attach_aligned2 (GTK_TABLE (table), index,
_("Composition:"), 1.0, 0.5,
optionmenu, 1, 3, FALSE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, index,
_("Composition:"), 1.0, 0.5,
optionmenu, 2, FALSE);
index++;
optionmenu =
@ -1745,9 +1745,9 @@ CML_dialog_channel_panel_new (gchar *name,
NULL);
CML_explorer_menu_entry_init (&widget_pointers[channel_id][index],
optionmenu, &param->arrange);
gimp_table_attach_aligned2 (GTK_TABLE (table), index,
_("Misc Arrange:"), 1.0, 0.5,
optionmenu, 1, 3, FALSE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, index,
_("Misc Arrange:"), 1.0, 0.5,
optionmenu, 2, FALSE);
index++;
toggle = gtk_check_button_new_with_label (_("Use Cyclic Range"));

16
plug-ins/common/align_layers.c
View file

@ -456,9 +456,9 @@ align_layers_dialog (void)
(gpointer) SNAP2HGRID, NULL,
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Horizontal Style:"), 1.0, 0.5,
optionmenu, FALSE);
optionmenu, 1, FALSE);
optionmenu =
gimp_option_menu_new2 (FALSE, gimp_menu_item_update,
@ -469,9 +469,9 @@ align_layers_dialog (void)
_("Right Edge"), (gpointer) H_BASE_RIGHT, NULL,
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Horizontal Base:"), 1.0, 0.5,
optionmenu, FALSE);
optionmenu, 1, FALSE);
optionmenu =
gimp_option_menu_new2 (FALSE, gimp_menu_item_update,
@ -489,9 +489,9 @@ align_layers_dialog (void)
(gpointer) SNAP2VGRID, NULL,
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 2,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Vertical Style:"), 1.0, 0.5,
optionmenu, FALSE);
optionmenu, 1, FALSE);
optionmenu =
gimp_option_menu_new2 (FALSE, gimp_menu_item_update,
@ -502,9 +502,9 @@ align_layers_dialog (void)
_("Bottom Edge"), (gpointer) V_BASE_BOTTOM, NULL,
NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 3,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 3,
_("Horizontal Base:"), 1.0, 0.5,
optionmenu, FALSE);
optionmenu, 1, FALSE);
toggle =
gtk_check_button_new_with_label

4
plug-ins/common/blur.c
View file

@ -656,9 +656,9 @@ blur_dialog (void)
/* Random Seed */
seed_hbox = gimp_random_seed_new (&pivals.blur_seed, &pivals.seed_type,
SEED_TIME, SEED_USER);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Random Seed:"), 1.0, 0.5,
seed_hbox, TRUE);
seed_hbox, 1, TRUE);
/*
* Randomization percentage label & scale (1 to 100)

15
plug-ins/common/bumpmap.c
View file

@ -907,24 +907,15 @@ bumpmap_dialog (void)
gtk_widget_show (table);
/* Bump map menu */
label = gtk_label_new (_("Bump Map:"));
gtk_misc_set_alignment (GTK_MISC(label), 1.0, 0.5);
gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1,
GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (label);
option_menu = gtk_option_menu_new ();
gtk_table_attach (GTK_TABLE (table), option_menu, 1, 2, 0, 1,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_widget_show (option_menu);
menu = gimp_drawable_menu_new (dialog_constrain,
dialog_bumpmap_callback,
NULL,
bmvals.bumpmap_id);
gtk_option_menu_set_menu (GTK_OPTION_MENU(option_menu), menu);
gtk_widget_show (option_menu);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Bump Map:"), 1.0, 0.5,
option_menu, 2, FALSE);
/* Controls */

8
plug-ins/common/csource.c
View file

@ -693,18 +693,18 @@ run_save_dialog (Config *config)
/* Prefixed Name
*/
prefixed_name = gtk_entry_new ();
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Prefixed Name:"), 1.0, 0.5,
prefixed_name, FALSE);
prefixed_name, 1, FALSE);
gtk_entry_set_text (GTK_ENTRY (prefixed_name),
config->prefixed_name ? config->prefixed_name : "");
/* Comment Entry
*/
centry = gtk_entry_new ();
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Comment:"), 1.0, 0.5,
centry, FALSE);
centry, 1, FALSE);
gtk_entry_set_text (GTK_ENTRY (centry),
config->comment ? config->comment : "");

2
plug-ins/common/deinterlace.c
View file

@ -287,7 +287,7 @@ deinterlace_dialog (void)
NULL);
vbox = gtk_vbox_new (FALSE, 0);
gtk_container_border_width (GTK_CONTAINER (vbox), 5);
gtk_container_border_width (GTK_CONTAINER (vbox), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);

4
plug-ins/common/exchange.c
View file

@ -361,9 +361,9 @@ doDialog (void)
framenumber ?
&xargs.tored : &xargs.fromred,
3);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
NULL, 0.0, 0.0,
colorbutton, TRUE);
colorbutton, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (colorbutton), "color_changed",
GTK_SIGNAL_FUNC (color_button_callback),
NULL);

8
plug-ins/common/gbr.c
View file

@ -491,18 +491,18 @@ save_dialog (void)
spinbutton = gimp_spin_button_new (&adj,
info.spacing, 1, 1000, 1, 10, 0, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Spacing:"), 1.0, 0.5,
spinbutton, TRUE);
spinbutton, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&info.spacing);
entry = gtk_entry_new ();
gtk_widget_set_usize (entry, 200, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Description:"), 1.0, 0.5,
entry, FALSE);
entry, 1, FALSE);
gtk_entry_set_text (GTK_ENTRY (entry), info.description);
gtk_signal_connect (GTK_OBJECT (entry), "changed",
GTK_SIGNAL_FUNC (entry_callback),

4
plug-ins/common/gicon.c
View file

@ -474,9 +474,9 @@ save_dialog (void)
entry = gtk_entry_new ();
gtk_widget_set_usize (entry, 200, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Icon Name:"), 1.0, 0.5,
entry, FALSE);
entry, 1, FALSE);
gtk_entry_set_text (GTK_ENTRY (entry), givals.icon_name);
gtk_signal_connect (GTK_OBJECT (entry), "changed",
GTK_SIGNAL_FUNC (entry_callback),

32
plug-ins/common/gpb.c
View file

@ -295,9 +295,9 @@ common_save_dialog (GtkWidget *dlg,
*/
spinbutton = gimp_spin_button_new (&adjustment, info.spacing,
1, 1000, 1, 10, 10, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Spacing (Percent):"), 1.0, 0.5,
spinbutton, TRUE);
spinbutton, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&info.spacing);
@ -308,9 +308,9 @@ common_save_dialog (GtkWidget *dlg,
entry = gtk_entry_new ();
gtk_widget_set_usize (entry, 200, 0);
gtk_entry_set_text (GTK_ENTRY (entry), info.description);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Description:"), 1.0, 0.5,
entry, FALSE);
entry, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (entry), "changed",
GTK_SIGNAL_FUNC (entry_callback),
info.description);
@ -446,9 +446,9 @@ gih_save_dialog (gint32 image_ID)
gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
gtk_widget_show (label);
gimp_table_attach_aligned (GTK_TABLE (table), 2,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Cell Size:"), 1.0, 0.5,
box, FALSE);
box, 1, FALSE);
g_free (layer_ID);
@ -458,9 +458,9 @@ gih_save_dialog (gint32 image_ID)
spinbutton = gimp_spin_button_new (&adjustment,
gihparms.ncells, 1, 1000, 1, 10, 10,
1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 3,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 3,
_("Number of Cells:"), 1.0, 0.5,
spinbutton, TRUE);
spinbutton, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&gihparms.ncells);
@ -507,18 +507,18 @@ gih_save_dialog (gint32 image_ID)
gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
cellh_adjust.warning_label = label;
gimp_table_attach_aligned (GTK_TABLE (table), 4,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 4,
_("Display as:"), 1.0, 0.5,
box, FALSE);
box, 1, FALSE);
/*
* Dimension: ___
*/
spinbutton = gimp_spin_button_new (&adjustment, gihparms.dim,
1, 5, 1, 1, 1, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 5,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 5,
_("Dimension:"), 1.0, 0.5,
spinbutton, TRUE);
spinbutton, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&gihparms.dim);
@ -551,9 +551,9 @@ gih_save_dialog (gint32 image_ID)
cellw_adjust.rank0 = cellh_adjust.rank0 = NULL;
}
}
gimp_table_attach_aligned (GTK_TABLE (table), 6,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 6,
_("Ranks:"), 1.0, 0.5,
dimtable, FALSE);
dimtable, 1, FALSE);
/*
* Selection: ______ ______ ______ ______ ______
@ -584,9 +584,9 @@ gih_save_dialog (gint32 image_ID)
&gihparms.selection[i]);
gtk_widget_show (cb);
}
gimp_table_attach_aligned (GTK_TABLE (table), 7,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 7,
_("Selection:"), 1.0, 0.5,
box, FALSE);
box, 1, FALSE);
gtk_widget_show (dlg);

24
plug-ins/common/gtm.c
View file

@ -489,9 +489,9 @@ save_dialog (void)
entry = gtk_entry_new ();
gtk_widget_set_usize (entry, 200, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 3,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 3,
_("Cell Content:"), 1.0, 0.5,
entry, FALSE);
entry, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (entry), "changed",
GTK_SIGNAL_FUNC (gtm_cellcontent_callback),
NULL);
@ -515,9 +515,9 @@ save_dialog (void)
spinbutton = gimp_spin_button_new (&adj, gtmvals.border,
0, 1000, 1, 10, 0, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Border:"), 1.0, 0.5,
spinbutton, TRUE);
spinbutton, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&gtmvals.border);
@ -527,9 +527,9 @@ save_dialog (void)
entry = gtk_entry_new ();
gtk_widget_set_usize (entry, 60, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Width:"), 1.0, 0.5,
entry, TRUE);
entry, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (entry), "changed",
GTK_SIGNAL_FUNC (gtm_clwidth_callback),
NULL);
@ -541,9 +541,9 @@ save_dialog (void)
entry = gtk_entry_new ();
gtk_widget_set_usize (entry, 60, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 2,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Height:"), 1.0, 0.5,
entry, TRUE);
entry, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (entry), "changed",
GTK_SIGNAL_FUNC (gtm_clheight_callback),
NULL);
@ -555,9 +555,9 @@ save_dialog (void)
spinbutton = gimp_spin_button_new (&adj, gtmvals.cellpadding,
0, 1000, 1, 10, 0, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 3,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 3,
_("Cell-Padding:"), 1.0, 0.5,
spinbutton, TRUE);
spinbutton, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&gtmvals.cellpadding);
@ -566,9 +566,9 @@ save_dialog (void)
spinbutton = gimp_spin_button_new (&adj, gtmvals.cellspacing,
0, 1000, 1, 10, 0, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 4,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 4,
_("Cell-Spacing:"), 1.0, 0.5,
spinbutton, TRUE);
spinbutton, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&gtmvals.cellspacing);

4
plug-ins/common/illusion.c
View file

@ -341,9 +341,9 @@ dialog (void)
spinbutton = gimp_spin_button_new (&adj, parameters.division,
G_MININT, G_MAXINT, 1, 10, 0, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Division:"), 1.0, 0.5,
spinbutton, TRUE);
spinbutton, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&parameters.division);

4
plug-ins/common/lic.c
View file

@ -1098,9 +1098,9 @@ create_main_dialog (void)
NULL,
licvals.effect_image_id);
gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu), menu);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Effect Image:"), 1.0, 0.5,
option_menu, TRUE);
option_menu, 2, TRUE);
scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 1,
_("Filter Length"), 0, 0,

20
plug-ins/common/mail.c
View file

@ -526,9 +526,9 @@ save_dialog (void)
gtk_widget_set_usize (entry, 200, 0);
g_snprintf (buffer, sizeof (buffer), "%s", mail_info.receipt);
gtk_entry_set_text (GTK_ENTRY (entry), buffer);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("To:"), 1.0, 0.5,
entry, FALSE);
entry, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (entry), "changed",
GTK_SIGNAL_FUNC (mail_entry_callback),
&mail_info.receipt);
@ -538,9 +538,9 @@ save_dialog (void)
gtk_widget_set_usize (entry, 200, 0);
g_snprintf (buffer, sizeof (buffer), "%s", mail_info.from);
gtk_entry_set_text (GTK_ENTRY (entry), buffer);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("From:"), 1.0, 0.5,
entry, FALSE);
entry, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (entry), "changed",
GTK_SIGNAL_FUNC (mail_entry_callback),
&mail_info.from);
@ -550,9 +550,9 @@ save_dialog (void)
gtk_widget_set_usize (entry, 200, 0);
g_snprintf (buffer, sizeof (buffer), "%s", mail_info.subject);
gtk_entry_set_text (GTK_ENTRY (entry), buffer);
gimp_table_attach_aligned (GTK_TABLE (table), 2,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Subject:"), 1.0, 0.5,
entry, FALSE);
entry, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (entry), "changed",
GTK_SIGNAL_FUNC (mail_entry_callback),
&mail_info.subject);
@ -562,9 +562,9 @@ save_dialog (void)
gtk_widget_set_usize (entry, 200, 0);
g_snprintf (buffer, sizeof (buffer), "%s", mail_info.comment);
gtk_entry_set_text (GTK_ENTRY (entry), buffer);
gimp_table_attach_aligned (GTK_TABLE (table), 3,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 3,
_("Comment:"), 1.0, 0.5,
entry, FALSE);
entry, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (entry), "changed",
GTK_SIGNAL_FUNC (mail_entry_callback),
&mail_info.comment);
@ -574,9 +574,9 @@ save_dialog (void)
gtk_widget_set_usize (entry, 200, 0);
g_snprintf (buffer, sizeof (buffer), "%s", mail_info.filename);
gtk_entry_set_text (GTK_ENTRY (entry), buffer);
gimp_table_attach_aligned (GTK_TABLE (table), 4,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 4,
_("Filename:"), 1.0, 0.5,
entry, FALSE);
entry, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (entry), "changed",
GTK_SIGNAL_FUNC (mail_entry_callback),
&mail_info.filename);

2
plug-ins/common/noisify.c
View file

@ -348,7 +348,7 @@ noisify_dialog (gint channels)
gtk_container_add (GTK_CONTAINER (frame), table);
toggle = gtk_check_button_new_with_label (_("Independent"));
gtk_table_attach (GTK_TABLE (table), toggle, 0, 2, 0, 1, GTK_FILL, 0, 0, 0);
gtk_table_attach (GTK_TABLE (table), toggle, 0, 3, 0, 1, GTK_FILL, 0, 0, 0);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&nvals.independent);

4
plug-ins/common/nova.c
View file

@ -391,9 +391,9 @@ nova_dialog (GDrawable *drawable)
button = gimp_color_button_new (_("SuperNova Color Picker"),
SCALE_WIDTH - 8, 16,
pvals.color, 3);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Color:"), 1.0, 0.5,
button, TRUE);
button, 1, TRUE);
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 2,
_("Radius:"), SCALE_WIDTH, 0,

16
plug-ins/common/papertile.c
View file

@ -279,18 +279,18 @@ dialog_create (void)
button = gimp_spin_button_new (&w.division_x_adj, p.params.division_x,
1.0, p.drawable->width, 1.0, 5.0, 0, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("X:"), 1.0, 0.5,
button, TRUE);
button, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (w.division_x_adj), "value_changed",
GTK_SIGNAL_FUNC (division_x_adj_changed),
NULL);
button = gimp_spin_button_new (&w.division_y_adj, p.params.division_y,
1.0, p.drawable->width, 1.0, 5.0, 0, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Y:"), 1.0, 0.5,
button, TRUE);
button, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (w.division_y_adj), "value_changed",
GTK_SIGNAL_FUNC (division_y_adj_changed),
NULL);
@ -299,9 +299,9 @@ dialog_create (void)
1.0, MAX (p.drawable->width,
p.drawable->height),
1.0, 5.0, 0, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 2,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Size:"), 1.0, 0.5,
button, TRUE);
button, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (w.tile_size_adj), "value_changed",
GTK_SIGNAL_FUNC (tile_size_adj_changed),
NULL);
@ -354,9 +354,9 @@ dialog_create (void)
button = gimp_spin_button_new (&adjustment, p.params.move_max_rate,
0.0, 100.0, 1.0, 10.0, 0, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Max (%):"), 1.0, 0.5,
button, TRUE);
button, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&p.params.move_max_rate);

4
plug-ins/common/pat.c
View file

@ -447,9 +447,9 @@ save_dialog (void)
entry = gtk_entry_new ();
gtk_widget_set_usize (entry, 200, 0);
gtk_entry_set_text (GTK_ENTRY (entry), description);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Description:"), 1.0, 0.5,
entry, FALSE);
entry, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (entry), "changed",
GTK_SIGNAL_FUNC (entry_callback),
description);

4
plug-ins/common/plasma.c
View file

@ -321,9 +321,9 @@ plasma_dialog (void)
seed_hbox = gimp_random_seed_new (&pvals.seed, &pvals.timeseed,
TRUE, FALSE);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Random Seed:"), 1.0, 0.5,
seed_hbox, TRUE);
seed_hbox, 1, TRUE);
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1,
_("Turbulence:"), SCALE_WIDTH, 0,

4
plug-ins/common/png.c
View file

@ -980,9 +980,9 @@ save_dialog (void)
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gtk_scale_set_digits (GTK_SCALE (scale), 0);
gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);
gimp_table_attach_aligned (GTK_TABLE (table), 2,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Compression Level:"), 1.0, 1.0,
scale, FALSE);
scale, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&pngvals.compression_level);

36
plug-ins/common/postscript.c
View file

@ -2309,27 +2309,27 @@ load_dialog (void)
spinbutton = gimp_spin_button_new (&adj, plvals.resolution,
5, 1440, 1, 10, 0, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Resolution:"), 1.0, 0.5,
spinbutton, TRUE);
spinbutton, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&plvals.resolution);
spinbutton = gimp_spin_button_new (&adj, plvals.width,
1, GIMP_MAX_IMAGE_SIZE, 1, 10, 0, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Width:"), 1.0, 0.5,
spinbutton, TRUE);
spinbutton, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&plvals.width);
spinbutton = gimp_spin_button_new (&adj, plvals.height,
1, GIMP_MAX_IMAGE_SIZE, 1, 10, 0, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 2,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Height:"), 1.0, 0.5,
spinbutton, TRUE);
spinbutton, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&plvals.height);
@ -2337,9 +2337,9 @@ load_dialog (void)
pages_entry = gtk_entry_new ();
gtk_widget_set_usize (pages_entry, 80, 0);
gtk_entry_set_text (GTK_ENTRY (pages_entry), plvals.pages);
gimp_table_attach_aligned (GTK_TABLE (table), 3,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 3,
_("Pages:"), 1.0, 0.5,
pages_entry, TRUE);
pages_entry, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (pages_entry), "changed",
GTK_SIGNAL_FUNC (load_pages_entry_callback),
NULL);
@ -2493,36 +2493,36 @@ save_dialog (void)
spinbutton = gimp_spin_button_new (&vals->adjustment[0], psvals.width,
1e-5, GIMP_MAX_IMAGE_SIZE, 1, 10, 0, 1, 2);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Width:"), 1.0, 0.5,
spinbutton, FALSE);
spinbutton, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (vals->adjustment[0]), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&psvals.width);
spinbutton = gimp_spin_button_new (&vals->adjustment[1], psvals.height,
1e-5, GIMP_MAX_IMAGE_SIZE, 1, 10, 0, 1, 2);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Height:"), 1.0, 0.5,
spinbutton, FALSE);
spinbutton, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (vals->adjustment[1]), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&psvals.height);
spinbutton = gimp_spin_button_new (&vals->adjustment[2], psvals.x_offset,
1e-5, GIMP_MAX_IMAGE_SIZE, 1, 10, 0, 1, 2);
gimp_table_attach_aligned (GTK_TABLE (table), 2,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("X-Offset:"), 1.0, 0.5,
spinbutton, FALSE);
spinbutton, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (vals->adjustment[2]), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&psvals.x_offset);
spinbutton = gimp_spin_button_new (&vals->adjustment[3], psvals.y_offset,
1e-5, GIMP_MAX_IMAGE_SIZE, 1, 10, 0, 1, 2);
gimp_table_attach_aligned (GTK_TABLE (table), 3,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 3,
_("Y-Offset:"), 1.0, 0.5,
spinbutton, FALSE);
spinbutton, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (vals->adjustment[3]), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&psvals.y_offset);
@ -2608,9 +2608,9 @@ save_dialog (void)
spinbutton = gimp_spin_button_new (&adj, psvals.preview_size,
0, 1024, 1, 10, 0, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Preview Size:"), 1.0, 0.5,
spinbutton, FALSE);
spinbutton, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&psvals.preview_size);

36
plug-ins/common/ps.c
View file

@ -2309,27 +2309,27 @@ load_dialog (void)
spinbutton = gimp_spin_button_new (&adj, plvals.resolution,
5, 1440, 1, 10, 0, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Resolution:"), 1.0, 0.5,
spinbutton, TRUE);
spinbutton, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&plvals.resolution);
spinbutton = gimp_spin_button_new (&adj, plvals.width,
1, GIMP_MAX_IMAGE_SIZE, 1, 10, 0, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Width:"), 1.0, 0.5,
spinbutton, TRUE);
spinbutton, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&plvals.width);
spinbutton = gimp_spin_button_new (&adj, plvals.height,
1, GIMP_MAX_IMAGE_SIZE, 1, 10, 0, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 2,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Height:"), 1.0, 0.5,
spinbutton, TRUE);
spinbutton, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&plvals.height);
@ -2337,9 +2337,9 @@ load_dialog (void)
pages_entry = gtk_entry_new ();
gtk_widget_set_usize (pages_entry, 80, 0);
gtk_entry_set_text (GTK_ENTRY (pages_entry), plvals.pages);
gimp_table_attach_aligned (GTK_TABLE (table), 3,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 3,
_("Pages:"), 1.0, 0.5,
pages_entry, TRUE);
pages_entry, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (pages_entry), "changed",
GTK_SIGNAL_FUNC (load_pages_entry_callback),
NULL);
@ -2493,36 +2493,36 @@ save_dialog (void)
spinbutton = gimp_spin_button_new (&vals->adjustment[0], psvals.width,
1e-5, GIMP_MAX_IMAGE_SIZE, 1, 10, 0, 1, 2);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Width:"), 1.0, 0.5,
spinbutton, FALSE);
spinbutton, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (vals->adjustment[0]), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&psvals.width);
spinbutton = gimp_spin_button_new (&vals->adjustment[1], psvals.height,
1e-5, GIMP_MAX_IMAGE_SIZE, 1, 10, 0, 1, 2);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Height:"), 1.0, 0.5,
spinbutton, FALSE);
spinbutton, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (vals->adjustment[1]), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&psvals.height);
spinbutton = gimp_spin_button_new (&vals->adjustment[2], psvals.x_offset,
1e-5, GIMP_MAX_IMAGE_SIZE, 1, 10, 0, 1, 2);
gimp_table_attach_aligned (GTK_TABLE (table), 2,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("X-Offset:"), 1.0, 0.5,
spinbutton, FALSE);
spinbutton, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (vals->adjustment[2]), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&psvals.x_offset);
spinbutton = gimp_spin_button_new (&vals->adjustment[3], psvals.y_offset,
1e-5, GIMP_MAX_IMAGE_SIZE, 1, 10, 0, 1, 2);
gimp_table_attach_aligned (GTK_TABLE (table), 3,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 3,
_("Y-Offset:"), 1.0, 0.5,
spinbutton, FALSE);
spinbutton, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (vals->adjustment[3]), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&psvals.y_offset);
@ -2608,9 +2608,9 @@ save_dialog (void)
spinbutton = gimp_spin_button_new (&adj, psvals.preview_size,
0, 1024, 1, 10, 0, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Preview Size:"), 1.0, 0.5,
spinbutton, FALSE);
spinbutton, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&psvals.preview_size);

4
plug-ins/common/randomize.c
View file

@ -744,9 +744,9 @@ randomize_dialog (void)
/* Random Seed */
seed_hbox = gimp_random_seed_new (&pivals.rndm_seed, &pivals.seed_type,
SEED_TIME, SEED_USER);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Random Seed:"), 1.0, 0.5,
seed_hbox, TRUE);
seed_hbox, 1, TRUE);
/*
* Randomization percentage label & scale (1 to 100)

6
plug-ins/common/sel_gauss.c
View file

@ -261,7 +261,7 @@ sel_gauss_dialog (void)
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame,
TRUE, TRUE, 0);
table = gtk_table_new (2, 2, FALSE);
table = gtk_table_new (2, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
@ -270,9 +270,9 @@ sel_gauss_dialog (void)
spinbutton = gimp_spin_button_new (&adj,
bvals.radius, 1.0, G_MAXINT, 1.0, 5.0,
0, 1, 2);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Blur Radius:"), 1.0, 0.5,
spinbutton, TRUE);
spinbutton, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&bvals.radius);

12
plug-ins/common/smooth_palette.c
View file

@ -427,27 +427,27 @@ dialog (void)
spinbutton = gimp_spin_button_new (&adj, config.width,
1, GIMP_MAX_IMAGE_SIZE, 1, 10, 0, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Width:"), 1.0, 0.5,
spinbutton, FALSE);
spinbutton, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&config.width);
spinbutton = gimp_spin_button_new (&adj, config.height,
1, GIMP_MAX_IMAGE_SIZE, 1, 10, 0, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Height:"), 1.0, 0.5,
spinbutton, FALSE);
spinbutton, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&config.height);
spinbutton = gimp_spin_button_new (&adj, config.ntries,
1, 1024, 1, 10, 0, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 2,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Search Time:"), 1.0, 0.5,
spinbutton, FALSE);
spinbutton, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&config.ntries);

8
plug-ins/common/snoise.c
View file

@ -552,16 +552,16 @@ solid_noise_dialog (void)
/* Random Seed */
seed_hbox = gimp_random_seed_new (&snvals.seed, &snvals.timeseed,
TRUE, FALSE);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Random Seed:"), 1.0, 0.5,
seed_hbox, TRUE);
seed_hbox, 1, TRUE);
/* Detail */
spinbutton = gimp_spin_button_new (&adj, snvals.detail,
1, 15, 1, 3, 0, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Detail:"), 1.0, 0.5,
spinbutton, TRUE);
spinbutton, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&snvals.detail);

4
plug-ins/common/sobel.c
View file

@ -276,8 +276,8 @@ sobel_dialog (void)
gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame, TRUE, TRUE, 0);
vbox = gtk_vbox_new (FALSE, 2);
gtk_container_border_width (GTK_CONTAINER (vbox), 4);
vbox = gtk_vbox_new (FALSE, 1);
gtk_container_border_width (GTK_CONTAINER (vbox), 2);
gtk_container_add (GTK_CONTAINER (frame), vbox);
toggle = gtk_check_button_new_with_label (_("Sobel Horizontally"));

61
plug-ins/common/sparkle.c
View file

@ -343,15 +343,12 @@ sparkle_dialog (void)
GtkWidget *table;
GtkWidget *toggle;
GtkWidget *sep;
GtkWidget *r1, *r2, *r3;
GtkObject *scale_data;
GSList *group = NULL;
gchar **argv;
gint argc;
gint use_natural = (svals.colortype == NATURAL);
gint use_foreground = (svals.colortype == FOREGROUND);
gint use_background = (svals.colortype == BACKGROUND);
argc = 1;
argv = g_new (gchar *, 1);
argv[0] = g_strdup ("sparkle");
@ -487,7 +484,7 @@ sparkle_dialog (void)
gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
vbox = gtk_vbox_new (FALSE, 2);
vbox = gtk_vbox_new (FALSE, 1);
gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);
@ -526,54 +523,30 @@ sparkle_dialog (void)
gtk_box_pack_start (GTK_BOX (hbox), sep, FALSE, FALSE, 0);
gtk_widget_show (sep);
vbox = gtk_vbox_new (FALSE, 2);
/* colortype */
vbox =
gimp_radio_group_new2 (FALSE, NULL,
gimp_radio_button_update,
&svals.colortype, (gpointer) svals.colortype,
_("Natural Color"), (gpointer) NATURAL, &r1,
_("Foreground Color"), (gpointer) FOREGROUND, &r2,
_("Background Color"), (gpointer) BACKGROUND, &r3,
NULL);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 0);
gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);
/* colortype */
toggle = gtk_radio_button_new_with_label (group, _("Natural Color"));
gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0);
group = gtk_radio_button_group (GTK_RADIO_BUTTON (toggle));
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (toggle), use_natural);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&use_natural);
gtk_widget_show (toggle);
gimp_help_set_help_data (toggle, _("Use the Color of the Image"), NULL);
toggle = gtk_radio_button_new_with_label (group, _("Foreground Color"));
gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0);
group = gtk_radio_button_group (GTK_RADIO_BUTTON (toggle));
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (toggle), use_foreground);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&use_foreground);
gtk_widget_show (toggle);
gimp_help_set_help_data (toggle, _("Use the Foreground Color"), NULL);
toggle = gtk_radio_button_new_with_label (group, _("Background Color"));
gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0);
group = gtk_radio_button_group (GTK_RADIO_BUTTON (toggle));
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (toggle), use_background);
gtk_signal_connect (GTK_OBJECT (toggle), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&use_background);
gtk_widget_show (toggle);
gimp_help_set_help_data (toggle, _("Use the Background Color"), NULL);
gimp_help_set_help_data (r1, _("Use the Color of the Image"), NULL);
gimp_help_set_help_data (r2, _("Use the Foreground Color"), NULL);
gimp_help_set_help_data (r3, _("Use the Background Color"), NULL);
gtk_widget_show (dlg);
gtk_main ();
gdk_flush ();
/* determine colortype */
if (use_natural)
svals.colortype = NATURAL;
else if (use_foreground)
svals.colortype = FOREGROUND;
else if (use_background)
svals.colortype = BACKGROUND;
return sint.run;
}

8
plug-ins/common/tile.c
View file

@ -416,18 +416,18 @@ tile_dialog (gint width, gint height)
spinbutton = gimp_spin_button_new (&tint.width_adj, width,
1, width, 1, 10, 0, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Width:"), 1.0, 0.5,
spinbutton, FALSE);
spinbutton, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (tint.width_adj), "value_changed",
GTK_SIGNAL_FUNC (tile_adjustment_update),
&tvals.new_width);
spinbutton = gimp_spin_button_new (&tint.height_adj, height,
1, height, 1, 10, 0, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Height:"), 1.0, 0.5,
spinbutton, FALSE);
spinbutton, 1, FALSE);
gtk_signal_connect (GTK_OBJECT (tint.height_adj), "value_changed",
GTK_SIGNAL_FUNC (tile_adjustment_update),
&tvals.new_height);

32
plug-ins/common/warp.c
View file

@ -472,18 +472,18 @@ warp_dialog (GDrawable *drawable)
spinbutton = gimp_spin_button_new (&adj, dvals.amount,
-1000, 1000, /* ??? */
1, 10, 0, 1, 2);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Step Size:"), 1.0, 0.5,
spinbutton, TRUE);
spinbutton, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&dvals.amount);
spinbutton = gimp_spin_button_new (&adj, dvals.iter,
1, 100, 1, 5, 0, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Iterations:"), 1.0, 0.5,
spinbutton, TRUE);
spinbutton, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&dvals.iter);
@ -579,27 +579,27 @@ warp_dialog (GDrawable *drawable)
spinbutton = gimp_spin_button_new (&adj, dvals.dither,
0, 100, 1, 10, 0, 1, 2);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Dither Size:"), 1.0, 0.5,
spinbutton, TRUE);
spinbutton, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&dvals.dither);
spinbutton = gimp_spin_button_new (&adj, dvals.angle,
0, 360, 1, 15, 0, 1, 1);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Rotation Angle:"), 1.0, 0.5,
spinbutton, TRUE);
spinbutton, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&dvals.angle);
spinbutton = gimp_spin_button_new (&adj, dvals.substeps,
1, 100, 1, 5, 0, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 2,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Substeps:"), 1.0, 0.5,
spinbutton, TRUE);
spinbutton, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&dvals.substeps);
@ -653,9 +653,9 @@ warp_dialog (GDrawable *drawable)
spinbutton = gimp_spin_button_new (&adj, dvals.grad_scale,
-1000, 1000, /* ??? */
0.01, 0.1, 0, 1, 3);
gimp_table_attach_aligned (GTK_TABLE (otable), 0,
gimp_table_attach_aligned (GTK_TABLE (otable), 0, 0,
_("Gradient Scale:"), 1.0, 0.5,
spinbutton, TRUE);
spinbutton, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&dvals.grad_scale);
@ -678,9 +678,9 @@ warp_dialog (GDrawable *drawable)
spinbutton = gimp_spin_button_new (&adj, dvals.vector_scale,
-1000, 1000, /* ??? */
0.01, 0.1, 0, 1, 3);
gimp_table_attach_aligned (GTK_TABLE (otable), 1,
gimp_table_attach_aligned (GTK_TABLE (otable), 0, 1,
_("Vector Mag:"), 1.0, 0.5,
spinbutton, TRUE);
spinbutton, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&dvals.vector_scale);
@ -689,9 +689,9 @@ warp_dialog (GDrawable *drawable)
spinbutton = gimp_spin_button_new (&adj, dvals.vector_angle,
0, 360, 1, 15, 0, 1, 1);
gimp_table_attach_aligned (GTK_TABLE (otable), 2,
gimp_table_attach_aligned (GTK_TABLE (otable), 0, 2,
_("Angle:"), 1.0, 0.5,
spinbutton, TRUE);
spinbutton, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&dvals.vector_angle);

8
plug-ins/common/xbm.c
View file

@ -1010,9 +1010,9 @@ save_dialog (gint32 drawable_ID)
/* prefix */
entry = gtk_entry_new_with_max_length (MAX_PREFIX);
gtk_entry_set_text (GTK_ENTRY (entry), xsvals.prefix);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Identifier Prefix:"), 1.0, 0.5,
entry, TRUE);
entry, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (entry), "changed",
GTK_SIGNAL_FUNC (prefix_entry_callback),
NULL);
@ -1021,9 +1021,9 @@ save_dialog (gint32 drawable_ID)
entry = gtk_entry_new_with_max_length (MAX_COMMENT);
gtk_widget_set_usize (entry, 240, 0);
gtk_entry_set_text (GTK_ENTRY (entry), xsvals.comment);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Comment:"), 1.0, 0.5,
entry, TRUE);
entry, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (entry), "changed",
GTK_SIGNAL_FUNC (comment_entry_callback),
NULL);

16
plug-ins/gfli/gfli.c
View file

@ -851,18 +851,18 @@ load_dialog (gchar *name)
*/
spinbutton = gimp_spin_button_new (&adj,
from_frame, 1, nframes, 1, 10, 0, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
"From:", 1.0, 0.5,
spinbutton, TRUE);
spinbutton, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&from_frame);
spinbutton = gimp_spin_button_new (&adj,
to_frame, 1, nframes, 1, 10, 0, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
"To:", 1.0, 0.5,
spinbutton, TRUE);
spinbutton, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&to_frame);
@ -922,18 +922,18 @@ save_dialog (gint32 image_id)
*/
spinbutton = gimp_spin_button_new (&adj,
from_frame, 1, nframes, 1, 10, 0, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 0,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
"From:", 1.0, 0.5,
spinbutton, TRUE);
spinbutton, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&from_frame);
spinbutton = gimp_spin_button_new (&adj,
to_frame, 1, nframes, 1, 10, 0, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 1,
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
"To:", 1.0, 0.5,
spinbutton, TRUE);
spinbutton, 1, TRUE);
gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
GTK_SIGNAL_FUNC (gimp_int_adjustment_update),
&to_frame);