[gimp/gtk3-port: 261/262] app: get rid of some GtkTables in tools/
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gtk3-port: 261/262] app: get rid of some GtkTables in tools/
- Date: Sun, 29 Apr 2018 17:05:54 +0000 (UTC)
commit d9fccf1df424352981dcc3baeababedeed31df9c
Author: Michael Natterer <mitch gimp org>
Date: Sun Apr 29 18:40:43 2018 +0200
app: get rid of some GtkTables in tools/
app/tools/gimpgenerictransformtool.c | 21 ++++-----
app/tools/gimpgenerictransformtool.h | 2 +-
app/tools/gimpmeasuretool.c | 54 ++++++++++++------------
app/tools/gimprotatetool.c | 32 +++++++-------
app/tools/gimptextoptions.c | 77 ++++++++++++++++++---------------
app/widgets/gimpwidgets-utils.c | 29 ++++---------
app/widgets/gimpwidgets-utils.h | 5 +-
7 files changed, 107 insertions(+), 113 deletions(-)
---
diff --git a/app/tools/gimpgenerictransformtool.c b/app/tools/gimpgenerictransformtool.c
index 1eceb86..3f50f2f 100644
--- a/app/tools/gimpgenerictransformtool.c
+++ b/app/tools/gimpgenerictransformtool.c
@@ -75,7 +75,7 @@ gimp_generic_transform_tool_dialog (GimpTransformTool *tr_tool)
GimpGenericTransformTool *generic = GIMP_GENERIC_TRANSFORM_TOOL (tr_tool);
GtkWidget *frame;
GtkWidget *vbox;
- GtkWidget *table;
+ GtkWidget *grid;
GtkWidget *label;
GtkSizeGroup *size_group;
gint x, y;
@@ -91,12 +91,12 @@ gimp_generic_transform_tool_dialog (GimpTransformTool *tr_tool)
size_group = gtk_size_group_new (GTK_SIZE_GROUP_BOTH);
- table = generic->matrix_table = gtk_table_new (3, 3, FALSE);
- gtk_table_set_row_spacings (GTK_TABLE (table), 2);
- gtk_table_set_col_spacings (GTK_TABLE (table), 2);
- gtk_box_pack_start (GTK_BOX (vbox), table, TRUE, TRUE, 0);
- gtk_size_group_add_widget (size_group, table);
- gtk_widget_show (table);
+ grid = generic->matrix_grid = gtk_grid_new ();
+ gtk_grid_set_row_spacing (GTK_GRID (grid), 2);
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 2);
+ gtk_box_pack_start (GTK_BOX (vbox), grid, TRUE, TRUE, 0);
+ gtk_size_group_add_widget (size_group, grid);
+ gtk_widget_show (grid);
for (y = 0; y < 3; y++)
{
@@ -105,8 +105,7 @@ gimp_generic_transform_tool_dialog (GimpTransformTool *tr_tool)
label = generic->matrix_labels[y][x] = gtk_label_new (" ");
gtk_label_set_xalign (GTK_LABEL (label), 1.0);
gtk_label_set_width_chars (GTK_LABEL (label), 12);
- gtk_table_attach (GTK_TABLE (table), label,
- x, x + 1, y, y + 1, GTK_EXPAND, GTK_FILL, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, x, y, 1, 1);
gtk_widget_show (label);
}
}
@@ -130,7 +129,7 @@ gimp_generic_transform_tool_dialog_update (GimpTransformTool *tr_tool)
{
gint x, y;
- gtk_widget_show (generic->matrix_table);
+ gtk_widget_show (generic->matrix_grid);
gtk_widget_hide (generic->invalid_label);
for (y = 0; y < 3; y++)
@@ -149,7 +148,7 @@ gimp_generic_transform_tool_dialog_update (GimpTransformTool *tr_tool)
else
{
gtk_widget_show (generic->invalid_label);
- gtk_widget_hide (generic->matrix_table);
+ gtk_widget_hide (generic->matrix_grid);
}
}
diff --git a/app/tools/gimpgenerictransformtool.h b/app/tools/gimpgenerictransformtool.h
index 6160d4d..b02714f 100644
--- a/app/tools/gimpgenerictransformtool.h
+++ b/app/tools/gimpgenerictransformtool.h
@@ -39,7 +39,7 @@ struct _GimpGenericTransformTool
GimpVector2 input_points[4];
GimpVector2 output_points[4];
- GtkWidget *matrix_table;
+ GtkWidget *matrix_grid;
GtkWidget *matrix_labels[3][3];
GtkWidget *invalid_label;
};
diff --git a/app/tools/gimpmeasuretool.c b/app/tools/gimpmeasuretool.c
index 781e7bd..081d3ab 100644
--- a/app/tools/gimpmeasuretool.c
+++ b/app/tools/gimpmeasuretool.c
@@ -633,7 +633,7 @@ gimp_measure_tool_dialog_new (GimpMeasureTool *measure)
GimpTool *tool = GIMP_TOOL (measure);
GimpDisplayShell *shell;
GimpToolGui *gui;
- GtkWidget *table;
+ GtkWidget *grid;
GtkWidget *label;
g_return_val_if_fail (tool->display != NULL, NULL);
@@ -658,123 +658,123 @@ gimp_measure_tool_dialog_new (GimpMeasureTool *measure)
G_CALLBACK (g_object_unref),
NULL);
- table = gtk_table_new (4, 5, TRUE);
- gtk_table_set_col_spacings (GTK_TABLE (table), 6);
- gtk_table_set_row_spacings (GTK_TABLE (table), 6);
- gtk_box_pack_start (GTK_BOX (gimp_tool_gui_get_vbox (gui)), table,
- TRUE, TRUE, 0);
- gtk_widget_show (table);
+ grid = gtk_grid_new ();
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
+ gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
+ gtk_box_pack_start (GTK_BOX (gimp_tool_gui_get_vbox (gui)), grid,
+ FALSE, FALSE, 0);
+ gtk_widget_show (grid);
label = gtk_label_new (_("Distance:"));
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 0, 1);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
gtk_widget_show (label);
measure->distance_label[0] = label = gtk_label_new ("0.0");
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gtk_label_set_xalign (GTK_LABEL (label), 1.0);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 0, 1);
+ gtk_grid_attach (GTK_GRID (grid), label, 1, 0, 1, 1);
gtk_widget_show (label);
label = gtk_label_new (_("pixels"));
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 0, 1);
+ gtk_grid_attach (GTK_GRID (grid), label, 2, 0, 1, 1);
gtk_widget_show (label);
measure->distance_label[1] = label = gtk_label_new ("0.0");
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gtk_label_set_xalign (GTK_LABEL (label), 1.0);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 3, 4, 0, 1);
+ gtk_grid_attach (GTK_GRID (grid), label, 3, 0, 1, 1);
gtk_widget_show (label);
measure->unit_label[0] = label = gtk_label_new (NULL);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 4, 5, 0, 1);
+ gtk_grid_attach (GTK_GRID (grid), label, 4, 0, 1, 1);
gtk_widget_show (label);
label = gtk_label_new (_("Angle:"));
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 1, 1, 1);
gtk_widget_show (label);
measure->angle_label[0] = label = gtk_label_new ("0.0");
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gtk_label_set_xalign (GTK_LABEL (label), 1.0);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 1, 2);
+ gtk_grid_attach (GTK_GRID (grid), label, 1, 1, 1, 1);
gtk_widget_show (label);
label = gtk_label_new ("\302\260");
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 1, 2);
+ gtk_grid_attach (GTK_GRID (grid), label, 2, 1, 1, 1);
gtk_widget_show (label);
measure->angle_label[1] = label = gtk_label_new (NULL);
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gtk_label_set_xalign (GTK_LABEL (label), 1.0);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 3, 4, 1, 2);
+ gtk_grid_attach (GTK_GRID (grid), label, 3, 1, 1, 1);
gtk_widget_show (label);
measure->unit_label[1] = label = gtk_label_new (NULL);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 4, 5, 1, 2);
+ gtk_grid_attach (GTK_GRID (grid), label, 4, 1, 1, 1);
gtk_widget_show (label);
label = gtk_label_new (_("Width:"));
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 2, 1, 1);
gtk_widget_show (label);
measure->width_label[0] = label = gtk_label_new ("0.0");
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gtk_label_set_xalign (GTK_LABEL (label), 1.0);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 2, 3);
+ gtk_grid_attach (GTK_GRID (grid), label, 1, 2, 1, 1);
gtk_widget_show (label);
label = gtk_label_new (_("pixels"));
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 2, 3);
+ gtk_grid_attach (GTK_GRID (grid), label, 2, 2, 1, 1);
gtk_widget_show (label);
measure->width_label[1] = label = gtk_label_new ("0.0");
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gtk_label_set_xalign (GTK_LABEL (label), 1.0);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 3, 4, 2, 3);
+ gtk_grid_attach (GTK_GRID (grid), label, 3, 2, 1, 1);
gtk_widget_show (label);
measure->unit_label[2] = label = gtk_label_new (NULL);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 4, 5, 2, 3);
+ gtk_grid_attach (GTK_GRID (grid), label, 4, 2, 1, 1);
gtk_widget_show (label);
label = gtk_label_new (_("Height:"));
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 3, 4);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 3, 1, 1);
gtk_widget_show (label);
measure->height_label[0] = label = gtk_label_new ("0.0");
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gtk_label_set_xalign (GTK_LABEL (label), 1.0);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 3, 4);
+ gtk_grid_attach (GTK_GRID (grid), label, 1, 3, 1, 1);
gtk_widget_show (label);
label = gtk_label_new (_("pixels"));
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 3, 4);
+ gtk_grid_attach (GTK_GRID (grid), label, 2, 3, 1, 1);
gtk_widget_show (label);
measure->height_label[1] = label = gtk_label_new ("0.0");
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gtk_label_set_xalign (GTK_LABEL (label), 1.0);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 3, 4, 3, 4);
+ gtk_grid_attach (GTK_GRID (grid), label, 3, 3, 1, 1);
gtk_widget_show (label);
measure->unit_label[3] = label = gtk_label_new (NULL);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 4, 5, 3, 4);
+ gtk_grid_attach (GTK_GRID (grid), label, 4, 3, 1, 1);
gtk_widget_show (label);
return gui;
diff --git a/app/tools/gimprotatetool.c b/app/tools/gimprotatetool.c
index fd77a5d..4c49e77 100644
--- a/app/tools/gimprotatetool.c
+++ b/app/tools/gimprotatetool.c
@@ -171,26 +171,26 @@ static void
gimp_rotate_tool_dialog (GimpTransformTool *tr_tool)
{
GimpRotateTool *rotate = GIMP_ROTATE_TOOL (tr_tool);
- GtkWidget *table;
+ GtkWidget *grid;
GtkWidget *button;
GtkWidget *scale;
GtkAdjustment *adj;
- table = gtk_table_new (4, 2, FALSE);
- gtk_table_set_row_spacings (GTK_TABLE (table), 2);
- gtk_table_set_col_spacings (GTK_TABLE (table), 6);
- gtk_table_set_row_spacing (GTK_TABLE (table), 1, 6);
- gtk_box_pack_start (GTK_BOX (gimp_tool_gui_get_vbox (tr_tool->gui)), table,
+ 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 (gimp_tool_gui_get_vbox (tr_tool->gui)), grid,
FALSE, FALSE, 0);
- gtk_widget_show (table);
+ gtk_widget_show (grid);
rotate->angle_adj = gtk_adjustment_new (0, -180, 180, 0.1, 15, 0);
button = gtk_spin_button_new (rotate->angle_adj, 1.0, 2);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (button), TRUE);
gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (button), TRUE);
gtk_entry_set_width_chars (GTK_ENTRY (button), SB_WIDTH);
- gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("_Angle:"),
- 0.0, 0.5, button, 1, TRUE);
+ gtk_widget_set_halign (button, GTK_ALIGN_START);
+ gimp_grid_attach_aligned (GTK_GRID (grid), 0, 0, _("_Angle:"),
+ 0.0, 0.5, button, 1);
rotate->angle_spin_button = button;
g_signal_connect (rotate->angle_adj, "value-changed",
@@ -199,16 +199,17 @@ gimp_rotate_tool_dialog (GimpTransformTool *tr_tool)
scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, rotate->angle_adj);
gtk_scale_set_draw_value (GTK_SCALE (scale), FALSE);
- gtk_table_attach (GTK_TABLE (table), scale, 1, 2, 1, 2,
- GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
+ gtk_widget_set_hexpand (scale, TRUE);
+ gtk_grid_attach (GTK_GRID (grid), scale, 1, 1, 1, 1);
gtk_widget_show (scale);
adj = gtk_adjustment_new (0, -1, 1, 1, 10, 0);
button = gtk_spin_button_new (adj, 1.0, 2);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (button), TRUE);
gtk_entry_set_width_chars (GTK_ENTRY (button), SB_WIDTH);
- gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, _("Center _X:"),
- 0.0, 0.5, button, 1, TRUE);
+ gtk_widget_set_halign (button, GTK_ALIGN_START);
+ gimp_grid_attach_aligned (GTK_GRID (grid), 0, 2, _("Center _X:"),
+ 0.0, 0.5, button, 1);
rotate->sizeentry = gimp_size_entry_new (1, GIMP_UNIT_PIXEL, "%a",
TRUE, TRUE, FALSE, SB_WIDTH,
@@ -216,8 +217,9 @@ gimp_rotate_tool_dialog (GimpTransformTool *tr_tool)
gimp_size_entry_add_field (GIMP_SIZE_ENTRY (rotate->sizeentry),
GTK_SPIN_BUTTON (button), NULL);
gimp_size_entry_set_pixel_digits (GIMP_SIZE_ENTRY (rotate->sizeentry), 2);
- gimp_table_attach_aligned (GTK_TABLE (table), 0, 3, _("Center _Y:"),
- 0.0, 0.5, rotate->sizeentry, 1, TRUE);
+ gtk_widget_set_halign (rotate->sizeentry, GTK_ALIGN_START);
+ gimp_grid_attach_aligned (GTK_GRID (grid), 0, 3, _("Center _Y:"),
+ 0.0, 0.5, rotate->sizeentry, 1);
g_signal_connect (rotate->sizeentry, "value-changed",
G_CALLBACK (rotate_center_changed),
diff --git a/app/tools/gimptextoptions.c b/app/tools/gimptextoptions.c
index 96ab7b5..e96eaae 100644
--- a/app/tools/gimptextoptions.c
+++ b/app/tools/gimptextoptions.c
@@ -515,7 +515,7 @@ gimp_text_options_gui (GimpToolOptions *tool_options)
GObject *config = G_OBJECT (tool_options);
GimpTextOptions *options = GIMP_TEXT_OPTIONS (tool_options);
GtkWidget *main_vbox = gimp_tool_options_gui (tool_options);
- GtkWidget *table;
+ GtkWidget *grid;
GtkWidget *vbox;
GtkWidget *hbox;
GtkWidget *button;
@@ -532,18 +532,18 @@ gimp_text_options_gui (GimpToolOptions *tool_options)
gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
- table = gtk_table_new (1, 3, FALSE);
- gtk_table_set_col_spacings (GTK_TABLE (table), 2);
- 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);
+ grid = gtk_grid_new ();
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 2);
+ gtk_grid_set_row_spacing (GTK_GRID (grid), 2);
+ gtk_box_pack_start (GTK_BOX (main_vbox), grid, FALSE, FALSE, 0);
+ gtk_widget_show (grid);
entry = gimp_prop_size_entry_new (config,
"font-size", FALSE, "font-size-unit", "%p",
GIMP_SIZE_ENTRY_UPDATE_SIZE, 72.0);
- gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
- _("Size:"), 0.0, 0.5,
- entry, 2, FALSE);
+ gimp_grid_attach_aligned (GTK_GRID (grid), 0, row++,
+ _("Size:"), 0.0, 0.5,
+ entry, 2);
options->size_entry = entry;
@@ -559,61 +559,68 @@ gimp_text_options_gui (GimpToolOptions *tool_options)
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
gtk_widget_show (button);
- table = gtk_table_new (6, 3, FALSE);
- gtk_table_set_col_spacings (GTK_TABLE (table), 2);
- 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);
+ grid = gtk_grid_new ();
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 2);
+ gtk_grid_set_row_spacing (GTK_GRID (grid), 2);
+ gtk_box_pack_start (GTK_BOX (main_vbox), grid, FALSE, FALSE, 0);
+ gtk_widget_show (grid);
row = 0;
size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
button = gimp_prop_enum_combo_box_new (config, "hint-style", -1, -1);
- gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
- _("Hinting:"), 0.0, 0.5,
- button, 1, TRUE);
+ gtk_widget_set_halign (button, GTK_ALIGN_START);
+ gimp_grid_attach_aligned (GTK_GRID (grid), 0, row++,
+ _("Hinting:"), 0.0, 0.5,
+ button, 1);
gtk_size_group_add_widget (size_group, button);
button = gimp_prop_color_button_new (config, "foreground", _("Text Color"),
40, 24, GIMP_COLOR_AREA_FLAT);
gimp_color_panel_set_context (GIMP_COLOR_PANEL (button),
GIMP_CONTEXT (options));
- gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
- _("Color:"), 0.0, 0.5,
- button, 1, TRUE);
+ gtk_widget_set_halign (button, GTK_ALIGN_START);
+ gimp_grid_attach_aligned (GTK_GRID (grid), 0, row++,
+ _("Color:"), 0.0, 0.5,
+ button, 1);
gtk_size_group_add_widget (size_group, button);
box = gimp_prop_enum_icon_box_new (config, "justify", "format-justify", 0, 0);
- gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
- _("Justify:"), 0.0, 0.5,
- box, 2, TRUE);
+ gtk_widget_set_halign (box, GTK_ALIGN_START);
+ gimp_grid_attach_aligned (GTK_GRID (grid), 0, row++,
+ _("Justify:"), 0.0, 0.5,
+ box, 2);
gtk_size_group_add_widget (size_group, box);
g_object_unref (size_group);
spinbutton = gimp_prop_spin_button_new (config, "indent", 1.0, 10.0, 1);
gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 5);
- gimp_table_attach_icon (GTK_TABLE (table), row++,
- GIMP_ICON_FORMAT_INDENT_MORE,
- spinbutton, 1, TRUE);
+ gtk_widget_set_halign (spinbutton, GTK_ALIGN_START);
+ gimp_grid_attach_icon (GTK_GRID (grid), row++,
+ GIMP_ICON_FORMAT_INDENT_MORE,
+ spinbutton, 1);
spinbutton = gimp_prop_spin_button_new (config, "line-spacing", 1.0, 10.0, 1);
gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 5);
- gimp_table_attach_icon (GTK_TABLE (table), row++,
- GIMP_ICON_FORMAT_TEXT_SPACING_LINE,
- spinbutton, 1, TRUE);
+ gtk_widget_set_halign (spinbutton, GTK_ALIGN_START);
+ gimp_grid_attach_icon (GTK_GRID (grid), row++,
+ GIMP_ICON_FORMAT_TEXT_SPACING_LINE,
+ spinbutton, 1);
spinbutton = gimp_prop_spin_button_new (config,
"letter-spacing", 1.0, 10.0, 1);
gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 5);
- gimp_table_attach_icon (GTK_TABLE (table), row++,
- GIMP_ICON_FORMAT_TEXT_SPACING_LETTER,
- spinbutton, 1, TRUE);
+ gtk_widget_set_halign (spinbutton, GTK_ALIGN_START);
+ gimp_grid_attach_icon (GTK_GRID (grid), row++,
+ GIMP_ICON_FORMAT_TEXT_SPACING_LETTER,
+ spinbutton, 1);
combo = gimp_prop_enum_combo_box_new (config, "box-mode", 0, 0);
- gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
- _("Box:"), 0.0, 0.5,
- combo, 1, TRUE);
+ gtk_widget_set_halign (combo, GTK_ALIGN_START);
+ gimp_grid_attach_aligned (GTK_GRID (grid), 0, row++,
+ _("Box:"), 0.0, 0.5,
+ combo, 1);
/* Only add the language entry if the iso-codes package is available. */
diff --git a/app/widgets/gimpwidgets-utils.c b/app/widgets/gimpwidgets-utils.c
index 077a0dc..f7d216d 100644
--- a/app/widgets/gimpwidgets-utils.c
+++ b/app/widgets/gimpwidgets-utils.c
@@ -212,37 +212,24 @@ gimp_button_menu_position (GtkWidget *button,
}
void
-gimp_table_attach_icon (GtkTable *table,
- gint row,
- const gchar *icon_name,
- GtkWidget *widget,
- gint colspan,
- gboolean left_align)
+gimp_grid_attach_icon (GtkGrid *grid,
+ gint row,
+ const gchar *icon_name,
+ GtkWidget *widget,
+ gint columns)
{
GtkWidget *image;
- g_return_if_fail (GTK_IS_TABLE (table));
+ g_return_if_fail (GTK_IS_GRID (grid));
g_return_if_fail (icon_name != NULL);
g_return_if_fail (GTK_IS_WIDGET (widget));
image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON);
gtk_widget_set_halign (image, GTK_ALIGN_END);
- gtk_table_attach (table, image, 0, 1, row, row + 1,
- GTK_FILL, GTK_FILL, 0, 0);
+ gtk_grid_attach (grid, image, 0, row, 1, 1);
gtk_widget_show (image);
- if (left_align)
- {
- GtkWidget *hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-
- gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0);
- gtk_widget_show (widget);
-
- widget = hbox;
- }
-
- gtk_table_attach (table, widget, 1, 1 + colspan, row, row + 1,
- GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+ gtk_grid_attach (grid, widget, 1, row, columns, 1);
gtk_widget_show (widget);
}
diff --git a/app/widgets/gimpwidgets-utils.h b/app/widgets/gimpwidgets-utils.h
index 32620c6..985aa4c 100644
--- a/app/widgets/gimpwidgets-utils.h
+++ b/app/widgets/gimpwidgets-utils.h
@@ -30,12 +30,11 @@ void gimp_button_menu_position (GtkWidget *button
GtkPositionType position,
gint *x,
gint *y);
-void gimp_table_attach_icon (GtkTable *table,
+void gimp_grid_attach_icon (GtkGrid *grid,
gint row,
const gchar *icon_name,
GtkWidget *widget,
- gint colspan,
- gboolean left_align);
+ gint columns);
void gimp_enum_radio_box_add (GtkBox *box,
GtkWidget *widget,
gint enum_value,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
