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

plug-ins/common/mapcolor.c plug-ins/common/mblur.c plug-ins/common/mng.c

Browse Source 
2004-05-19  Sven Neumann  <sven@gimp.org>

	* plug-ins/common/mapcolor.c
	* plug-ins/common/mblur.c
	* plug-ins/common/mng.c
	* plug-ins/common/mosaic.c
	* plug-ins/common/newsprint.c
	* plug-ins/common/oilify.c: HIG-ified.
This commit is contained in:
Sven Neumann
2004-05-19 16:51:32 +00:00
committed by Sven Neumann
parent 2dd8165723
commit 08270066f5
7 changed files with 111 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2004-05-19 Sven Neumann <sven@gimp.org>
* plug-ins/common/mapcolor.c
* plug-ins/common/mblur.c
* plug-ins/common/mng.c
* plug-ins/common/mosaic.c
* plug-ins/common/newsprint.c
* plug-ins/common/oilify.c: HIG-ified.
2004-05-19 Sven Neumann <sven@gimp.org> 2004-05-19 Sven Neumann <sven@gimp.org>
* plug-ins/common/hot.c * plug-ins/common/hot.c

56
plug-ins/common/mapcolor.c
View File

@ -526,10 +526,9 @@ static gboolean
dialog (gint32 drawable_ID) dialog (gint32 drawable_ID)
{ {
GtkWidget *dlg; GtkWidget *dlg;
GtkWidget *frame, *pframe; GtkWidget *vbox;
GtkWidget *abox; GtkWidget *frame;
GtkWidget *table; GtkWidget *table;
GtkWidget *preview;
IMG_PREVIEW *ip; IMG_PREVIEW *ip;
gint j; gint j;
gboolean run; gboolean run;
@ -547,54 +546,49 @@ dialog (gint32 drawable_ID)
NULL); NULL);
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox,
FALSE, FALSE, 0);
gtk_widget_show (vbox);
/* Preview */ /* Preview */
ip = img_preview_create_from_drawable (IMG_PRV_SIZE, drawable_ID); ip = img_preview_create_from_drawable (IMG_PRV_SIZE, drawable_ID);
if (ip) if (ip)
{ {
GtkWidget *hbox;
GtkWidget *preview;
plinterface.img_preview = ip; plinterface.img_preview = ip;
img_preview_copy (plinterface.img_preview, &(plinterface.map_preview)); img_preview_copy (plinterface.img_preview, &(plinterface.map_preview));
frame = gtk_frame_new (_("Preview")); hbox = gtk_hbox_new (FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (frame), 6); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame, gtk_widget_show (hbox);
FALSE, FALSE, 0);
abox = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); frame = gtk_frame_new (NULL);
gtk_container_set_border_width (GTK_CONTAINER (abox), 4); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
gtk_container_add (GTK_CONTAINER (frame), abox); gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
pframe = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (pframe), GTK_SHADOW_IN);
gtk_container_set_border_width (GTK_CONTAINER (pframe), 4);
gtk_container_add (GTK_CONTAINER (abox), pframe);
preview = gtk_preview_new (GTK_PREVIEW_COLOR); preview = gtk_preview_new (GTK_PREVIEW_COLOR);
plinterface.preview = preview; plinterface.preview = preview;
gtk_preview_size (GTK_PREVIEW (preview), ip->width, ip->height); gtk_preview_size (GTK_PREVIEW (preview), ip->width, ip->height);
gtk_container_add (GTK_CONTAINER (pframe), preview); gtk_container_add (GTK_CONTAINER (frame), preview);
gtk_widget_show (preview); gtk_widget_show (preview);
gtk_widget_show (pframe);
gtk_widget_show (abox);
gtk_widget_show (frame);
} }
for (j = 0; j < 2; j++) for (j = 0; j < 2; j++)
{ {
frame = gtk_frame_new ((j == 0) ? frame = gimp_frame_new ((j == 0) ?
_("Source color range") : _("Source color range") :
_("Destination color range")); _("Destination color range"));
gtk_container_set_border_width (GTK_CONTAINER (frame), 6); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame,
FALSE, FALSE, 0);
gtk_widget_show (frame); gtk_widget_show (frame);
/* The table keeps the color selections */ /* The table keeps the color selections */
table = gtk_table_new (1, 4, FALSE); table = gtk_table_new (1, 4, FALSE);
gtk_table_set_row_spacings (GTK_TABLE (table), 4); gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_table_set_col_spacing (GTK_TABLE (table), 1, 6);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_container_add (GTK_CONTAINER (frame), table); gtk_container_add (GTK_CONTAINER (frame), table);
gtk_widget_show (table); gtk_widget_show (table);
@ -633,7 +627,7 @@ add_color_button (gint csel_index,
GIMP_COLOR_AREA_FLAT); GIMP_COLOR_AREA_FLAT);
gimp_table_attach_aligned (GTK_TABLE (table), left + 1, top, gimp_table_attach_aligned (GTK_TABLE (table), left + 1, top,
(left == 0) ? _("From:") : _("To:"), (left == 0) ? _("From:") : _("To:"),
1.0, 0.5, 0.0, 0.5,
button, 1, TRUE); button, 1, TRUE);
g_signal_connect (button, "color_changed", g_signal_connect (button, "color_changed",

11
plug-ins/common/mblur.c
View File

@ -752,8 +752,8 @@ mblur_dialog (void)
NULL); NULL);
main_vbox = gtk_vbox_new (FALSE, 4); main_vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox); gtk_widget_show (main_vbox);
@ -770,14 +770,13 @@ mblur_dialog (void)
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame); gtk_widget_show (frame);
frame = gtk_frame_new (_("Blur Parameters")); frame = gimp_frame_new (_("Blur Parameters"));
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame); gtk_widget_show (frame);
table = gtk_table_new (2, 3, FALSE); table = gtk_table_new (2, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 4); gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_table_set_row_spacings (GTK_TABLE (table), 2); gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_container_add (GTK_CONTAINER (frame), table); gtk_container_add (GTK_CONTAINER (frame), table);
gtk_widget_show (table); gtk_widget_show (table);

29
plug-ins/common/mng.c
View File

@ -1193,15 +1193,14 @@ mng_save_dialog (gint32 image_id)
NULL); NULL);
main_vbox = gtk_vbox_new (FALSE, 4); main_vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dlg)->vbox), main_vbox); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dlg)->vbox), main_vbox);
frame = gtk_frame_new (_("MNG Options")); frame = gimp_frame_new (_("MNG Options"));
gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0);
vbox = gtk_vbox_new (FALSE, 4); vbox = gtk_vbox_new (FALSE, 6);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
gtk_container_add (GTK_CONTAINER (frame), vbox); gtk_container_add (GTK_CONTAINER (frame), vbox);
toggle = gtk_check_button_new_with_label (_("Interlace")); toggle = gtk_check_button_new_with_label (_("Interlace"));
@ -1259,9 +1258,8 @@ mng_save_dialog (gint32 image_id)
gtk_widget_show (toggle); gtk_widget_show (toggle);
table = gtk_table_new (2, 4, FALSE); table = gtk_table_new (2, 4, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 4); gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_table_set_row_spacings (GTK_TABLE (table), 2); gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
gtk_widget_show (table); gtk_widget_show (table);
@ -1287,7 +1285,7 @@ mng_save_dialog (gint32 image_id)
gtk_widget_set_sensitive (combo, FALSE); gtk_widget_set_sensitive (combo, FALSE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Default Chunks Type:"), 1.0, 0.5, _("Default Chunks Type:"), 0.0, 0.5,
combo, 1, FALSE); combo, 1, FALSE);
combo = gimp_int_combo_box_new (_("Combine"), DISPOSE_COMBINE, combo = gimp_int_combo_box_new (_("Combine"), DISPOSE_COMBINE,
@ -1302,7 +1300,7 @@ mng_save_dialog (gint32 image_id)
&mng_data.default_dispose); &mng_data.default_dispose);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Default Frame Disposal:"), 1.0, 0.5, _("Default Frame Disposal:"), 0.0, 0.5,
combo, 1, FALSE); combo, 1, FALSE);
scale_adj = gtk_adjustment_new (mng_data.compression_level, scale_adj = gtk_adjustment_new (mng_data.compression_level,
@ -1314,7 +1312,7 @@ mng_save_dialog (gint32 image_id)
gtk_scale_set_digits (GTK_SCALE (scale), 0); gtk_scale_set_digits (GTK_SCALE (scale), 0);
gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("PNG Compression Level:"), 1.0, 1.0, _("PNG Compression Level:"), 0.0, 0.9,
scale, 1, FALSE); scale, 1, FALSE);
g_signal_connect (scale_adj, "value_changed", g_signal_connect (scale_adj, "value_changed",
@ -1336,7 +1334,7 @@ mng_save_dialog (gint32 image_id)
gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);
gtk_widget_set_sensitive (scale, FALSE); gtk_widget_set_sensitive (scale, FALSE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 3, gimp_table_attach_aligned (GTK_TABLE (table), 0, 3,
_("JPEG Compression Quality:"), 1.0, 1.0, _("JPEG Compression Quality:"), 0.0, 0.9,
scale, 1, FALSE); scale, 1, FALSE);
g_signal_connect (scale_adj, "value_changed", g_signal_connect (scale_adj, "value_changed",
@ -1353,7 +1351,7 @@ mng_save_dialog (gint32 image_id)
gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED); gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);
gtk_widget_set_sensitive (scale, FALSE); gtk_widget_set_sensitive (scale, FALSE);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 4, gimp_table_attach_aligned (GTK_TABLE (table), 0, 4,
_("JPEG Smoothing Factor:"), 1.0, 1.0, _("JPEG Smoothing Factor:"), 0.0, 0.9,
scale, 1, FALSE); scale, 1, FALSE);
g_signal_connect (scale_adj, "value_changed", g_signal_connect (scale_adj, "value_changed",
@ -1363,11 +1361,10 @@ mng_save_dialog (gint32 image_id)
gtk_widget_show (vbox); gtk_widget_show (vbox);
gtk_widget_show (frame); gtk_widget_show (frame);
frame = gtk_frame_new (_("Animated MNG Options")); frame = gimp_frame_new (_("Animated MNG Options"));
gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0);
vbox = gtk_vbox_new (FALSE, 4); vbox = gtk_vbox_new (FALSE, 6);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
gtk_container_add (GTK_CONTAINER (frame), vbox); gtk_container_add (GTK_CONTAINER (frame), vbox);
toggle = gtk_check_button_new_with_label (_("Loop")); toggle = gtk_check_button_new_with_label (_("Loop"));

18
plug-ins/common/mosaic.c
View File

@ -517,21 +517,20 @@ mosaic_dialog (void)
NULL); NULL);
/* The main hbox -- splits the scripts and the info vbox */ /* The main hbox -- splits the scripts and the info vbox */
main_hbox = gtk_hbox_new (FALSE, 6); main_hbox = gtk_hbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 6); gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), main_hbox, gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), main_hbox,
TRUE, TRUE, 0); TRUE, TRUE, 0);
/* The vbox for first column of options */ /* The vbox for first column of options */
vbox = gtk_vbox_new (FALSE, 4); vbox = gtk_vbox_new (FALSE, 12);
gtk_box_pack_start (GTK_BOX (main_hbox), vbox, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (main_hbox), vbox, FALSE, FALSE, 0);
/* the vertical box and its toggle buttons */ /* the vertical box and its toggle buttons */
frame = gtk_frame_new (_("Options")); frame = gimp_frame_new (_("Options"));
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
toggle_vbox = gtk_vbox_new (FALSE, 1); toggle_vbox = gtk_vbox_new (FALSE, 6);
gtk_container_set_border_width (GTK_CONTAINER (toggle_vbox), 2);
gtk_container_add (GTK_CONTAINER (frame), toggle_vbox); gtk_container_add (GTK_CONTAINER (frame), toggle_vbox);
toggle = gtk_check_button_new_with_mnemonic (_("_Antialiasing")); toggle = gtk_check_button_new_with_mnemonic (_("_Antialiasing"));
@ -602,13 +601,12 @@ mosaic_dialog (void)
gtk_widget_show (vbox); gtk_widget_show (vbox);
/* parameter settings */ /* parameter settings */
frame = gtk_frame_new (_("Parameter Settings")); frame = gimp_frame_new (_("Settings"));
gtk_box_pack_start (GTK_BOX (main_hbox), frame, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (main_hbox), frame, TRUE, TRUE, 0);
table = gtk_table_new (6, 3, FALSE); table = gtk_table_new (6, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 4); gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_table_set_row_spacings (GTK_TABLE (table), 2); gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_container_add (GTK_CONTAINER (frame), table); gtk_container_add (GTK_CONTAINER (frame), table);
scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 0, scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 0,

74
plug-ins/common/newsprint.c
View File

@ -463,7 +463,7 @@ static void run (const gchar *name,
gint *nreturn_vals, gint *nreturn_vals,
GimpParam **return_vals); GimpParam **return_vals);
static gint newsprint_dialog (GimpDrawable *drawable); static gboolean newsprint_dialog (GimpDrawable *drawable);
static void newsprint_cspace_update (GtkWidget *widget, static void newsprint_cspace_update (GtkWidget *widget,
gpointer data); gpointer data);
@ -984,26 +984,29 @@ newsprint_defaults_callback (GtkWidget *widget,
static channel_st * static channel_st *
new_channel (const chan_tmpl *ct) new_channel (const chan_tmpl *ct)
{ {
GtkWidget *table; GtkSizeGroup *group;
GtkWidget *hbox; GtkWidget *table;
GtkWidget *hbox2; GtkWidget *hbox;
GtkWidget *abox; GtkWidget *hbox2;
GtkWidget *label; GtkWidget *abox;
spot_info_t *sf; GtkWidget *label;
channel_st *chst; spot_info_t *sf;
gint i; channel_st *chst;
gint i;
/* create the channel state record */ /* create the channel state record */
chst = new_preview (ct->spotfn); chst = new_preview (ct->spotfn);
chst->vbox = gtk_vbox_new (FALSE, 4); chst->vbox = gtk_vbox_new (FALSE, 6);
gtk_container_set_border_width (GTK_CONTAINER (chst->vbox), 4); gtk_container_set_border_width (GTK_CONTAINER (chst->vbox), 12);
table = gtk_table_new (1, 3, FALSE); table = gtk_table_new (1, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 4); gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_box_pack_start (GTK_BOX (chst->vbox), table, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (chst->vbox), table, FALSE, FALSE, 0);
gtk_widget_show (table); gtk_widget_show (table);
group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
/* angle slider */ /* angle slider */
chst->angle_adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 0, chst->angle_adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 0,
_("_Angle:"), SCALE_WIDTH, 0, _("_Angle:"), SCALE_WIDTH, 0,
@ -1013,6 +1016,9 @@ new_channel (const chan_tmpl *ct)
NULL, NULL); NULL, NULL);
g_object_set_data (G_OBJECT (chst->angle_adj), "angle", ct->angle); g_object_set_data (G_OBJECT (chst->angle_adj), "angle", ct->angle);
gtk_size_group_add_widget (group, GIMP_SCALE_ENTRY_LABEL (chst->angle_adj));
g_object_unref (group);
g_signal_connect (chst->angle_adj, "value_changed", g_signal_connect (chst->angle_adj, "value_changed",
G_CALLBACK (angle_callback), G_CALLBACK (angle_callback),
chst); chst);
@ -1026,15 +1032,17 @@ new_channel (const chan_tmpl *ct)
gtk_box_pack_start (GTK_BOX (hbox), abox, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), abox, FALSE, FALSE, 0);
gtk_widget_show (abox); gtk_widget_show (abox);
hbox2 = gtk_hbox_new (FALSE, 4); hbox2 = gtk_hbox_new (FALSE, 6);
gtk_container_add (GTK_CONTAINER (abox), hbox2); gtk_container_add (GTK_CONTAINER (abox), hbox2);
gtk_widget_show (hbox2); gtk_widget_show (hbox2);
label = gtk_label_new_with_mnemonic (_("_Spot Function:")); label = gtk_label_new_with_mnemonic (_("_Spot Function:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, FALSE, 0);
gtk_widget_show (label); gtk_widget_show (label);
gtk_size_group_add_widget (group, label);
chst->combo = gimp_int_combo_box_new (NULL, 0); chst->combo = gimp_int_combo_box_new (NULL, 0);
for (sf = spotfn_list, i = 0; sf->name; sf++, i++) for (sf = spotfn_list, i = 0; sf->name; sf++, i++)
@ -1138,7 +1146,7 @@ gen_channels (NewsprintDialog_st *st,
} }
static gint static gboolean
newsprint_dialog (GimpDrawable *drawable) newsprint_dialog (GimpDrawable *drawable)
{ {
/* widgets we need from callbacks stored here */ /* widgets we need from callbacks stored here */
@ -1186,21 +1194,22 @@ newsprint_dialog (GimpDrawable *drawable)
NULL); NULL);
main_vbox = gtk_vbox_new (FALSE, 4); main_vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (st.dlg)->vbox), main_vbox, gtk_box_pack_start (GTK_BOX (GTK_DIALOG (st.dlg)->vbox), main_vbox,
TRUE, TRUE, 0); TRUE, TRUE, 0);
gtk_widget_show (main_vbox); gtk_widget_show (main_vbox);
/* resolution settings */ /* resolution settings */
frame = gtk_frame_new (_("Resolution")); frame = gimp_frame_new (_("Resolution"));
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
table = gtk_table_new (3, 3, FALSE); table = gtk_table_new (3, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 4); gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_table_set_row_spacings (GTK_TABLE (table), 2); gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_container_add (GTK_CONTAINER (frame), table); gtk_container_add (GTK_CONTAINER (frame), table);
gtk_widget_show (table);
gimp_image_get_resolution (gimp_drawable_get_image (drawable->drawable_id), gimp_image_get_resolution (gimp_drawable_get_image (drawable->drawable_id),
&xres, &yres); &xres, &yres);
@ -1241,15 +1250,11 @@ newsprint_dialog (GimpDrawable *drawable)
G_CALLBACK (cellsize_callback), G_CALLBACK (cellsize_callback),
&st); &st);
gtk_widget_show (table);
gtk_widget_show (frame);
/* screen settings */ /* screen settings */
frame = gtk_frame_new (_("Screen")); frame = gimp_frame_new (_("Screen"));
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
st.vbox = gtk_vbox_new (FALSE, 4); st.vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (st.vbox), 4);
gtk_container_add (GTK_CONTAINER (frame), st.vbox); gtk_container_add (GTK_CONTAINER (frame), st.vbox);
/* optional portion begins */ /* optional portion begins */
@ -1257,13 +1262,11 @@ newsprint_dialog (GimpDrawable *drawable)
{ {
GtkWidget *hbox; GtkWidget *hbox;
GtkWidget *label; GtkWidget *label;
GtkWidget *sep;
GtkWidget *button; GtkWidget *button;
GtkWidget *toggle; GtkWidget *toggle;
st.pull_table = gtk_table_new (1, 3, FALSE); st.pull_table = gtk_table_new (1, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (st.pull_table), 4); gtk_table_set_col_spacings (GTK_TABLE (st.pull_table), 6);
gtk_table_set_row_spacings (GTK_TABLE (st.pull_table), 2);
/* black pullout */ /* black pullout */
st.pull = gimp_scale_entry_new (GTK_TABLE (st.pull_table), 0, 0, st.pull = gimp_scale_entry_new (GTK_TABLE (st.pull_table), 0, 0,
@ -1283,10 +1286,6 @@ newsprint_dialog (GimpDrawable *drawable)
hbox = gtk_hbox_new (FALSE, 6); hbox = gtk_hbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX (st.vbox), hbox, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (st.vbox), hbox, FALSE, FALSE, 0);
sep = gtk_hseparator_new ();
gtk_box_pack_start (GTK_BOX (st.vbox), sep, FALSE, FALSE, 0);
gtk_widget_show (sep);
/* pack the scaleentry table */ /* pack the scaleentry table */
gtk_box_pack_start (GTK_BOX (st.vbox), st.pull_table, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (st.vbox), st.pull_table, FALSE, FALSE, 0);
@ -1337,7 +1336,7 @@ newsprint_dialog (GimpDrawable *drawable)
/* channel lock & factory defaults button */ /* channel lock & factory defaults button */
hbox = gtk_hbutton_box_new (); hbox = gtk_hbutton_box_new ();
gtk_box_set_spacing (GTK_BOX (hbox), 10); gtk_box_set_spacing (GTK_BOX (hbox), 6);
gtk_box_pack_start (GTK_BOX (st.vbox), hbox, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (st.vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox); gtk_widget_show (hbox);
@ -1374,12 +1373,11 @@ newsprint_dialog (GimpDrawable *drawable)
gtk_widget_show (frame); gtk_widget_show (frame);
/* anti-alias control */ /* anti-alias control */
frame = gtk_frame_new (_("Antialiasing")); frame = gimp_frame_new (_("Antialiasing"));
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
table = gtk_table_new (1, 3, FALSE); table = gtk_table_new (1, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 4); gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_container_add (GTK_CONTAINER (frame), table); gtk_container_add (GTK_CONTAINER (frame), table);
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 0, adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 0,

37
plug-ins/common/oilify.c
View File

@ -62,7 +62,7 @@ static void run (const gchar *name,
static void oilify_rgb (GimpDrawable *drawable); static void oilify_rgb (GimpDrawable *drawable);
static void oilify_intensity (GimpDrawable *drawable); static void oilify_intensity (GimpDrawable *drawable);
static gint oilify_dialog (void); static gboolean oilify_dialog (void);
GimpPlugInInfo PLUG_IN_INFO = GimpPlugInInfo PLUG_IN_INFO =
@ -434,7 +434,6 @@ static gint
oilify_dialog (void) oilify_dialog (void)
{ {
GtkWidget *dlg; GtkWidget *dlg;
GtkWidget *frame;
GtkWidget *table; GtkWidget *table;
GtkWidget *toggle; GtkWidget *toggle;
GtkObject *adj; GtkObject *adj;
@ -451,29 +450,14 @@ oilify_dialog (void)
NULL); NULL);
/* parameter settings */
frame = gtk_frame_new (_("Parameter Settings"));
gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame, TRUE, TRUE, 0);
gtk_widget_show (frame);
table = gtk_table_new (2, 3, FALSE); table = gtk_table_new (2, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 4); gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_table_set_row_spacings (GTK_TABLE (table), 4); gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_container_set_border_width (GTK_CONTAINER (table), 4); gtk_container_set_border_width (GTK_CONTAINER (table), 12);
gtk_container_add (GTK_CONTAINER (frame), table); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), table, TRUE, TRUE, 0);
gtk_widget_show (table); gtk_widget_show (table);
toggle = gtk_check_button_new_with_mnemonic (_("_Use Intensity Algorithm")); adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 0,
gtk_table_attach (GTK_TABLE (table), toggle, 0, 3, 0, 1, GTK_FILL, 0, 0, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), ovals.mode);
gtk_widget_show (toggle);
g_signal_connect (toggle, "toggled",
G_CALLBACK (gimp_toggle_button_update),
&ovals.mode);
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1,
_("_Mask Size:"), SCALE_WIDTH, 0, _("_Mask Size:"), SCALE_WIDTH, 0,
ovals.mask_size, 3.0, 50.0, 1.0, 5.0, 0, ovals.mask_size, 3.0, 50.0, 1.0, 5.0, 0,
TRUE, 0, 0, TRUE, 0, 0,
@ -482,6 +466,15 @@ oilify_dialog (void)
G_CALLBACK (gimp_double_adjustment_update), G_CALLBACK (gimp_double_adjustment_update),
&ovals.mask_size); &ovals.mask_size);
toggle = gtk_check_button_new_with_mnemonic (_("_Use Intensity Algorithm"));
gtk_table_attach (GTK_TABLE (table), toggle, 0, 3, 1, 2, GTK_FILL, 0, 0, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), ovals.mode);
gtk_widget_show (toggle);
g_signal_connect (toggle, "toggled",
G_CALLBACK (gimp_toggle_button_update),
&ovals.mode);
gtk_widget_show (dlg); gtk_widget_show (dlg);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK); run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);