[balsa/gtk3] Port address book window from GtkTable to GtkGrid

[Peter Bloomfield <PeterB src gnome org>]

commit 5e7eac7eec330f1396a3d8ecf6c1ade80cfe258d
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Tue Oct 4 20:45:13 2011 -0400

    Port address book window from GtkTable to GtkGrid
    
    	* src/ab-window.c (balsa_ab_window_init): migrate from GtkTable
    	to GtkGrid.

 ChangeLog       |    5 +++++
 src/ab-window.c |   37 ++++++++++++++++++-------------------
 2 files changed, 23 insertions(+), 19 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 4b90a52..24849b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-04  Peter Bloomfield
+
+	* src/ab-window.c (balsa_ab_window_init): migrate from GtkTable
+	to GtkGrid.
+
 2011-10-03  Peter Bloomfield
 
 	Migrate from GtkTable to GtkGrid
diff --git a/src/ab-window.c b/src/ab-window.c
index 2e702ef..e2f2b8c 100644
--- a/src/ab-window.c
+++ b/src/ab-window.c
@@ -219,7 +219,7 @@ balsa_ab_window_init(BalsaAbWindow *ab)
     GtkWidget *find_label,
 	*vbox,
 	*w,
-	*table,
+	*grid,
 	*hbox,
 	*box2,
 	*scrolled_window,
@@ -269,13 +269,14 @@ balsa_ab_window_init(BalsaAbWindow *ab)
 
     gtk_box_pack_start(GTK_BOX(vbox), ab->combo_box, FALSE, FALSE, 0);
 
-    /* layout table */
-    table = gtk_table_new(3, 3, FALSE);
-    gtk_table_set_row_spacings(GTK_TABLE(table), 6);
-    gtk_box_pack_start(GTK_BOX(vbox), table, TRUE, TRUE, 0);
-    gtk_widget_show(table);
+    /* layout grid */
+    grid = gtk_grid_new();
+    gtk_grid_set_row_spacing(GTK_GRID(grid), 6);
+    gtk_grid_set_column_spacing(GTK_GRID(grid), 12);
+    gtk_box_pack_start(GTK_BOX(vbox), grid, TRUE, TRUE, 0);
+    gtk_widget_show(grid);
 
-    /* -- table column 1 -- */
+    /* -- grid column 1 -- */
     /* Entry widget for finding an address */
     find_label = gtk_label_new_with_mnemonic(_("_Search for Name:"));
     gtk_widget_show(find_label);
@@ -286,10 +287,9 @@ balsa_ab_window_init(BalsaAbWindow *ab)
     g_signal_connect(G_OBJECT(ab->filter_entry), "changed",
 		     G_CALLBACK(balsa_ab_window_find), ab);
 
-    /* Pack the find stuff into the table */
+    /* Pack the find stuff into the grid */
     box2 = gtk_hbox_new(FALSE, 1);
-    gtk_table_attach(GTK_TABLE(table), box2, 0, 1, 0, 1,
-		     GTK_FILL, GTK_FILL, 0, 0);
+    gtk_grid_attach(GTK_GRID(grid), box2, 0, 0, 1, 1);
     gtk_box_pack_start(GTK_BOX(box2), find_label, FALSE, FALSE, 0);
     gtk_box_pack_start(GTK_BOX(box2), ab->filter_entry, TRUE, TRUE, 0);
     gtk_widget_show(GTK_WIDGET(box2));
@@ -300,7 +300,7 @@ balsa_ab_window_init(BalsaAbWindow *ab)
     gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window),
 				   GTK_POLICY_AUTOMATIC,
 				   GTK_POLICY_AUTOMATIC);
-    gtk_table_attach_defaults(GTK_TABLE(table), scrolled_window, 0, 1, 1, 2);
+    gtk_grid_attach(GTK_GRID(grid), scrolled_window, 0, 1, 1, 1);
     gtk_widget_show(scrolled_window);
     gtk_container_add(GTK_CONTAINER(scrolled_window), ab->address_list);
     gtk_widget_set_size_request(scrolled_window, 300, 250);
@@ -308,7 +308,7 @@ balsa_ab_window_init(BalsaAbWindow *ab)
     /* Buttons ... */
     hbox = gtk_hbutton_box_new();
     gtk_button_box_set_layout(GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_SPREAD);
-    gtk_table_attach(GTK_TABLE(table), hbox, 0, 1, 2, 3, GTK_FILL, GTK_FILL, 0, 0);
+    gtk_grid_attach(GTK_GRID(grid), hbox, 0, 2, 1, 1);
     gtk_widget_show(GTK_WIDGET(hbox));
 
     w = balsa_stock_button_with_label(GTK_STOCK_OPEN,
@@ -328,11 +328,11 @@ balsa_ab_window_init(BalsaAbWindow *ab)
 
     balsa_ab_window_load(ab);
 
-    /* -- table column 2 -- */
+    /* -- grid column 2 -- */
     /* Column for arrows in compose mode */
     ab->arrow_box = gtk_vbox_new(FALSE, 5);
-    gtk_table_attach(GTK_TABLE(table), ab->arrow_box, 1, 2, 1, 2,
-		     GTK_FILL, GTK_EXPAND | GTK_FILL, 6, 0);
+    gtk_widget_set_vexpand(ab->arrow_box, TRUE);
+    gtk_grid_attach(GTK_GRID(grid), ab->arrow_box, 1, 1, 1, 1);
     gtk_widget_show(ab->arrow_box);
 
     w = balsa_stock_button_with_label(GTK_STOCK_GO_FORWARD, "");
@@ -349,19 +349,18 @@ balsa_ab_window_init(BalsaAbWindow *ab)
 		     G_CALLBACK(balsa_ab_window_remove_from_recipient_list),
 		       ab);
 
-    /* -- table column 3 -- */
+    /* -- grid column 3 -- */
     /* label for selected addresses in compose mode */
     ab->send_to_label = gtk_label_new(_("Send-To"));
     gtk_widget_show(ab->send_to_label);
-    gtk_table_attach(GTK_TABLE(table), ab->send_to_label, 2, 3, 0, 1,
-		     GTK_FILL, GTK_FILL, 0, 0);
+    gtk_grid_attach(GTK_GRID(grid), ab->send_to_label, 2, 0, 1, 1);
 
     /* list for selected addresses in compose mode */
     ab->send_to_list = gtk_scrolled_window_new(NULL, NULL);
     gtk_widget_show(ab->send_to_list);
     gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ab->send_to_list),
 				   GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-    gtk_table_attach_defaults(GTK_TABLE(table), ab->send_to_list, 2, 3, 1, 2);
+    gtk_grid_attach(GTK_GRID(grid), ab->send_to_list, 2, 1, 1, 1);
     gtk_container_add(GTK_CONTAINER(ab->send_to_list), ab->recipient_list);
     gtk_widget_set_size_request(ab->send_to_list, 300, 250);