port deprecated GtkTable to GtkGrid

3 files changed, 38 insertions, 59 deletions

diff --git a/src/dlg-add-folder.c b/src/dlg-add-folder.c
index 9d74d50..c5b0f04 100644
--- a/src/dlg-add-folder.c
+++ b/src/dlg-add-folder.c
@@ -213,7 +213,7 @@ add_folder_cb (GtkWidget *widget,
 	DialogData  *data;
 	GtkWidget   *main_box;
 	GtkWidget   *vbox;
-	GtkWidget   *table;
+	GtkWidget   *grid;
 	GtkWidget   *align;
 
 	data = g_new0 (DialogData, 1);
@@ -280,48 +280,36 @@ add_folder_cb (GtkWidget *widget,
 	gtk_box_pack_start (GTK_BOX (vbox), data->add_if_newer_checkbutton,
 			    TRUE, TRUE, 0);
 
-	table = gtk_table_new (2, 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,
+	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,
 			    TRUE, TRUE, 0);
 
-	gtk_table_attach (GTK_TABLE (table),
+	gtk_grid_attach (GTK_GRID (grid),
 			  data->include_files_label,
-			  0, 1,
-			  0, 1,
-			  GTK_FILL, 0,
-			  0, 0);
-	gtk_table_attach (GTK_TABLE (table),
+			  0, 0,
+			  1, 1);
+	gtk_grid_attach (GTK_GRID (grid),
 			  data->include_files_entry,
-			  1, 4,
-			  0, 1,
-			  GTK_FILL|GTK_EXPAND, 0,
-			  0, 0);
-	gtk_table_attach (GTK_TABLE (table),
+			  1, 0,
+			  3, 1);
+	gtk_grid_attach (GTK_GRID (grid),
 			  data->exclude_files_label,
 			  0, 1,
-			  1, 2,
-			  GTK_FILL, 0,
-			  0, 0);
-	gtk_table_attach (GTK_TABLE (table),
+			  1, 1);
+	gtk_grid_attach (GTK_GRID (grid),
 			  data->exclude_files_entry,
-			  1, 2,
-			  1, 2,
-			  GTK_FILL|GTK_EXPAND, 0,
-			  0, 0);
-	gtk_table_attach (GTK_TABLE (table),
+			  1, 1,
+			  1, 1);
+	gtk_grid_attach (GTK_GRID (grid),
 			  data->exclude_folders_label,
-			  2, 3,
-			  1, 2,
-			  GTK_FILL, 0,
-			  0, 0);
-	gtk_table_attach (GTK_TABLE (table),
+			  2, 1,
+			  1, 1);
+	gtk_grid_attach (GTK_GRID (grid),
 			  data->exclude_folders_entry,
-			  3, 4,
-			  1, 2,
-			  GTK_FILL|GTK_EXPAND, 0,
-			  0, 0);
+			  3, 1,
+			  1, 1);
 
 	/**/
 
diff --git a/src/dlg-extract.c b/src/dlg-extract.c
index 52eaff8..0566b07 100644
--- a/src/dlg-extract.c
+++ b/src/dlg-extract.c
@@ -312,7 +312,7 @@ create_extra_widget (DialogData *data)
 	GtkWidget *e_files_label;
 	GtkWidget *hbox29;
 	GtkWidget *label47;
-	GtkWidget *table1;
+	GtkWidget *grid1;
 	GSList    *e_files_radiobutton_group = NULL;
 	GtkWidget *vbox20;
 	GtkWidget *e_actions_label;
@@ -342,36 +342,28 @@ create_extra_widget (DialogData *data)
 	gtk_box_pack_start (GTK_BOX (hbox29), label47, FALSE, FALSE, 0);
 	gtk_label_set_justify (GTK_LABEL (label47), GTK_JUSTIFY_LEFT);
 
-	table1 = gtk_table_new (3, 2, FALSE);
-	gtk_box_pack_start (GTK_BOX (hbox29), table1, TRUE, TRUE, 0);
-	gtk_table_set_row_spacings (GTK_TABLE (table1), 6);
-	gtk_table_set_col_spacings (GTK_TABLE (table1), 6);
+	grid1 = gtk_grid_new ();
+	gtk_box_pack_start (GTK_BOX (hbox29), grid1, TRUE, TRUE, 0);
+	gtk_grid_set_row_spacing (GTK_GRID (grid1), 6);
+	gtk_grid_set_column_spacing (GTK_GRID (grid1), 6);
 
 	data->e_files_radiobutton = gtk_radio_button_new_with_mnemonic (NULL, _("_Files:"));
-	gtk_table_attach (GTK_TABLE (table1), data->e_files_radiobutton, 0, 1, 2, 3,
-			  (GtkAttachOptions) (GTK_FILL),
-			  (GtkAttachOptions) (0), 0, 0);
+	gtk_grid_attach (GTK_GRID (grid1), data->e_files_radiobutton, 0, 2, 1, 1);
 	gtk_radio_button_set_group (GTK_RADIO_BUTTON (data->e_files_radiobutton), e_files_radiobutton_group);
 	e_files_radiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (data->e_files_radiobutton));
 
 	data->e_files_entry = gtk_entry_new ();
-	gtk_table_attach (GTK_TABLE (table1), data->e_files_entry, 1, 2, 2, 3,
-			  (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-			  (GtkAttachOptions) (0), 0, 0);
+	gtk_grid_attach (GTK_GRID (grid1), data->e_files_entry, 1, 2, 1, 1);
 	gtk_widget_set_tooltip_text (data->e_files_entry, _("example: *.txt; *.doc"));
 	gtk_entry_set_activates_default (GTK_ENTRY (data->e_files_entry), TRUE);
 
 	data->e_all_radiobutton = gtk_radio_button_new_with_mnemonic (NULL, _("_All files"));
-	gtk_table_attach (GTK_TABLE (table1), data->e_all_radiobutton, 0, 2, 0, 1,
-			  (GtkAttachOptions) (GTK_FILL),
-			  (GtkAttachOptions) (0), 0, 0);
+	gtk_grid_attach (GTK_GRID (grid1), data->e_all_radiobutton, 0, 0, 2, 1);
 	gtk_radio_button_set_group (GTK_RADIO_BUTTON (data->e_all_radiobutton), e_files_radiobutton_group);
 	e_files_radiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (data->e_all_radiobutton));
 
 	data->e_selected_radiobutton = gtk_radio_button_new_with_mnemonic (NULL, _("_Selected files"));
-	gtk_table_attach (GTK_TABLE (table1), data->e_selected_radiobutton, 0, 2, 1, 2,
-			  (GtkAttachOptions) (GTK_FILL),
-			  (GtkAttachOptions) (0), 0, 0);
+	gtk_grid_attach (GTK_GRID (grid1), data->e_selected_radiobutton, 0, 1, 2, 1);
 	gtk_radio_button_set_group (GTK_RADIO_BUTTON (data->e_selected_radiobutton), e_files_radiobutton_group);
 	e_files_radiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (data->e_selected_radiobutton));
 
diff --git a/src/fr-window.c b/src/fr-window.c
index c0465d5..e1856ba 100644
--- a/src/fr-window.c
+++ b/src/fr-window.c
@@ -5373,6 +5373,7 @@ fr_window_attach (FrWindow      *window,
 		if (window->priv->contents != NULL)
 			gtk_widget_destroy (window->priv->contents);
 		window->priv->contents = child;
+		gtk_widget_set_vexpand (child, TRUE);
 		break;
 	case FR_WINDOW_AREA_FILTERBAR:
 		position = 4;
@@ -5386,13 +5387,11 @@ fr_window_attach (FrWindow      *window,
 		break;
 	}
 
-	gtk_table_attach (GTK_TABLE (window->priv->layout),
-			  child,
-			  0, 1,
-			  position, position + 1,
-			  GTK_EXPAND | GTK_FILL,
-			  ((area == FR_WINDOW_AREA_CONTENTS) ? GTK_EXPAND : 0) | GTK_FILL,
-			  0, 0);
+	gtk_widget_set_hexpand (child, TRUE);
+	gtk_grid_attach (GTK_GRID (window->priv->layout),
+			 child,
+			 0, position,
+			 1, 1);
 }
 
 
@@ -5457,7 +5456,7 @@ fr_window_construct (FrWindow *window)
 
 	/* Create the application. */
 
-	window->priv->layout = gtk_table_new (4, 1, FALSE);
+	window->priv->layout = gtk_grid_new ();
 	gtk_container_add (GTK_CONTAINER (window), window->priv->layout);
 	gtk_widget_show (window->priv->layout);