[gimp/gtk3-port: 418/444] file-html-table: kill GtkTable
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gtk3-port: 418/444] file-html-table: kill GtkTable
- Date: Sun, 13 May 2018 22:13:01 +0000 (UTC)
commit 615fff57e4af8665a23fd2950df49ffb3b749186
Author: Simon Budig <simon budig de>
Date: Fri May 11 11:29:40 2018 +0200
file-html-table: kill GtkTable
plug-ins/common/file-html-table.c | 67 ++++++++++++++++++-------------------
1 files changed, 33 insertions(+), 34 deletions(-)
---
diff --git a/plug-ins/common/file-html-table.c b/plug-ins/common/file-html-table.c
index 8d977dd..4483ced 100644
--- a/plug-ins/common/file-html-table.c
+++ b/plug-ins/common/file-html-table.c
@@ -451,7 +451,7 @@ save_dialog (gint32 image_ID)
GtkWidget *main_vbox;
GtkWidget *frame;
GtkWidget *vbox;
- GtkWidget *table;
+ GtkWidget *grid;
GtkWidget *spinbutton;
GtkAdjustment *adj;
GtkWidget *entry;
@@ -522,13 +522,13 @@ save_dialog (gint32 image_ID)
frame = gimp_frame_new (_("Table Creation Options"));
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
- table = gtk_table_new (4, 2, FALSE);
- gtk_table_set_col_spacings (GTK_TABLE (table), 6);
- gtk_table_set_row_spacings (GTK_TABLE (table), 6);
- gtk_container_add (GTK_CONTAINER (frame), table);
+ 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);
toggle = gtk_check_button_new_with_mnemonic (_("_Use cellspan"));
- gtk_table_attach (GTK_TABLE (table), toggle, 0, 2, 0, 1, GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), toggle, 0, 0, 2, 1);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), gtmvals.spantags);
gtk_widget_show (toggle);
@@ -543,7 +543,7 @@ save_dialog (gint32 image_ID)
>mvals.spantags);
toggle = gtk_check_button_new_with_mnemonic (_("Co_mpress TD tags"));
- gtk_table_attach (GTK_TABLE (table), toggle, 0, 2, 1, 2, GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), toggle, 0, 1, 2, 1);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), gtmvals.tdcomp);
gtk_widget_show (toggle);
@@ -559,7 +559,7 @@ save_dialog (gint32 image_ID)
>mvals.tdcomp);
toggle = gtk_check_button_new_with_mnemonic (_("C_aption"));
- gtk_table_attach (GTK_TABLE (table), toggle, 0, 1, 2, 3, GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), toggle, 0, 2, 1, 1);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), gtmvals.caption);
gtk_widget_show (toggle);
@@ -575,8 +575,7 @@ save_dialog (gint32 image_ID)
entry = gtk_entry_new ();
gtk_widget_set_size_request (entry, 200, -1);
gtk_entry_set_text (GTK_ENTRY (entry), gtmvals.captiontxt);
- gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 2, 3,
- GTK_FILL | GTK_EXPAND, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), entry, 1, 2, 1, 1);
gtk_widget_show (entry);
gimp_help_set_help_data (entry, _("The text for the table caption."), NULL);
@@ -592,9 +591,9 @@ save_dialog (gint32 image_ID)
entry = gtk_entry_new ();
gtk_widget_set_size_request (entry, 200, -1);
gtk_entry_set_text (GTK_ENTRY (entry), gtmvals.cellcontent);
- gimp_table_attach_aligned (GTK_TABLE (table), 0, 3,
- _("C_ell content:"), 0.0, 0.5,
- entry, 1, FALSE);
+ gimp_grid_attach_aligned (GTK_GRID (grid), 0, 3,
+ _("C_ell content:"), 0.0, 0.5,
+ entry, 1);
gtk_widget_show (entry);
gimp_help_set_help_data (entry, _("The text to go into each cell."), NULL);
@@ -603,25 +602,25 @@ save_dialog (gint32 image_ID)
G_CALLBACK (entry_changed_callback),
gtmvals.cellcontent);
- gtk_widget_show (table);
+ gtk_widget_show (grid);
gtk_widget_show (frame);
/* HTML Table Options */
frame = gimp_frame_new (_("Table Options"));
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
- table = gtk_table_new (5, 2, FALSE);
- gtk_table_set_col_spacings (GTK_TABLE (table), 6);
- gtk_table_set_row_spacings (GTK_TABLE (table), 6);
- gtk_container_add (GTK_CONTAINER (frame), table);
+ 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);
adj = (GtkAdjustment *) gtk_adjustment_new (gtmvals.border,
0, 1000, 1, 10, 0);
spinbutton = gtk_spin_button_new (adj, 1.0, 0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
- gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
- _("_Border:"), 0.0, 0.5,
- spinbutton, 1, TRUE);
+ gimp_grid_attach_aligned (GTK_GRID (grid), 0, 0,
+ _("_Border:"), 0.0, 0.5,
+ spinbutton, 1);
gimp_help_set_help_data (spinbutton,
_("The number of pixels in the table border."),
@@ -634,9 +633,9 @@ save_dialog (gint32 image_ID)
entry = gtk_entry_new ();
gtk_widget_set_size_request (entry, 60, -1);
gtk_entry_set_text (GTK_ENTRY (entry), gtmvals.clwidth);
- gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
- _("_Width:"), 0.0, 0.5,
- entry, 1, TRUE);
+ gimp_grid_attach_aligned (GTK_GRID (grid), 0, 1,
+ _("_Width:"), 0.0, 0.5,
+ entry, 1);
gimp_help_set_help_data (entry,
_("The width for each table cell. "
@@ -650,9 +649,9 @@ save_dialog (gint32 image_ID)
entry = gtk_entry_new ();
gtk_widget_set_size_request (entry, 60, -1);
gtk_entry_set_text (GTK_ENTRY (entry), gtmvals.clheight);
- gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
- _("_Height:"), 0.0, 0.5,
- entry, 1, TRUE);
+ gimp_grid_attach_aligned (GTK_GRID (grid), 0, 2,
+ _("_Height:"), 0.0, 0.5,
+ entry, 1);
gimp_help_set_help_data (entry,
_("The height for each table cell. "
@@ -667,9 +666,9 @@ save_dialog (gint32 image_ID)
0, 1000, 1, 10, 0);
spinbutton = gtk_spin_button_new (adj, 1.0, 0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
- gimp_table_attach_aligned (GTK_TABLE (table), 0, 3,
- _("Cell-_padding:"), 0.0, 0.5,
- spinbutton, 1, TRUE);
+ gimp_grid_attach_aligned (GTK_GRID (grid), 0, 3,
+ _("Cell-_padding:"), 0.0, 0.5,
+ spinbutton, 1);
gimp_help_set_help_data (spinbutton,
_("The amount of cell padding."), NULL);
@@ -682,9 +681,9 @@ save_dialog (gint32 image_ID)
0, 1000, 1, 10, 0);
spinbutton = gtk_spin_button_new (adj, 1.0, 0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
- gimp_table_attach_aligned (GTK_TABLE (table), 0, 4,
- _("Cell-_spacing:"), 0.0, 0.5,
- spinbutton, 1, TRUE);
+ gimp_grid_attach_aligned (GTK_GRID (grid), 0, 4,
+ _("Cell-_spacing:"), 0.0, 0.5,
+ spinbutton, 1);
gimp_help_set_help_data (spinbutton,
_("The amount of cell spacing."), NULL);
@@ -693,7 +692,7 @@ save_dialog (gint32 image_ID)
G_CALLBACK (gimp_int_adjustment_update),
>mvals.cellspacing);
- gtk_widget_show (table);
+ gtk_widget_show (grid);
gtk_widget_show (frame);
gtk_widget_show (dialog);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]