[gimp/gtk3-port: 358/391] common: kill GtkTable in a ton of plugins
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gtk3-port: 358/391] common: kill GtkTable in a ton of plugins
- Date: Thu, 10 May 2018 16:20:45 +0000 (UTC)
commit 3af18e804fe22bee1f640d87522367c28d02d11b
Author: Simon Budig <simon budig de>
Date: Sun May 6 00:35:26 2018 +0200
common: kill GtkTable in a ton of plugins
plug-ins/common/blinds.c | 34 +++++++++---------
plug-ins/common/cartoon.c | 32 +++++++++---------
plug-ins/common/colorify.c | 21 +++++------
plug-ins/common/compose.c | 30 ++++++++--------
plug-ins/common/contrast-retinex.c | 46 ++++++++++++------------
plug-ins/common/despeckle.c | 42 +++++++++++-----------
plug-ins/common/destripe.c | 20 +++++-----
plug-ins/common/edge-neon.c | 34 +++++++++---------
plug-ins/common/emboss.c | 42 +++++++++++-----------
plug-ins/common/file-csource.c | 44 ++++++++++++------------
plug-ins/common/file-gbr.c | 28 ++++++++--------
plug-ins/common/file-jp2-load.c | 18 +++++-----
plug-ins/common/file-mng.c | 42 +++++++++++-----------
plug-ins/common/file-pat.c | 20 +++++-----
plug-ins/common/file-xpm.c | 24 ++++++------
plug-ins/common/fractal-trace.c | 64 +++++++++++++++++-----------------
plug-ins/common/nl-filter.c | 34 +++++++++---------
plug-ins/common/photocopy.c | 52 ++++++++++++++--------------
plug-ins/common/qbist.c | 17 ++++-----
plug-ins/common/sharpen.c | 24 ++++++------
plug-ins/common/softglow.c | 42 +++++++++++-----------
plug-ins/common/unsharp-mask.c | 42 +++++++++++-----------
plug-ins/common/wavelet-decompose.c | 24 ++++++------
23 files changed, 386 insertions(+), 390 deletions(-)
---
diff --git a/plug-ins/common/blinds.c b/plug-ins/common/blinds.c
index e842c7f..54f498e 100644
--- a/plug-ins/common/blinds.c
+++ b/plug-ins/common/blinds.c
@@ -209,7 +209,7 @@ blinds_dialog (GimpDrawable *drawable)
GtkWidget *preview;
GtkWidget *hbox;
GtkWidget *frame;
- GtkWidget *table;
+ GtkWidget *grid;
GtkAdjustment *size_data;
GtkWidget *toggle;
GtkWidget *horizontal;
@@ -297,17 +297,17 @@ blinds_dialog (GimpDrawable *drawable)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), FALSE);
}
- table = gtk_table_new (2, 3, FALSE);
- gtk_table_set_col_spacings (GTK_TABLE (table), 6);
- gtk_table_set_row_spacings (GTK_TABLE (table), 2);
- gtk_box_pack_start (GTK_BOX (main_vbox), table, FALSE, FALSE, 0);
- gtk_widget_show (table);
-
- size_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 0,
- _("_Displacement:"), SCALE_WIDTH, 0,
- bvals.angledsp, 1, 90, 1, 15, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ grid = gtk_grid_new ();
+ gtk_grid_set_row_spacing (GTK_GRID (grid), 2);
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
+ gtk_box_pack_start (GTK_BOX (main_vbox), grid, FALSE, FALSE, 0);
+ gtk_widget_show (grid);
+
+ size_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
+ _("_Displacement:"), SCALE_WIDTH, 0,
+ bvals.angledsp, 1, 90, 1, 15, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (size_data, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
&bvals.angledsp);
@@ -315,11 +315,11 @@ blinds_dialog (GimpDrawable *drawable)
G_CALLBACK (gimp_preview_invalidate),
preview);
- size_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 1,
- _("_Number of segments:"), SCALE_WIDTH, 0,
- bvals.numsegs, 1, MAX_FANS, 1, 2, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ size_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
+ _("_Number of segments:"), SCALE_WIDTH, 0,
+ bvals.numsegs, 1, MAX_FANS, 1, 2, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (size_data, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
&bvals.numsegs);
diff --git a/plug-ins/common/cartoon.c b/plug-ins/common/cartoon.c
index dd6c5b4..b202668 100644
--- a/plug-ins/common/cartoon.c
+++ b/plug-ins/common/cartoon.c
@@ -800,7 +800,7 @@ cartoon_dialog (GimpDrawable *drawable)
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *preview;
- GtkWidget *table;
+ GtkWidget *grid;
GtkAdjustment *scale_data;
gboolean run;
@@ -836,18 +836,18 @@ cartoon_dialog (GimpDrawable *drawable)
G_CALLBACK (cartoon),
drawable);
- table = gtk_table_new (3, 3, FALSE);
- gtk_table_set_col_spacings (GTK_TABLE (table), 6);
- gtk_table_set_row_spacings (GTK_TABLE (table), 6);
- gtk_box_pack_start (GTK_BOX (main_vbox), table, FALSE, FALSE, 0);
- gtk_widget_show (table);
+ grid = gtk_grid_new ();
+ gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
+ gtk_box_pack_start (GTK_BOX (main_vbox), grid, FALSE, FALSE, 0);
+ gtk_widget_show (grid);
/* Label, scale, entry for cvals.amount */
- scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 0,
- _("_Mask radius:"), 100, 5,
- cvals.mask_radius, 1.0, 50.0, 1, 5.0, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ scale_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
+ _("_Mask radius:"), 100, 5,
+ cvals.mask_radius, 1.0, 50.0, 1, 5.0, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (scale_data, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
@@ -857,11 +857,11 @@ cartoon_dialog (GimpDrawable *drawable)
preview);
/* Label, scale, entry for cvals.amount */
- scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 1,
- _("_Percent black:"), 50, 5,
- cvals.pct_black, 0.0, 1.0, 0.01, 0.1, 3,
- TRUE, 0, 0,
- NULL, NULL);
+ scale_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
+ _("_Percent black:"), 50, 5,
+ cvals.pct_black, 0.0, 1.0, 0.01, 0.1, 3,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (scale_data, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
diff --git a/plug-ins/common/colorify.c b/plug-ins/common/colorify.c
index cb117dc..f1327b6 100644
--- a/plug-ins/common/colorify.c
+++ b/plug-ins/common/colorify.c
@@ -243,7 +243,7 @@ colorify_dialog (GimpDrawable *drawable)
GtkWidget *preview;
GtkWidget *label;
GtkWidget *button;
- GtkWidget *table;
+ GtkWidget *grid;
GtkWidget *color_area;
gint i;
gboolean run;
@@ -279,15 +279,14 @@ colorify_dialog (GimpDrawable *drawable)
G_CALLBACK (colorify),
drawable);
- table = gtk_table_new (2, 7, TRUE);
- gtk_table_set_row_spacings (GTK_TABLE (table), 6);
- gtk_table_set_col_spacings (GTK_TABLE (table), 6);
- gtk_box_pack_start (GTK_BOX (main_vbox), table, FALSE, FALSE, 0);
- gtk_widget_show (table);
+ grid = gtk_grid_new ();
+ gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
+ gtk_box_pack_start (GTK_BOX (main_vbox), grid, FALSE, FALSE, 0);
+ gtk_widget_show (grid);
label = gtk_label_new (_("Custom color:"));
- gtk_table_attach (GTK_TABLE (table), label, 4, 6, 0, 1,
- GTK_FILL, GTK_FILL, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 4, 0, 2, 1);
gtk_widget_show (label);
custom_color_button = gimp_color_button_new (_("Colorify Custom Color"),
@@ -301,8 +300,7 @@ colorify_dialog (GimpDrawable *drawable)
G_CALLBACK (gimp_preview_invalidate),
preview);
- gtk_table_attach (GTK_TABLE (table), custom_color_button, 6, 7, 0, 1,
- GTK_FILL, GTK_FILL, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), custom_color_button, 6, 0, 1, 1);
gtk_widget_show (custom_color_button);
for (i = 0; i < 7; i++)
@@ -319,8 +317,7 @@ colorify_dialog (GimpDrawable *drawable)
&button_color[i]);
gtk_widget_show (color_area);
- gtk_table_attach (GTK_TABLE (table), button, i, i + 1, 1, 2,
- GTK_FILL, GTK_FILL, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), button, i, 1, 1, 1);
gtk_widget_show (button);
}
diff --git a/plug-ins/common/compose.c b/plug-ins/common/compose.c
index e53a79e..4bea7b8 100644
--- a/plug-ins/common/compose.c
+++ b/plug-ins/common/compose.c
@@ -1042,7 +1042,7 @@ compose_dialog (const gchar *compose_type,
GtkWidget *hbox;
GtkWidget *label;
GtkWidget *combo;
- GtkWidget *table;
+ GtkWidget *grid;
GtkSizeGroup *size_group;
gint32 *layer_list;
gint nlayers;
@@ -1137,7 +1137,7 @@ compose_dialog (const gchar *compose_type,
gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
- /* Channel representation table */
+ /* Channel representation grid */
frame = gimp_frame_new (_("Channel Representations"));
gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0);
@@ -1147,11 +1147,11 @@ compose_dialog (const gchar *compose_type,
gtk_container_add (GTK_CONTAINER (frame), vbox);
gtk_widget_show (vbox);
- table = gtk_table_new (MAX_COMPOSE_IMAGES, 4, FALSE);
- gtk_table_set_row_spacings (GTK_TABLE (table), 6);
- gtk_table_set_col_spacings (GTK_TABLE (table), 6);
- gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
- gtk_widget_show (table);
+ grid = gtk_grid_new ();
+ gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
+ gtk_box_pack_start (GTK_BOX (vbox), grid, FALSE, FALSE, 0);
+ gtk_widget_show (grid);
for (j = 0; j < MAX_COMPOSE_IMAGES; j++)
{
@@ -1164,8 +1164,8 @@ compose_dialog (const gchar *compose_type,
GdkPixbuf *ico;
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
- gtk_table_attach (GTK_TABLE (table), hbox, 0, 1, j, j + 1,
- GTK_FILL, GTK_FILL, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), hbox, 0, j, 1, 1);
+ // GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (hbox);
gtk_size_group_add_widget (size_group, hbox);
@@ -1206,16 +1206,16 @@ compose_dialog (const gchar *compose_type,
GIMP_INT_STORE_PIXBUF, ico,
-1);
g_object_unref (ico);
- gtk_table_attach (GTK_TABLE (table), combo, 1, 2, j, j + 1,
- GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), combo, 1, j, 1, 1);
+ // GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_widget_show (combo);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
- scale = gimp_color_scale_entry_new (GTK_TABLE (table), 2, j, NULL,
- 100, 4,
- 255.0, 0.0, 255.0, 1.0, 10.0, 0,
- NULL, NULL);
+ scale = gimp_color_scale_entry_new_grid (GTK_GRID (grid), 2, j, NULL,
+ 100, 4,
+ 255.0, 0.0, 255.0, 1.0, 10.0, 0,
+ NULL, NULL);
composeint.color_scales[j] = GIMP_SCALE_ENTRY_SCALE (scale);
composeint.color_spins[j] = GIMP_SCALE_ENTRY_SPINBUTTON (scale);
diff --git a/plug-ins/common/contrast-retinex.c b/plug-ins/common/contrast-retinex.c
index 64fa150..3cbbb1e 100644
--- a/plug-ins/common/contrast-retinex.c
+++ b/plug-ins/common/contrast-retinex.c
@@ -275,7 +275,7 @@ retinex_dialog (GimpDrawable *drawable)
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *preview;
- GtkWidget *table;
+ GtkWidget *grid;
GtkWidget *combo;
GtkAdjustment *adj;
gboolean run;
@@ -312,11 +312,11 @@ retinex_dialog (GimpDrawable *drawable)
G_CALLBACK (retinex),
drawable);
- table = gtk_table_new (4, 3, FALSE);
- gtk_table_set_col_spacings (GTK_TABLE (table), 6);
- gtk_table_set_row_spacings (GTK_TABLE (table), 6);
- gtk_box_pack_start (GTK_BOX (main_vbox), table, FALSE, FALSE, 0);
- gtk_widget_show (table);
+ grid = gtk_grid_new ();
+ gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
+ gtk_box_pack_start (GTK_BOX (main_vbox), grid, FALSE, FALSE, 0);
+ gtk_widget_show (grid);
combo = gimp_int_combo_box_new (_("Uniform"), filter_uniform,
_("Low"), filter_low,
@@ -330,16 +330,16 @@ retinex_dialog (GimpDrawable *drawable)
G_CALLBACK (gimp_preview_invalidate),
preview);
- gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
- _("_Level:"), 0.0, 0.5,
- combo, 2, FALSE);
+ gimp_grid_attach_aligned (GTK_GRID (grid), 0, 0,
+ _("_Level:"), 0.0, 0.5,
+ combo, 2);
gtk_widget_show (combo);
- adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1,
- _("_Scale:"), SCALE_WIDTH, ENTRY_WIDTH,
- rvals.scale,
- MIN_GAUSSIAN_SCALE, MAX_GAUSSIAN_SCALE, 1, 1, 0,
- TRUE, 0, 0, NULL, NULL);
+ adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
+ _("_Scale:"), SCALE_WIDTH, ENTRY_WIDTH,
+ rvals.scale,
+ MIN_GAUSSIAN_SCALE, MAX_GAUSSIAN_SCALE, 1, 1, 0,
+ TRUE, 0, 0, NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
@@ -348,11 +348,11 @@ retinex_dialog (GimpDrawable *drawable)
G_CALLBACK (gimp_preview_invalidate),
preview);
- adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 2,
- _("Scale _division:"), SCALE_WIDTH, ENTRY_WIDTH,
- rvals.nscales,
- 0, MAX_RETINEX_SCALES, 1, 1, 0,
- TRUE, 0, 0, NULL, NULL);
+ adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 2,
+ _("Scale _division:"), SCALE_WIDTH, ENTRY_WIDTH,
+ rvals.nscales,
+ 0, MAX_RETINEX_SCALES, 1, 1, 0,
+ TRUE, 0, 0, NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
@@ -361,10 +361,10 @@ retinex_dialog (GimpDrawable *drawable)
G_CALLBACK (gimp_preview_invalidate),
preview);
- adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 3,
- _("Dy_namic:"), SCALE_WIDTH, ENTRY_WIDTH,
- rvals.cvar, 0, 4, 0.1, 0.1, 1,
- TRUE, 0, 0, NULL, NULL);
+ adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 3,
+ _("Dy_namic:"), SCALE_WIDTH, ENTRY_WIDTH,
+ rvals.cvar, 0, 4, 0.1, 0.1, 1,
+ TRUE, 0, 0, NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_float_adjustment_update),
diff --git a/plug-ins/common/despeckle.c b/plug-ins/common/despeckle.c
index e25a3f0..873bbb5 100644
--- a/plug-ins/common/despeckle.c
+++ b/plug-ins/common/despeckle.c
@@ -430,7 +430,7 @@ despeckle_dialog (void)
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *vbox;
- GtkWidget *table;
+ GtkWidget *grid;
GtkWidget *frame;
GtkWidget *button;
GtkAdjustment *adj;
@@ -496,21 +496,21 @@ despeckle_dialog (void)
G_CALLBACK (dialog_recursive_callback),
NULL);
- table = gtk_table_new (4, 3, FALSE);
- gtk_table_set_col_spacings (GTK_TABLE (table), 6);
- gtk_table_set_row_spacings (GTK_TABLE (table), 6);
- gtk_box_pack_start (GTK_BOX (main_vbox), table, FALSE, FALSE, 0);
- gtk_widget_show (table);
+ grid = gtk_grid_new ();
+ gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
+ gtk_box_pack_start (GTK_BOX (main_vbox), grid, FALSE, FALSE, 0);
+ gtk_widget_show (grid);
/*
* Box size (diameter) control...
*/
- adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 0,
- _("_Radius:"), SCALE_WIDTH, ENTRY_WIDTH,
- despeckle_radius, 1, MAX_RADIUS, 1, 5, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
+ _("_Radius:"), SCALE_WIDTH, ENTRY_WIDTH,
+ despeckle_radius, 1, MAX_RADIUS, 1, 5, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
&despeckle_radius);
@@ -522,11 +522,11 @@ despeckle_dialog (void)
* Black level control...
*/
- adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1,
- _("_Black level:"), SCALE_WIDTH, ENTRY_WIDTH,
- black_level, -1, 255, 1, 8, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
+ _("_Black level:"), SCALE_WIDTH, ENTRY_WIDTH,
+ black_level, -1, 255, 1, 8, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
&black_level);
@@ -538,11 +538,11 @@ despeckle_dialog (void)
* White level control...
*/
- adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 2,
- _("_White level:"), SCALE_WIDTH, ENTRY_WIDTH,
- white_level, 0, 256, 1, 8, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 2,
+ _("_White level:"), SCALE_WIDTH, ENTRY_WIDTH,
+ white_level, 0, 256, 1, 8, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
&white_level);
diff --git a/plug-ins/common/destripe.c b/plug-ins/common/destripe.c
index efff865..1dd47e6 100644
--- a/plug-ins/common/destripe.c
+++ b/plug-ins/common/destripe.c
@@ -430,7 +430,7 @@ destripe_dialog (GimpDrawable *drawable)
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *preview;
- GtkWidget *table;
+ GtkWidget *grid;
GtkWidget *button;
GtkAdjustment *adj;
gboolean run;
@@ -467,16 +467,16 @@ destripe_dialog (GimpDrawable *drawable)
G_CALLBACK (destripe),
drawable);
- table = gtk_table_new (1, 3, FALSE);
- gtk_table_set_col_spacings (GTK_TABLE (table), 6);
- gtk_box_pack_start (GTK_BOX (main_vbox), table, FALSE, FALSE, 0);
- gtk_widget_show (table);
+ grid = gtk_grid_new ();
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
+ gtk_box_pack_start (GTK_BOX (main_vbox), grid, FALSE, FALSE, 0);
+ gtk_widget_show (grid);
- adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1,
- _("_Width:"), SCALE_WIDTH, 0,
- vals.avg_width, 2, MAX_AVG, 1, 10, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
+ _("_Width:"), SCALE_WIDTH, 0,
+ vals.avg_width, 2, MAX_AVG, 1, 10, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
&vals.avg_width);
diff --git a/plug-ins/common/edge-neon.c b/plug-ins/common/edge-neon.c
index 4d47644..9d40605 100644
--- a/plug-ins/common/edge-neon.c
+++ b/plug-ins/common/edge-neon.c
@@ -687,7 +687,7 @@ neon_dialog (GimpDrawable *drawable)
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *preview;
- GtkWidget *table;
+ GtkWidget *grid;
GtkAdjustment *scale_data;
gboolean run;
@@ -723,19 +723,19 @@ neon_dialog (GimpDrawable *drawable)
G_CALLBACK (neon_preview_update),
drawable);
- table = gtk_table_new (2, 3, FALSE);
- gtk_table_set_col_spacings (GTK_TABLE (table), 6);
- gtk_table_set_row_spacings (GTK_TABLE (table), 6);
- gtk_box_pack_start (GTK_BOX (main_vbox), table, FALSE, FALSE, 0);
- gtk_widget_show (table);
+ grid = gtk_grid_new ();
+ gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
+ gtk_box_pack_start (GTK_BOX (main_vbox), grid, FALSE, FALSE, 0);
+ gtk_widget_show (grid);
/* Label, scale, entry for evals.radius */
- scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 0,
- _("_Radius:"), 100, 8,
- evals.radius, 0.0, 64.0, 1, 10, 2,
- FALSE, 0.0,
- 8 * MAX (drawable->width, drawable->height),
- NULL, NULL);
+ scale_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
+ _("_Radius:"), 100, 8,
+ evals.radius, 0.0, 64.0, 1, 10, 2,
+ FALSE, 0.0,
+ 8 * MAX (drawable->width, drawable->height),
+ NULL, NULL);
g_signal_connect (scale_data, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
@@ -745,11 +745,11 @@ neon_dialog (GimpDrawable *drawable)
preview);
/* Label, scale, entry for evals.amount */
- scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 1,
- _("_Amount:"), 100, 8,
- evals.amount, 0.0, 1.0, 0.01, 0.1, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ scale_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
+ _("_Amount:"), 100, 8,
+ evals.amount, 0.0, 1.0, 0.01, 0.1, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (scale_data, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
diff --git a/plug-ins/common/emboss.c b/plug-ins/common/emboss.c
index a634e7b..5ade7be 100644
--- a/plug-ins/common/emboss.c
+++ b/plug-ins/common/emboss.c
@@ -440,7 +440,7 @@ emboss_dialog (GimpDrawable *drawable)
GtkWidget *radio1;
GtkWidget *radio2;
GtkWidget *frame;
- GtkWidget *table;
+ GtkWidget *grid;
GtkAdjustment *adj;
gboolean run;
@@ -494,16 +494,16 @@ emboss_dialog (GimpDrawable *drawable)
G_CALLBACK (gimp_preview_invalidate),
preview);
- table = gtk_table_new (3, 3, FALSE);
- gtk_table_set_col_spacings (GTK_TABLE (table), 6);
- gtk_table_set_row_spacings (GTK_TABLE (table), 6);
- gtk_box_pack_start (GTK_BOX (main_vbox), table, FALSE, FALSE, 0);
+ grid = gtk_grid_new ();
+ gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
+ gtk_box_pack_start (GTK_BOX (main_vbox), grid, FALSE, FALSE, 0);
- adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 0,
- _("_Azimuth:"), 100, 6,
- evals.azimuth, 0.0, 360.0, 1.0, 10.0, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
+ _("_Azimuth:"), 100, 6,
+ evals.azimuth, 0.0, 360.0, 1.0, 10.0, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&evals.azimuth);
@@ -511,11 +511,11 @@ emboss_dialog (GimpDrawable *drawable)
G_CALLBACK (gimp_preview_invalidate),
preview);
- adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1,
- _("E_levation:"), 100, 6,
- evals.elevation, 0.0, 180.0, 1.0, 10.0, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
+ _("E_levation:"), 100, 6,
+ evals.elevation, 0.0, 180.0, 1.0, 10.0, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&evals.elevation);
@@ -523,11 +523,11 @@ emboss_dialog (GimpDrawable *drawable)
G_CALLBACK (gimp_preview_invalidate),
preview);
- adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 2,
- _("_Depth:"), 100, 6,
- evals.depth, 1.0, 100.0, 1.0, 5.0, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 2,
+ _("_Depth:"), 100, 6,
+ evals.depth, 1.0, 100.0, 1.0, 5.0, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
&evals.depth);
@@ -535,7 +535,7 @@ emboss_dialog (GimpDrawable *drawable)
G_CALLBACK (gimp_preview_invalidate),
preview);
- gtk_widget_show (table);
+ gtk_widget_show (grid);
gtk_widget_show (dialog);
diff --git a/plug-ins/common/file-csource.c b/plug-ins/common/file-csource.c
index 97b50ec..1a4ad8f 100644
--- a/plug-ins/common/file-csource.c
+++ b/plug-ins/common/file-csource.c
@@ -875,7 +875,7 @@ run_save_dialog (Config *config)
{
GtkWidget *dialog;
GtkWidget *vbox;
- GtkWidget *table;
+ GtkWidget *grid;
GtkWidget *prefixed_name;
GtkWidget *centry;
GtkWidget *toggle;
@@ -891,27 +891,27 @@ run_save_dialog (Config *config)
vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);
- table = gtk_table_new (2, 2, FALSE);
- gtk_table_set_col_spacings (GTK_TABLE (table), 6);
- gtk_table_set_row_spacings (GTK_TABLE (table), 6);
- gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
- gtk_widget_show (table);
+ grid = gtk_grid_new ();
+ gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
+ gtk_box_pack_start (GTK_BOX (vbox), grid, FALSE, FALSE, 0);
+ gtk_widget_show (grid);
/* Prefixed Name
*/
prefixed_name = gtk_entry_new ();
- gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
- _("_Prefixed name:"), 0.0, 0.5,
- prefixed_name, 1, FALSE);
+ gimp_grid_attach_aligned (GTK_GRID (grid), 0, 0,
+ _("_Prefixed name:"), 0.0, 0.5,
+ prefixed_name, 1);
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), 0, 1,
- _("Co_mment:"), 0.0, 0.5,
- centry, 1, FALSE);
+ gimp_grid_attach_aligned (GTK_GRID (grid), 0, 1,
+ _("Co_mment:"), 0.0, 0.5,
+ centry, 1);
gtk_entry_set_text (GTK_ENTRY (centry),
config->comment ? config->comment : "");
@@ -996,16 +996,16 @@ run_save_dialog (Config *config)
/* Max Alpha Value
*/
- table = gtk_table_new (1, 3, FALSE);
- gtk_table_set_col_spacings (GTK_TABLE (table), 4);
- gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
- gtk_widget_show (table);
-
- adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 0,
- _("Op_acity:"), 100, 0,
- config->opacity, 0, 100, 1, 10, 1,
- TRUE, 0, 0,
- NULL, NULL);
+ grid = gtk_grid_new ();
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 4);
+ gtk_box_pack_start (GTK_BOX (vbox), grid, FALSE, FALSE, 0);
+ gtk_widget_show (grid);
+
+ adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
+ _("Op_acity:"), 100, 0,
+ config->opacity, 0, 100, 1, 10, 1,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&config->opacity);
diff --git a/plug-ins/common/file-gbr.c b/plug-ins/common/file-gbr.c
index 92fbcfc..d5ce848 100644
--- a/plug-ins/common/file-gbr.c
+++ b/plug-ins/common/file-gbr.c
@@ -791,7 +791,7 @@ static gboolean
save_dialog (void)
{
GtkWidget *dialog;
- GtkWidget *table;
+ GtkWidget *grid;
GtkWidget *entry;
GtkWidget *spinbutton;
GtkAdjustment *adj;
@@ -799,22 +799,22 @@ save_dialog (void)
dialog = gimp_export_dialog_new (_("Brush"), PLUG_IN_BINARY, SAVE_PROC);
- /* The main table */
- table = gtk_table_new (2, 2, FALSE);
- 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);
+ /* The main grid */
+ grid = gtk_grid_new ();
+ gtk_container_set_border_width (GTK_CONTAINER (grid), 12);
+ gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
gtk_box_pack_start (GTK_BOX (gimp_export_dialog_get_content_area (dialog)),
- table, TRUE, TRUE, 0);
- gtk_widget_show (table);
+ grid, TRUE, TRUE, 0);
+ gtk_widget_show (grid);
entry = gtk_entry_new ();
gtk_entry_set_width_chars (GTK_ENTRY (entry), 20);
gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
gtk_entry_set_text (GTK_ENTRY (entry), info.description);
- gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
- _("Description:"), 1.0, 0.5,
- entry, 1, FALSE);
+ gimp_grid_attach_aligned (GTK_GRID (grid), 0, 0,
+ _("Description:"), 1.0, 0.5,
+ entry, 1);
g_signal_connect (entry, "changed",
G_CALLBACK (entry_callback),
@@ -824,9 +824,9 @@ save_dialog (void)
spinbutton = gtk_spin_button_new (adj, 1.0, 0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
gtk_entry_set_activates_default (GTK_ENTRY (spinbutton), TRUE);
- gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
- _("Spacing:"), 1.0, 0.5,
- spinbutton, 1, TRUE);
+ gimp_grid_attach_aligned (GTK_GRID (grid), 0, 1,
+ _("Spacing:"), 1.0, 0.5,
+ spinbutton, 1);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
diff --git a/plug-ins/common/file-jp2-load.c b/plug-ins/common/file-jp2-load.c
index 3e46778..f4a7f28 100644
--- a/plug-ins/common/file-jp2-load.c
+++ b/plug-ins/common/file-jp2-load.c
@@ -929,7 +929,7 @@ open_dialog (const gchar *filename,
const gchar *title;
GtkWidget *dialog;
GtkWidget *main_vbox;
- GtkWidget *table;
+ GtkWidget *grid;
GtkWidget *combo = NULL;
OPJ_COLOR_SPACE color_space = OPJ_CLRSPC_SRGB;
@@ -962,11 +962,11 @@ open_dialog (const gchar *filename,
main_vbox, TRUE, TRUE, 0);
gtk_widget_show (main_vbox);
- table = gtk_table_new (4, 3, FALSE);
- gtk_table_set_col_spacings (GTK_TABLE (table), 6);
- gtk_table_set_row_spacings (GTK_TABLE (table), 4);
- gtk_container_add (GTK_CONTAINER (main_vbox), table);
- gtk_widget_show (table);
+ grid = gtk_grid_new ();
+ gtk_grid_set_row_spacing (GTK_GRID (grid), 4);
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
+ gtk_container_add (GTK_CONTAINER (main_vbox), grid);
+ gtk_widget_show (grid);
if (num_components == 3)
{
@@ -996,9 +996,9 @@ open_dialog (const gchar *filename,
if (combo)
{
- gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
- _("Color space:"), 0.0, 0.5,
- combo, 2, FALSE);
+ gimp_grid_attach_aligned (GTK_GRID (grid), 0, 0,
+ _("Color space:"), 0.0, 0.5,
+ combo, 2);
gtk_widget_show (combo);
g_signal_connect (combo, "changed",
diff --git a/plug-ins/common/file-mng.c b/plug-ins/common/file-mng.c
index 72e9492..cff30e1 100644
--- a/plug-ins/common/file-mng.c
+++ b/plug-ins/common/file-mng.c
@@ -1322,7 +1322,7 @@ mng_save_dialog (gint32 image_id)
GtkWidget *main_vbox;
GtkWidget *frame;
GtkWidget *vbox;
- GtkWidget *table;
+ GtkWidget *grid;
GtkWidget *toggle;
GtkWidget *hbox;
GtkWidget *combo;
@@ -1401,11 +1401,11 @@ mng_save_dialog (gint32 image_id)
gtk_widget_show (toggle);
- table = gtk_table_new (2, 4, FALSE);
- gtk_table_set_col_spacings (GTK_TABLE (table), 6);
- gtk_table_set_row_spacings (GTK_TABLE (table), 6);
- gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
- gtk_widget_show (table);
+ grid = gtk_grid_new ();
+ gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
+ gtk_box_pack_start (GTK_BOX (vbox), grid, FALSE, FALSE, 0);
+ gtk_widget_show (grid);
gimp_image_get_layers (image_id, &num_layers);
@@ -1428,9 +1428,9 @@ mng_save_dialog (gint32 image_id)
&mng_data.default_chunks);
gtk_widget_set_sensitive (combo, FALSE);
- gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
- _("Default chunks type:"), 0.0, 0.5,
- combo, 1, FALSE);
+ gimp_grid_attach_aligned (GTK_GRID (grid), 0, 0,
+ _("Default chunks type:"), 0.0, 0.5,
+ combo, 1);
combo = gimp_int_combo_box_new (_("Combine"), DISPOSE_COMBINE,
_("Replace"), DISPOSE_REPLACE,
@@ -1443,9 +1443,9 @@ mng_save_dialog (gint32 image_id)
G_CALLBACK (gimp_int_combo_box_get_active),
&mng_data.default_dispose);
- gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
- _("Default frame disposal:"), 0.0, 0.5,
- combo, 1, FALSE);
+ gimp_grid_attach_aligned (GTK_GRID (grid), 0, 1,
+ _("Default frame disposal:"), 0.0, 0.5,
+ combo, 1);
scale_adj = gtk_adjustment_new (mng_data.compression_level,
0.0, 9.0, 1.0, 1.0, 0.0);
@@ -1454,9 +1454,9 @@ mng_save_dialog (gint32 image_id)
gtk_widget_set_size_request (scale, SCALE_WIDTH, -1);
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gtk_scale_set_digits (GTK_SCALE (scale), 0);
- gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
- _("PNG compression level:"), 0.0, 0.9,
- scale, 1, FALSE);
+ gimp_grid_attach_aligned (GTK_GRID (grid), 0, 2,
+ _("PNG compression level:"), 0.0, 0.9,
+ scale, 1);
g_signal_connect (scale_adj, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
@@ -1475,9 +1475,9 @@ mng_save_dialog (gint32 image_id)
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gtk_scale_set_digits (GTK_SCALE (scale), 2);
gtk_widget_set_sensitive (scale, FALSE);
- gimp_table_attach_aligned (GTK_TABLE (table), 0, 3,
- _("JPEG compression quality:"), 0.0, 0.9,
- scale, 1, FALSE);
+ gimp_grid_attach_aligned (GTK_GRID (grid), 0, 3,
+ _("JPEG compression quality:"), 0.0, 0.9,
+ scale, 1);
g_signal_connect (scale_adj, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
@@ -1491,9 +1491,9 @@ mng_save_dialog (gint32 image_id)
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gtk_scale_set_digits (GTK_SCALE (scale), 2);
gtk_widget_set_sensitive (scale, FALSE);
- gimp_table_attach_aligned (GTK_TABLE (table), 0, 4,
- _("JPEG smoothing factor:"), 0.0, 0.9,
- scale, 1, FALSE);
+ gimp_grid_attach_aligned (GTK_GRID (grid), 0, 4,
+ _("JPEG smoothing factor:"), 0.0, 0.9,
+ scale, 1);
g_signal_connect (scale_adj, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
diff --git a/plug-ins/common/file-pat.c b/plug-ins/common/file-pat.c
index 8e70a32..3d161a2 100644
--- a/plug-ins/common/file-pat.c
+++ b/plug-ins/common/file-pat.c
@@ -602,27 +602,27 @@ static gboolean
save_dialog (void)
{
GtkWidget *dialog;
- GtkWidget *table;
+ GtkWidget *grid;
GtkWidget *entry;
gboolean run;
dialog = gimp_export_dialog_new (_("Pattern"), PLUG_IN_BINARY, SAVE_PROC);
- /* The main table */
- table = gtk_table_new (1, 2, FALSE);
- gtk_table_set_col_spacings (GTK_TABLE (table), 6);
- gtk_container_set_border_width (GTK_CONTAINER (table), 12);
+ /* The main grid */
+ grid = gtk_grid_new ();
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
+ gtk_container_set_border_width (GTK_CONTAINER (grid), 12);
gtk_box_pack_start (GTK_BOX (gimp_export_dialog_get_content_area (dialog)),
- table, TRUE, TRUE, 0);
- gtk_widget_show (table);
+ grid, TRUE, TRUE, 0);
+ gtk_widget_show (grid);
entry = gtk_entry_new ();
gtk_entry_set_width_chars (GTK_ENTRY (entry), 20);
gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
gtk_entry_set_text (GTK_ENTRY (entry), description);
- gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
- _("Description:"), 1.0, 0.5,
- entry, 1, FALSE);
+ gimp_grid_attach_aligned (GTK_GRID (grid), 0, 0,
+ _("Description:"), 1.0, 0.5,
+ entry, 1);
gtk_widget_show (entry);
gtk_widget_show (dialog);
diff --git a/plug-ins/common/file-xpm.c b/plug-ins/common/file-xpm.c
index c5af924..2f072d3 100644
--- a/plug-ins/common/file-xpm.c
+++ b/plug-ins/common/file-xpm.c
@@ -825,24 +825,24 @@ static gboolean
save_dialog (void)
{
GtkWidget *dialog;
- GtkWidget *table;
+ GtkWidget *grid;
GtkAdjustment *scale_data;
gboolean run;
dialog = gimp_export_dialog_new (_("XPM"), PLUG_IN_BINARY, SAVE_PROC);
- table = gtk_table_new (1, 3, FALSE);
- gtk_table_set_col_spacings (GTK_TABLE (table), 6);
- gtk_container_set_border_width (GTK_CONTAINER (table), 12);
+ grid = gtk_grid_new ();
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
+ gtk_container_set_border_width (GTK_CONTAINER (grid), 12);
gtk_box_pack_start (GTK_BOX (gimp_export_dialog_get_content_area (dialog)),
- table, TRUE, TRUE, 0);
- gtk_widget_show (table);
-
- scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 0,
- _("_Alpha threshold:"), SCALE_WIDTH, 0,
- xpmvals.threshold, 0, 255, 1, 8, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ grid, TRUE, TRUE, 0);
+ gtk_widget_show (grid);
+
+ scale_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
+ _("_Alpha threshold:"), SCALE_WIDTH, 0,
+ xpmvals.threshold, 0, 255, 1, 8, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (scale_data, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
diff --git a/plug-ins/common/fractal-trace.c b/plug-ins/common/fractal-trace.c
index 5de9e6f..3535656 100644
--- a/plug-ins/common/fractal-trace.c
+++ b/plug-ins/common/fractal-trace.c
@@ -696,7 +696,7 @@ dialog_show (void)
GtkWidget *dialog;
GtkWidget *mainbox;
GtkWidget *hbox;
- GtkWidget *table;
+ GtkWidget *grid;
GtkWidget *frame;
GtkWidget *abox;
GtkAdjustment *adj;
@@ -767,53 +767,53 @@ dialog_show (void)
gtk_box_pack_start (GTK_BOX (mainbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
- table = gtk_table_new (5, 3, FALSE);
- 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);
-
- adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 0,
- _("X_1:"), 0, 6,
- parameters.x1, -50, 50, 0.1, 0.5, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ grid = gtk_grid_new ();
+ gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
+ gtk_container_add (GTK_CONTAINER (frame), grid);
+ gtk_widget_show (grid);
+
+ adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
+ _("X_1:"), 0, 6,
+ parameters.x1, -50, 50, 0.1, 0.5, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (dialog_double_adjustment_update),
¶meters.x1);
- adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1,
- _("X_2:"), 0, 6,
- parameters.x2, -50, 50, 0.1, 0.5, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
+ _("X_2:"), 0, 6,
+ parameters.x2, -50, 50, 0.1, 0.5, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (dialog_double_adjustment_update),
¶meters.x2);
- adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 2,
- _("Y_1:"), 0, 6,
- parameters.y1, -50, 50, 0.1, 0.5, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 2,
+ _("Y_1:"), 0, 6,
+ parameters.y1, -50, 50, 0.1, 0.5, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (dialog_double_adjustment_update),
¶meters.y1);
- adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 3,
- _("Y_2:"), 0, 6,
- parameters.y2, -50, 50, 0.1, 0.5, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 3,
+ _("Y_2:"), 0, 6,
+ parameters.y2, -50, 50, 0.1, 0.5, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (dialog_double_adjustment_update),
¶meters.y2);
- adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 4,
- _("_Depth:"), 0, 6,
- parameters.depth, 1, 50, 1, 5, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 4,
+ _("_Depth:"), 0, 6,
+ parameters.depth, 1, 50, 1, 5, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (dialog_int_adjustment_update),
¶meters.depth);
diff --git a/plug-ins/common/nl-filter.c b/plug-ins/common/nl-filter.c
index 7bd4160..4abade9 100644
--- a/plug-ins/common/nl-filter.c
+++ b/plug-ins/common/nl-filter.c
@@ -1008,7 +1008,7 @@ nlfilter_dialog (GimpDrawable *drawable)
GtkWidget *alpha_trim;
GtkWidget *opt_est;
GtkWidget *edge_enhance;
- GtkWidget *table;
+ GtkWidget *grid;
GtkAdjustment *adj;
gboolean run;
@@ -1070,17 +1070,17 @@ nlfilter_dialog (GimpDrawable *drawable)
G_CALLBACK (gimp_preview_invalidate),
preview);
- table = gtk_table_new (2, 3, FALSE);
- gtk_table_set_col_spacings (GTK_TABLE (table), 6);
- gtk_table_set_row_spacings (GTK_TABLE (table), 6);
- gtk_box_pack_start (GTK_BOX (main_vbox), table, FALSE, FALSE, 0);
- gtk_widget_show (table);
-
- adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 0,
- _("A_lpha:"), 0, 0,
- nlfvals.alpha, 0.0, 1.0, 0.05, 0.1, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ grid = gtk_grid_new ();
+ gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
+ gtk_box_pack_start (GTK_BOX (main_vbox), grid, FALSE, FALSE, 0);
+ gtk_widget_show (grid);
+
+ adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
+ _("A_lpha:"), 0, 0,
+ nlfvals.alpha, 0.0, 1.0, 0.05, 0.1, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&nlfvals.alpha);
@@ -1088,11 +1088,11 @@ nlfilter_dialog (GimpDrawable *drawable)
G_CALLBACK (gimp_preview_invalidate),
preview);
- adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1,
- _("_Radius:"), 0, 0,
- nlfvals.radius, 1.0 / 3.0, 1.0, 0.05, 0.1, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
+ _("_Radius:"), 0, 0,
+ nlfvals.radius, 1.0 / 3.0, 1.0, 0.05, 0.1, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&nlfvals.radius);
diff --git a/plug-ins/common/photocopy.c b/plug-ins/common/photocopy.c
index 05cc289..dd7aa98 100644
--- a/plug-ins/common/photocopy.c
+++ b/plug-ins/common/photocopy.c
@@ -827,7 +827,7 @@ photocopy_dialog (GimpDrawable *drawable)
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *preview;
- GtkWidget *table;
+ GtkWidget *grid;
GtkAdjustment *scale_data;
gboolean run;
@@ -863,18 +863,18 @@ photocopy_dialog (GimpDrawable *drawable)
G_CALLBACK (photocopy),
drawable);
- table = gtk_table_new (4, 3, FALSE);
- gtk_table_set_col_spacings (GTK_TABLE (table), 6);
- gtk_table_set_row_spacings (GTK_TABLE (table), 6);
- gtk_box_pack_start (GTK_BOX (main_vbox), table, FALSE, FALSE, 0);
- gtk_widget_show (table);
+ grid = gtk_grid_new ();
+ gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
+ gtk_box_pack_start (GTK_BOX (main_vbox), grid, FALSE, FALSE, 0);
+ gtk_widget_show (grid);
/* Label, scale, entry for pvals.amount */
- scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 0,
- _("_Mask radius:"), 100, 5,
- pvals.mask_radius, 3.0, 50.0, 1, 5.0, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ scale_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
+ _("_Mask radius:"), 100, 5,
+ pvals.mask_radius, 3.0, 50.0, 1, 5.0, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (scale_data, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
@@ -884,11 +884,11 @@ photocopy_dialog (GimpDrawable *drawable)
preview);
/* Label, scale, entry for pvals.amount */
- scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 1,
- _("_Sharpness:"), 50, 5,
- pvals.sharpness, 0.0, 1.0, 0.01, 0.1, 3,
- TRUE, 0, 0,
- NULL, NULL);
+ scale_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
+ _("_Sharpness:"), 50, 5,
+ pvals.sharpness, 0.0, 1.0, 0.01, 0.1, 3,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (scale_data, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
@@ -898,11 +898,11 @@ photocopy_dialog (GimpDrawable *drawable)
preview);
/* Label, scale, entry for pvals.amount */
- scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 2,
- _("Percent _black:"), 50, 5,
- pvals.pct_black, 0.0, 1.0, 0.01, 0.1, 3,
- TRUE, 0, 0,
- NULL, NULL);
+ scale_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 2,
+ _("Percent _black:"), 50, 5,
+ pvals.pct_black, 0.0, 1.0, 0.01, 0.1, 3,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (scale_data, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
@@ -912,11 +912,11 @@ photocopy_dialog (GimpDrawable *drawable)
preview);
/* Label, scale, entry for pvals.amount */
- scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 3,
- _("Percent _white:"), 50, 5,
- pvals.pct_white, 0.0, 1.0, 0.01, 0.1, 3,
- TRUE, 0, 0,
- NULL, NULL);
+ scale_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 3,
+ _("Percent _white:"), 50, 5,
+ pvals.pct_white, 0.0, 1.0, 0.01, 0.1, 3,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (scale_data, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
diff --git a/plug-ins/common/qbist.c b/plug-ins/common/qbist.c
index a153588..d02389c 100644
--- a/plug-ins/common/qbist.c
+++ b/plug-ins/common/qbist.c
@@ -803,7 +803,7 @@ dialog_run (void)
GtkWidget *vbox;
GtkWidget *bbox;
GtkWidget *button;
- GtkWidget *table;
+ GtkWidget *grid;
gint i;
gboolean run;
@@ -831,11 +831,11 @@ dialog_run (void)
vbox, FALSE, FALSE, 0);
gtk_widget_show (vbox);
- table = gtk_table_new (3, 3, FALSE);
- gtk_table_set_row_spacings (GTK_TABLE (table), 6);
- gtk_table_set_col_spacings (GTK_TABLE (table), 6);
- gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
- gtk_widget_show (table);
+ grid = gtk_grid_new ();
+ gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
+ gtk_box_pack_start (GTK_BOX (vbox), grid, FALSE, FALSE, 0);
+ gtk_widget_show (grid);
info[0] = qbist_info.info;
dialog_new_variations (NULL, NULL);
@@ -844,9 +844,8 @@ dialog_run (void)
for (i = 0; i < 9; i++)
{
button = gtk_button_new ();
- gtk_table_attach (GTK_TABLE (table),
- button, i % 3, (i % 3) + 1, i / 3, (i / 3) + 1,
- GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), button, i % 3, i / 3, 1, 1);
+ // GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (button);
g_signal_connect (button, "clicked",
diff --git a/plug-ins/common/sharpen.c b/plug-ins/common/sharpen.c
index 6bbaa29..f7a59b1 100644
--- a/plug-ins/common/sharpen.c
+++ b/plug-ins/common/sharpen.c
@@ -463,7 +463,7 @@ sharpen_dialog (GimpDrawable *drawable)
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *preview;
- GtkWidget *table;
+ GtkWidget *grid;
GtkAdjustment *adj;
gboolean run;
@@ -499,17 +499,17 @@ sharpen_dialog (GimpDrawable *drawable)
G_CALLBACK (preview_update),
drawable);
- table = gtk_table_new (1, 3, FALSE);
- gtk_table_set_col_spacings (GTK_TABLE (table), 6);
- gtk_box_pack_start (GTK_BOX (main_vbox), table, FALSE, FALSE, 0);
- gtk_widget_show (table);
-
- adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 0,
- _("_Sharpness:"), SCALE_WIDTH, 0,
- sharpen_params.sharpen_percent,
- 1, 99, 1, 10, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ grid = gtk_grid_new ();
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
+ gtk_box_pack_start (GTK_BOX (main_vbox), grid, FALSE, FALSE, 0);
+ gtk_widget_show (grid);
+
+ adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
+ _("_Sharpness:"), SCALE_WIDTH, 0,
+ sharpen_params.sharpen_percent,
+ 1, 99, 1, 10, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
&sharpen_params.sharpen_percent);
diff --git a/plug-ins/common/softglow.c b/plug-ins/common/softglow.c
index 8307c88..70a056d 100644
--- a/plug-ins/common/softglow.c
+++ b/plug-ins/common/softglow.c
@@ -619,7 +619,7 @@ softglow_dialog (GimpDrawable *drawable)
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *preview;
- GtkWidget *table;
+ GtkWidget *grid;
GtkAdjustment *scale_data;
gboolean run;
@@ -655,18 +655,18 @@ softglow_dialog (GimpDrawable *drawable)
G_CALLBACK (softglow),
drawable);
- table = gtk_table_new (3, 3, FALSE);
- gtk_table_set_col_spacings (GTK_TABLE (table), 6);
- gtk_table_set_row_spacings (GTK_TABLE (table), 6);
- gtk_box_pack_start (GTK_BOX (main_vbox), table, FALSE, FALSE, 0);
- gtk_widget_show (table);
+ grid = gtk_grid_new ();
+ gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
+ gtk_box_pack_start (GTK_BOX (main_vbox), grid, FALSE, FALSE, 0);
+ gtk_widget_show (grid);
/* Label, scale, entry for svals.amount */
- scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 0,
- _("_Glow radius:"), 100, 5,
- svals.glow_radius, 1.0, 50.0, 1, 5.0, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ scale_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
+ _("_Glow radius:"), 100, 5,
+ svals.glow_radius, 1.0, 50.0, 1, 5.0, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (scale_data, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
@@ -676,11 +676,11 @@ softglow_dialog (GimpDrawable *drawable)
preview);
/* Label, scale, entry for svals.amount */
- scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 1,
- _("_Brightness:"), 100, 5,
- svals.brightness, 0.0, 1.0, 0.01, 0.1, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ scale_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
+ _("_Brightness:"), 100, 5,
+ svals.brightness, 0.0, 1.0, 0.01, 0.1, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (scale_data, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
@@ -690,11 +690,11 @@ softglow_dialog (GimpDrawable *drawable)
preview);
/* Label, scale, entry for svals.amount */
- scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 2,
- _("_Sharpness:"), 100, 5,
- svals.sharpness, 0.0, 1.0, 0.01, 0.1, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ scale_data = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 2,
+ _("_Sharpness:"), 100, 5,
+ svals.sharpness, 0.0, 1.0, 0.01, 0.1, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (scale_data, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
diff --git a/plug-ins/common/unsharp-mask.c b/plug-ins/common/unsharp-mask.c
index 3a2458a..47f2a7d 100644
--- a/plug-ins/common/unsharp-mask.c
+++ b/plug-ins/common/unsharp-mask.c
@@ -829,7 +829,7 @@ unsharp_mask_dialog (GimpDrawable *drawable)
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *preview;
- GtkWidget *table;
+ GtkWidget *grid;
GtkAdjustment *adj;
gboolean run;
@@ -865,17 +865,17 @@ unsharp_mask_dialog (GimpDrawable *drawable)
G_CALLBACK (preview_update),
drawable);
- table = gtk_table_new (3, 3, FALSE);
- gtk_table_set_col_spacings (GTK_TABLE (table), 6);
- gtk_table_set_row_spacings (GTK_TABLE (table), 6);
- gtk_box_pack_start (GTK_BOX (main_vbox), table, FALSE, FALSE, 0);
- gtk_widget_show (table);
+ grid = gtk_grid_new ();
+ gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
+ gtk_box_pack_start (GTK_BOX (main_vbox), grid, FALSE, FALSE, 0);
+ gtk_widget_show (grid);
- adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 0,
- _("_Radius:"), SCALE_WIDTH, ENTRY_WIDTH,
- unsharp_params.radius, 0.1, 500.0, 0.1, 1.0, 1,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
+ _("_Radius:"), SCALE_WIDTH, ENTRY_WIDTH,
+ unsharp_params.radius, 0.1, 500.0, 0.1, 1.0, 1,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
@@ -884,11 +884,11 @@ unsharp_mask_dialog (GimpDrawable *drawable)
G_CALLBACK (gimp_preview_invalidate),
preview);
- adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 1,
- _("_Amount:"), SCALE_WIDTH, ENTRY_WIDTH,
- unsharp_params.amount, 0.0, 10.0, 0.01, 0.1, 2,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 1,
+ _("_Amount:"), SCALE_WIDTH, ENTRY_WIDTH,
+ unsharp_params.amount, 0.0, 10.0, 0.01, 0.1, 2,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
@@ -897,11 +897,11 @@ unsharp_mask_dialog (GimpDrawable *drawable)
G_CALLBACK (gimp_preview_invalidate),
preview);
- adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 2,
- _("_Threshold:"), SCALE_WIDTH, ENTRY_WIDTH,
- unsharp_params.threshold,
- 0.0, 255.0, 1.0, 10.0, 0,
- TRUE, 0, 0,
+ adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 2,
+ _("_Threshold:"), SCALE_WIDTH, ENTRY_WIDTH,
+ unsharp_params.threshold,
+ 0.0, 255.0, 1.0, 10.0, 0,
+ TRUE, 0, 0,
NULL, NULL);
g_signal_connect (adj, "value-changed",
diff --git a/plug-ins/common/wavelet-decompose.c b/plug-ins/common/wavelet-decompose.c
index f335039..3768ecd 100644
--- a/plug-ins/common/wavelet-decompose.c
+++ b/plug-ins/common/wavelet-decompose.c
@@ -340,7 +340,7 @@ wavelet_decompose_dialog (void)
{
GtkWidget *dialog;
GtkWidget *main_vbox;
- GtkWidget *table;
+ GtkWidget *grid;
GtkWidget *button;
GtkAdjustment *adj;
gboolean run;
@@ -369,20 +369,20 @@ wavelet_decompose_dialog (void)
main_vbox, TRUE, TRUE, 0);
gtk_widget_show (main_vbox);
- table = gtk_table_new (3, 1, FALSE);
- gtk_table_set_col_spacings (GTK_TABLE (table), 6);
- gtk_table_set_row_spacings (GTK_TABLE (table), 6);
- gtk_box_pack_start (GTK_BOX (main_vbox), table, FALSE, FALSE, 0);
- gtk_widget_show (table);
+ grid = gtk_grid_new ();
+ gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
+ gtk_box_pack_start (GTK_BOX (main_vbox), grid, FALSE, FALSE, 0);
+ gtk_widget_show (grid);
/* scales */
- adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 0,
- _("Scales:"), SCALE_WIDTH, ENTRY_WIDTH,
- wavelet_params.scales,
- 1.0, 7.0, 1.0, 1.0, 0,
- TRUE, 0, 0,
- NULL, NULL);
+ adj = gimp_scale_entry_new_grid (GTK_GRID (grid), 0, 0,
+ _("Scales:"), SCALE_WIDTH, ENTRY_WIDTH,
+ wavelet_params.scales,
+ 1.0, 7.0, 1.0, 1.0, 0,
+ TRUE, 0, 0,
+ NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
