mirror of https://github.com/GNOME/gimp.git
plug-ins/gflare/gflare.c plug-ins/gfli/gfli.c
2004-05-21 Sven Neumann <sven@gimp.org> * plug-ins/gflare/gflare.c * plug-ins/gfli/gfli.c * plug-ins/ifscompose/ifscompose.c * plug-ins/sel2path/sel2path.c * plug-ins/sel2path/sel2path_adv_dialog.c * plug-ins/sgi/sgi.c * plug-ins/winicon/icodialog.c: HIG-ification.
This commit is contained in:
parent
eef3737606
commit
ebb19b59f1
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
|||
2004-05-21 Sven Neumann <sven@gimp.org>
|
||||
|
||||
* plug-ins/gflare/gflare.c
|
||||
* plug-ins/gfli/gfli.c
|
||||
* plug-ins/ifscompose/ifscompose.c
|
||||
* plug-ins/sel2path/sel2path.c
|
||||
* plug-ins/sel2path/sel2path_adv_dialog.c
|
||||
* plug-ins/sgi/sgi.c
|
||||
* plug-ins/winicon/icodialog.c: HIG-ification.
|
||||
|
||||
2004-05-21 Michael Natterer <mitch@gimp.org>
|
||||
|
||||
* app/actions/data-commands.c (data_delete_callback): eek, delete
|
||||
|
|
|
@ -434,7 +434,7 @@ static void calc_gflare_pix (guchar *dest_pix,
|
|||
gdouble y,
|
||||
guchar *src_pix);
|
||||
|
||||
static gint dlg_run (void);
|
||||
static gboolean dlg_run (void);
|
||||
static void dlg_preview_calc_window (void);
|
||||
static void ed_preview_calc_window (void);
|
||||
static GtkWidget * ed_mode_menu_new (GFlareMode *mode_var);
|
||||
|
@ -2264,7 +2264,7 @@ calc_overlay (guchar *dest, guchar *src1, guchar *src2)
|
|||
This is gflare main dialog, one which opens in first.
|
||||
*/
|
||||
|
||||
static gint
|
||||
static gboolean
|
||||
dlg_run (void)
|
||||
{
|
||||
GtkWidget *shell;
|
||||
|
@ -2310,8 +2310,8 @@ dlg_run (void)
|
|||
* main hbox
|
||||
*/
|
||||
|
||||
hbox = gtk_hbox_new (FALSE, 6);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
|
||||
hbox = gtk_hbox_new (FALSE, 12);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
|
||||
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (shell)->vbox), hbox,
|
||||
FALSE, FALSE, 0);
|
||||
gtk_widget_show (hbox);
|
||||
|
@ -2320,16 +2320,11 @@ dlg_run (void)
|
|||
* Preview
|
||||
*/
|
||||
|
||||
frame = gtk_frame_new (_("Preview"));
|
||||
gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
vbox = gtk_vbox_new (FALSE, 2);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
|
||||
gtk_container_add (GTK_CONTAINER (frame), vbox);
|
||||
vbox = gtk_vbox_new (FALSE, 6);
|
||||
gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
|
||||
gtk_widget_show (vbox);
|
||||
|
||||
abox = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
|
||||
abox = gtk_alignment_new (0.0, 0.0, 0.0, 0.0);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), abox, TRUE, TRUE, 0);
|
||||
gtk_widget_show (abox);
|
||||
|
||||
|
@ -2631,10 +2626,10 @@ dlg_make_page_settings (GFlareDialog *dlg,
|
|||
gdouble xres, yres;
|
||||
gint row;
|
||||
|
||||
main_vbox = gtk_vbox_new (FALSE, 4);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 4);
|
||||
main_vbox = gtk_vbox_new (FALSE, 12);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
|
||||
|
||||
frame = gtk_frame_new (_("Center"));
|
||||
frame = gimp_frame_new (_("Center"));
|
||||
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
|
@ -2656,7 +2651,6 @@ dlg_make_page_settings (GFlareDialog *dlg,
|
|||
|
||||
chain = GTK_WIDGET (GIMP_COORDINATES_CHAINBUTTON (center));
|
||||
|
||||
gtk_container_set_border_width (GTK_CONTAINER (center), 4);
|
||||
gtk_container_add (GTK_CONTAINER (frame), center);
|
||||
g_signal_connect (center, "value_changed",
|
||||
G_CALLBACK (dlg_position_entry_callback),
|
||||
|
@ -2667,14 +2661,13 @@ dlg_make_page_settings (GFlareDialog *dlg,
|
|||
gtk_widget_hide (chain);
|
||||
gtk_widget_show (center);
|
||||
|
||||
frame = gtk_frame_new (_("Parameters"));
|
||||
frame = gimp_frame_new (_("Parameters"));
|
||||
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
table = gtk_table_new (5, 3, FALSE);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
|
||||
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
|
||||
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
|
||||
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
|
||||
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
|
||||
gtk_container_add (GTK_CONTAINER (frame), table);
|
||||
gtk_widget_show (table);
|
||||
|
||||
|
@ -2747,7 +2740,7 @@ dlg_make_page_settings (GFlareDialog *dlg,
|
|||
**/
|
||||
|
||||
/* asupsample frame */
|
||||
frame = dlg->asupsample_frame = gtk_frame_new (NULL);
|
||||
frame = dlg->asupsample_frame = gimp_frame_new (NULL);
|
||||
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
|
@ -2758,9 +2751,8 @@ dlg_make_page_settings (GFlareDialog *dlg,
|
|||
gtk_widget_show (button);
|
||||
|
||||
asup_table = gtk_table_new (2, 3, FALSE);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (asup_table), 4);
|
||||
gtk_table_set_col_spacings (GTK_TABLE (asup_table), 4);
|
||||
gtk_table_set_row_spacings (GTK_TABLE (asup_table), 2);
|
||||
gtk_table_set_col_spacings (GTK_TABLE (asup_table), 6);
|
||||
gtk_table_set_row_spacings (GTK_TABLE (asup_table), 6);
|
||||
gtk_container_add (GTK_CONTAINER (frame), asup_table);
|
||||
gtk_widget_show (asup_table);
|
||||
|
||||
|
@ -2853,8 +2845,8 @@ dlg_make_page_selector (GFlareDialog *dlg,
|
|||
|
||||
DEBUG_PRINT (("dlg_make_page_selector\n"));
|
||||
|
||||
vbox = gtk_vbox_new (FALSE, 4);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
|
||||
vbox = gtk_vbox_new (FALSE, 12);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
|
||||
|
||||
/*
|
||||
* List Box
|
||||
|
@ -2880,7 +2872,7 @@ dlg_make_page_selector (GFlareDialog *dlg,
|
|||
* The buttons for the possible listbox operations
|
||||
*/
|
||||
|
||||
hbox = gtk_hbox_new (FALSE, 4);
|
||||
hbox = gtk_hbox_new (FALSE, 6);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
|
||||
gtk_widget_show (hbox);
|
||||
|
||||
|
@ -3228,8 +3220,8 @@ ed_run (GtkWindow *parent,
|
|||
* main hbox
|
||||
*/
|
||||
|
||||
hbox = gtk_hbox_new (FALSE, 6);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
|
||||
hbox = gtk_hbox_new (FALSE, 12);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
|
||||
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (shell)->vbox), hbox,
|
||||
FALSE, FALSE, 0);
|
||||
gtk_widget_show (hbox);
|
||||
|
@ -3238,13 +3230,8 @@ ed_run (GtkWindow *parent,
|
|||
* Preview
|
||||
*/
|
||||
|
||||
frame = gtk_frame_new (_("Preview"));
|
||||
gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
abox = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (abox), 4);
|
||||
gtk_container_add (GTK_CONTAINER (frame), abox);
|
||||
abox = gtk_alignment_new (0.0, 0.0, 0.0, 0.0);
|
||||
gtk_box_pack_start (GTK_BOX (hbox), abox, FALSE, FALSE, 0);
|
||||
gtk_widget_show (abox);
|
||||
|
||||
frame = gtk_frame_new (NULL);
|
||||
|
@ -3330,19 +3317,18 @@ ed_make_page_general (GFlareEditor *ed,
|
|||
GtkWidget *combo;
|
||||
GtkObject *adj;
|
||||
|
||||
vbox = gtk_vbox_new (FALSE, 4);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
|
||||
vbox = gtk_vbox_new (FALSE, 12);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
|
||||
|
||||
/* Glow */
|
||||
|
||||
frame = gtk_frame_new (_("Glow Paint Options"));
|
||||
frame = gimp_frame_new (_("Glow Paint Options"));
|
||||
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
table = gtk_table_new (2, 3, FALSE);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
|
||||
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
|
||||
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
|
||||
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
|
||||
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
|
||||
gtk_container_add (GTK_CONTAINER (frame), table);
|
||||
gtk_widget_show (table);
|
||||
|
||||
|
@ -3360,18 +3346,17 @@ ed_make_page_general (GFlareEditor *ed,
|
|||
|
||||
combo = ed_mode_menu_new (&gflare->glow_mode);
|
||||
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
|
||||
_("Paint Mode:"), 1.0, 0.5, combo, 1, TRUE);
|
||||
_("Paint Mode:"), 0.0, 0.5, combo, 1, FALSE);
|
||||
|
||||
/* Rays */
|
||||
|
||||
frame = gtk_frame_new (_("Rays Paint Options"));
|
||||
frame = gimp_frame_new (_("Rays Paint Options"));
|
||||
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
table = gtk_table_new (2, 3, FALSE);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
|
||||
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
|
||||
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
|
||||
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
|
||||
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
|
||||
gtk_container_add (GTK_CONTAINER (frame), table);
|
||||
gtk_widget_show (table);
|
||||
|
||||
|
@ -3389,18 +3374,17 @@ ed_make_page_general (GFlareEditor *ed,
|
|||
|
||||
combo = ed_mode_menu_new (&gflare->rays_mode);
|
||||
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
|
||||
_("Paint Mode:"), 1.0, 0.5, combo, 1, TRUE);
|
||||
_("Paint Mode:"), 0.0, 0.5, combo, 1, FALSE);
|
||||
|
||||
/* Rays */
|
||||
|
||||
frame = gtk_frame_new (_("Second Flares Paint Options"));
|
||||
frame = gimp_frame_new (_("Second Flares Paint Options"));
|
||||
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
table = gtk_table_new (2, 3, FALSE);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
|
||||
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
|
||||
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
|
||||
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
|
||||
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
|
||||
gtk_container_add (GTK_CONTAINER (frame), table);
|
||||
gtk_widget_show (table);
|
||||
|
||||
|
@ -3418,7 +3402,7 @@ ed_make_page_general (GFlareEditor *ed,
|
|||
|
||||
combo = ed_mode_menu_new (&gflare->sflare_mode);
|
||||
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
|
||||
_("Paint Mode:"), 1.0, 0.5, combo, 1, TRUE);
|
||||
_("Paint Mode:"), 0.0, 0.5, combo, 1, FALSE);
|
||||
|
||||
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox,
|
||||
gtk_label_new_with_mnemonic (_("_General")));
|
||||
|
@ -3440,21 +3424,20 @@ ed_make_page_glow (GFlareEditor *ed,
|
|||
GtkObject *adj;
|
||||
gint row;
|
||||
|
||||
vbox = gtk_vbox_new (FALSE, 4);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
|
||||
vbox = gtk_vbox_new (FALSE, 12);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
|
||||
|
||||
/*
|
||||
* Gradient Menus
|
||||
*/
|
||||
|
||||
frame = gtk_frame_new (_("Gradients"));
|
||||
frame = gimp_frame_new (_("Gradients"));
|
||||
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
table = gtk_table_new (3, 3, FALSE);
|
||||
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
|
||||
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
|
||||
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
|
||||
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
|
||||
gtk_container_add (GTK_CONTAINER (frame), table);
|
||||
|
||||
gm = gradient_menu_new ((GradientMenuCallback) &ed_gradient_menu_callback,
|
||||
|
@ -3475,14 +3458,13 @@ ed_make_page_glow (GFlareEditor *ed,
|
|||
* Scales
|
||||
*/
|
||||
|
||||
frame = gtk_frame_new (_("Parameters"));
|
||||
frame = gimp_frame_new (_("Parameters"));
|
||||
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
table = gtk_table_new (3, 3, FALSE);
|
||||
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
|
||||
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
|
||||
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
|
||||
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
|
||||
gtk_container_add (GTK_CONTAINER (frame), table);
|
||||
|
||||
row = 0;
|
||||
|
@ -3545,21 +3527,20 @@ ed_make_page_rays (GFlareEditor *ed,
|
|||
GtkObject *adj;
|
||||
gint row;
|
||||
|
||||
vbox = gtk_vbox_new (FALSE, 4);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
|
||||
vbox = gtk_vbox_new (FALSE, 12);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
|
||||
|
||||
/*
|
||||
* Gradient Menus
|
||||
*/
|
||||
|
||||
frame = gtk_frame_new (_("Gradients"));
|
||||
frame = gimp_frame_new (_("Gradients"));
|
||||
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
table = gtk_table_new (3, 3, FALSE);
|
||||
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
|
||||
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
|
||||
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
|
||||
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
|
||||
gtk_container_add (GTK_CONTAINER (frame), table);
|
||||
|
||||
row = 0;
|
||||
|
@ -3582,14 +3563,13 @@ ed_make_page_rays (GFlareEditor *ed,
|
|||
* Scales
|
||||
*/
|
||||
|
||||
frame = gtk_frame_new (_("Parameters"));
|
||||
frame = gimp_frame_new (_("Parameters"));
|
||||
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
table = gtk_table_new (5, 3, FALSE);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
|
||||
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
|
||||
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
|
||||
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
|
||||
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
|
||||
gtk_container_add (GTK_CONTAINER (frame), table);
|
||||
|
||||
row = 0;
|
||||
|
@ -3686,21 +3666,20 @@ ed_make_page_sflare (GFlareEditor *ed,
|
|||
gchar buf[256];
|
||||
gint row;
|
||||
|
||||
vbox = gtk_vbox_new (FALSE, 4);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
|
||||
vbox = gtk_vbox_new (FALSE, 12);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
|
||||
|
||||
/*
|
||||
* Gradient Menus
|
||||
*/
|
||||
|
||||
frame = gtk_frame_new (_("Gradients"));
|
||||
frame = gimp_frame_new (_("Gradients"));
|
||||
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
table = gtk_table_new (3, 3, FALSE);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
|
||||
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
|
||||
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
|
||||
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
|
||||
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
|
||||
gtk_container_add (GTK_CONTAINER (frame), table);
|
||||
|
||||
gm = gradient_menu_new ((GradientMenuCallback) &ed_gradient_menu_callback,
|
||||
|
@ -3721,14 +3700,13 @@ ed_make_page_sflare (GFlareEditor *ed,
|
|||
* Scales
|
||||
*/
|
||||
|
||||
frame = gtk_frame_new (_("Parameters"));
|
||||
frame = gimp_frame_new (_("Parameters"));
|
||||
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
table = gtk_table_new (3, 3, FALSE);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
|
||||
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
|
||||
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
|
||||
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
|
||||
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
|
||||
gtk_container_add (GTK_CONTAINER (frame), table);
|
||||
|
||||
row = 0;
|
||||
|
@ -3776,12 +3754,11 @@ ed_make_page_sflare (GFlareEditor *ed,
|
|||
* Shape Radio Button Frame
|
||||
*/
|
||||
|
||||
frame = gtk_frame_new (_("Shape of Second Flares"));
|
||||
frame = gimp_frame_new (_("Shape of Second Flares"));
|
||||
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
shape_vbox = gtk_vbox_new (FALSE, 1);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (shape_vbox), 4);
|
||||
shape_vbox = gtk_vbox_new (FALSE, 2);
|
||||
gtk_container_add (GTK_CONTAINER (frame), shape_vbox);
|
||||
gtk_widget_show (shape_vbox);
|
||||
|
||||
|
@ -3797,7 +3774,7 @@ ed_make_page_sflare (GFlareEditor *ed,
|
|||
gtk_box_pack_start (GTK_BOX (shape_vbox), toggle, FALSE, FALSE, 0);
|
||||
gtk_widget_show (toggle);
|
||||
|
||||
polygon_hbox = gtk_hbox_new (FALSE, 4);
|
||||
polygon_hbox = gtk_hbox_new (FALSE, 6);
|
||||
gtk_box_pack_start (GTK_BOX (shape_vbox), polygon_hbox, FALSE, FALSE, 0);
|
||||
gtk_widget_show (polygon_hbox);
|
||||
|
||||
|
@ -3831,7 +3808,7 @@ ed_make_page_sflare (GFlareEditor *ed,
|
|||
* Random Seed Entry
|
||||
*/
|
||||
|
||||
seed_hbox = gtk_hbox_new (FALSE, 4);
|
||||
seed_hbox = gtk_hbox_new (FALSE, 6);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), seed_hbox, FALSE, FALSE, 0);
|
||||
gtk_widget_show (seed_hbox);
|
||||
|
||||
|
@ -4917,9 +4894,10 @@ gradient_report (void)
|
|||
{
|
||||
double total = (double) get_values_external_clock / CLOCKS_PER_SEC;
|
||||
|
||||
printf ("gradient_get_values_external %.2f sec. / %d times (ave %.2f sec.)\n",
|
||||
total,
|
||||
get_values_external_count,
|
||||
total / get_values_external_count);
|
||||
g_printerr ("gradient_get_values_external "
|
||||
"%.2f sec. / %d times (ave %.2f sec.)\n",
|
||||
total,
|
||||
get_values_external_count,
|
||||
total / get_values_external_count);
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -67,31 +67,29 @@
|
|||
#include "libgimp/stdplugins-intl.h"
|
||||
|
||||
|
||||
static void query (void);
|
||||
static void run (const gchar *name,
|
||||
gint nparams,
|
||||
const GimpParam *param,
|
||||
gint *nreturn_vals,
|
||||
GimpParam **return_vals);
|
||||
static void query (void);
|
||||
static void run (const gchar *name,
|
||||
gint nparams,
|
||||
const GimpParam *param,
|
||||
gint *nreturn_vals,
|
||||
GimpParam **return_vals);
|
||||
|
||||
/* return the image-ID of the new image, or -1 in case of an error */
|
||||
static gint32 load_image (const gchar *filename,
|
||||
gint32 from_frame,
|
||||
gint32 to_frame);
|
||||
static gint load_dialog (const gchar *name);
|
||||
static gint32 load_image (const gchar *filename,
|
||||
gint32 from_frame,
|
||||
gint32 to_frame);
|
||||
static gboolean load_dialog (const gchar *name);
|
||||
|
||||
/* return TRUE or FALSE */
|
||||
static gint save_image (const gchar *filename,
|
||||
gint32 image_id,
|
||||
gint32 from_frame,
|
||||
gint32 to_frame);
|
||||
static gint save_dialog (gint32 image_id);
|
||||
static gboolean save_image (const gchar *filename,
|
||||
gint32 image_id,
|
||||
gint32 from_frame,
|
||||
gint32 to_frame);
|
||||
static gboolean save_dialog (gint32 image_id);
|
||||
|
||||
/* return TRUE or FALSE */
|
||||
static gint get_info (const gchar *filename,
|
||||
gint32 *width,
|
||||
gint32 *height,
|
||||
gint32 *frames);
|
||||
static gboolean get_info (const gchar *filename,
|
||||
gint32 *width,
|
||||
gint32 *height,
|
||||
gint32 *frames);
|
||||
|
||||
/*
|
||||
* GIMP interface
|
||||
|
@ -411,7 +409,7 @@ run (const gchar *name,
|
|||
/*
|
||||
* Open FLI animation and return header-info
|
||||
*/
|
||||
gint
|
||||
static gboolean
|
||||
get_info (const gchar *filename,
|
||||
gint32 *width,
|
||||
gint32 *height,
|
||||
|
@ -442,7 +440,7 @@ get_info (const gchar *filename,
|
|||
/*
|
||||
* load fli animation and store as framestack
|
||||
*/
|
||||
gint32
|
||||
static gint32
|
||||
load_image (const gchar *filename,
|
||||
gint32 from_frame,
|
||||
gint32 to_frame)
|
||||
|
@ -579,7 +577,7 @@ load_image (const gchar *filename,
|
|||
* get framestack and store as fli animation
|
||||
* (some code was taken from the GIF plugin.)
|
||||
*/
|
||||
gint
|
||||
static gboolean
|
||||
save_image (const gchar *filename,
|
||||
gint32 image_id,
|
||||
gint32 from_frame,
|
||||
|
@ -796,7 +794,7 @@ save_image (const gchar *filename,
|
|||
/*
|
||||
* Dialogs for interactive usage
|
||||
*/
|
||||
gint
|
||||
static gboolean
|
||||
load_dialog (const gchar *name)
|
||||
{
|
||||
GtkWidget *dialog;
|
||||
|
@ -823,9 +821,9 @@ load_dialog (const gchar *name)
|
|||
NULL);
|
||||
|
||||
table = gtk_table_new (2, 2, FALSE);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (table), 6);
|
||||
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
|
||||
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (table), 12);
|
||||
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
|
||||
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
|
||||
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), table,
|
||||
FALSE, FALSE, 0);
|
||||
gtk_widget_show (table);
|
||||
|
@ -837,7 +835,7 @@ load_dialog (const 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, 0,
|
||||
_("From:"), 1.0, 0.5,
|
||||
_("From:"), 0.0, 0.5,
|
||||
spinbutton, 1, TRUE);
|
||||
g_signal_connect (adj, "value_changed",
|
||||
G_CALLBACK (gimp_int_adjustment_update),
|
||||
|
@ -846,7 +844,7 @@ load_dialog (const gchar *name)
|
|||
spinbutton = gimp_spin_button_new (&adj,
|
||||
to_frame, 1, nframes, 1, 10, 0, 1, 0);
|
||||
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
|
||||
_("To:"), 1.0, 0.5,
|
||||
_("To:"), 0.0, 0.5,
|
||||
spinbutton, 1, TRUE);
|
||||
g_signal_connect (adj, "value_changed",
|
||||
G_CALLBACK (gimp_int_adjustment_update),
|
||||
|
@ -861,7 +859,7 @@ load_dialog (const gchar *name)
|
|||
return run;
|
||||
}
|
||||
|
||||
gint
|
||||
static gboolean
|
||||
save_dialog (gint32 image_id)
|
||||
{
|
||||
GtkWidget *dialog;
|
||||
|
@ -886,11 +884,11 @@ save_dialog (gint32 image_id)
|
|||
NULL);
|
||||
|
||||
table = gtk_table_new (2, 2, FALSE);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (table), 6);
|
||||
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
|
||||
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
|
||||
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), table,
|
||||
FALSE, FALSE, 0);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (table), 12);
|
||||
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
|
||||
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
|
||||
gtk_box_pack_start (GTK_BOX(GTK_DIALOG (dialog)->vbox), table,
|
||||
FALSE, FALSE, 0);
|
||||
gtk_widget_show (table);
|
||||
|
||||
/*
|
||||
|
@ -900,7 +898,7 @@ 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, 0,
|
||||
_("From:"), 1.0, 0.5,
|
||||
_("From:"), 0.0, 0.5,
|
||||
spinbutton, 1, TRUE);
|
||||
g_signal_connect (adj, "value_changed",
|
||||
G_CALLBACK (gimp_int_adjustment_update),
|
||||
|
@ -909,7 +907,7 @@ save_dialog (gint32 image_id)
|
|||
spinbutton = gimp_spin_button_new (&adj,
|
||||
to_frame, 1, nframes, 1, 10, 0, 1, 0);
|
||||
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
|
||||
_("To:"), 1.0, 0.5,
|
||||
_("To:"), 0.0, 0.5,
|
||||
spinbutton, 1, TRUE);
|
||||
g_signal_connect (adj, "value_changed",
|
||||
G_CALLBACK (gimp_int_adjustment_update),
|
||||
|
|
|
@ -539,7 +539,7 @@ ifs_compose_trans_page (void)
|
|||
GtkWidget *table;
|
||||
GtkWidget *label;
|
||||
|
||||
vbox = gtk_vbox_new (FALSE, 0);
|
||||
vbox = gtk_vbox_new (FALSE, 12);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
|
||||
|
||||
table = gtk_table_new (3, 6, FALSE);
|
||||
|
@ -657,7 +657,7 @@ ifs_compose_color_page (void)
|
|||
GSList *group = NULL;
|
||||
GimpRGB color;
|
||||
|
||||
vbox = gtk_vbox_new (FALSE, 0);
|
||||
vbox = gtk_vbox_new (FALSE, 12);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
|
||||
|
||||
table = gtk_table_new (3, 5, FALSE);
|
||||
|
@ -1271,9 +1271,8 @@ ifs_options_dialog (void)
|
|||
/* Table of options */
|
||||
|
||||
table = gtk_table_new (4, 3, FALSE);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (table), 6);
|
||||
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
|
||||
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
|
||||
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
|
||||
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
|
||||
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (ifsOptD->dialog)->vbox), table,
|
||||
FALSE, FALSE, 0);
|
||||
gtk_widget_show (table);
|
||||
|
|
|
@ -317,7 +317,7 @@ sel2path_dialog (SELVALS *sels)
|
|||
NULL);
|
||||
|
||||
table = dialog_create_selection_area (sels);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (table), 6);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (table), 12);
|
||||
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dlg)->vbox), table);
|
||||
gtk_widget_show (table);
|
||||
|
||||
|
|
|
@ -90,8 +90,8 @@ dialog_create_selection_area (SELVALS *sels)
|
|||
gint row;
|
||||
|
||||
table = gtk_table_new (20, 3, FALSE);
|
||||
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
|
||||
gtk_table_set_col_spacings (GTK_TABLE (table), 2);
|
||||
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
|
||||
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
|
||||
row = 0;
|
||||
|
||||
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, row++,
|
||||
|
@ -381,8 +381,5 @@ dialog_create_selection_area (SELVALS *sels)
|
|||
adjust_widgets = g_slist_append (adjust_widgets, adj);
|
||||
g_object_set_data (G_OBJECT (adj), "default_value", def_val (3.0));
|
||||
|
||||
return GTK_WIDGET (table);
|
||||
return table;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -70,7 +70,7 @@ static gint save_image (const gchar *filename,
|
|||
gint32 image_ID,
|
||||
gint32 drawable_ID);
|
||||
|
||||
static gint save_dialog (void);
|
||||
static gboolean save_dialog (void);
|
||||
|
||||
/*
|
||||
* Globals...
|
||||
|
@ -609,7 +609,7 @@ save_image (const gchar *filename,
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
static gint
|
||||
static gboolean
|
||||
save_dialog (void)
|
||||
{
|
||||
GtkWidget *dlg;
|
||||
|
@ -638,7 +638,7 @@ save_dialog (void)
|
|||
|
||||
NULL);
|
||||
|
||||
gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (frame), 12);
|
||||
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame, TRUE, TRUE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
|
|
|
@ -172,7 +172,7 @@ ico_create_icon_hbox (GtkWidget *icon_preview,
|
|||
GtkWidget *hbox;
|
||||
GtkWidget *combo;
|
||||
|
||||
hbox = gtk_hbox_new (FALSE, 0);
|
||||
hbox = gtk_hbox_new (FALSE, 6);
|
||||
|
||||
/* To make life easier for the callbacks, we store the
|
||||
layer's ID and stacking number with the hbox. */
|
||||
|
@ -238,15 +238,14 @@ ico_specs_dialog_new (gint num_layers)
|
|||
|
||||
vbox = GTK_DIALOG (dialog)->vbox;
|
||||
|
||||
frame = gtk_frame_new (_("Icon details"));
|
||||
frame = gimp_frame_new (_("Icon details"));
|
||||
gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (frame), 5);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (frame), 12);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
|
||||
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
|
||||
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (scrolledwindow), 5);
|
||||
gtk_container_add (GTK_CONTAINER (frame), scrolledwindow);
|
||||
gtk_widget_show (scrolledwindow);
|
||||
|
||||
|
@ -254,7 +253,7 @@ ico_specs_dialog_new (gint num_layers)
|
|||
gtk_container_add (GTK_CONTAINER (scrolledwindow), viewport);
|
||||
gtk_widget_show (viewport);
|
||||
|
||||
vbox = gtk_vbox_new (TRUE, 0);
|
||||
vbox = gtk_vbox_new (TRUE, 6);
|
||||
g_object_set_data (G_OBJECT (dialog), "icons_vbox", vbox);
|
||||
gtk_container_add (GTK_CONTAINER (viewport), vbox);
|
||||
gtk_widget_show (vbox);
|
||||
|
|
Loading…
Reference in New Issue