[nautilus] view: port GtkTable to GtkGrid

[Cosimo Cecchi <cosimoc src gnome org>]

commit c6903f412d204ce4ab83fa328fe7df3c81781b68
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Tue Oct 4 17:26:35 2011 -0400

    view: port GtkTable to GtkGrid

 src/nautilus-view.c |   80 +++++++++++++++++++++++++++-----------------------
 1 files changed, 43 insertions(+), 37 deletions(-)
---
diff --git a/src/nautilus-view.c b/src/nautilus-view.c
index dca1413..5e27a6a 100644
--- a/src/nautilus-view.c
+++ b/src/nautilus-view.c
@@ -1552,7 +1552,7 @@ select_pattern (NautilusView *view)
 	GtkWidget *dialog;
 	GtkWidget *label;
 	GtkWidget *example;
-	GtkWidget *table;
+	GtkWidget *grid;
 	GtkWidget *entry;
 	char *example_pattern;
 
@@ -1572,39 +1572,37 @@ select_pattern (NautilusView *view)
 	gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 2);
 
 	label = gtk_label_new_with_mnemonic (_("_Pattern:"));
+	gtk_widget_set_halign (label, GTK_ALIGN_START);
+
 	example = gtk_label_new (NULL);
-	example_pattern = g_strdup_printf ("<b>%s</b><i>%s</i>", 
+	gtk_widget_set_halign (example, GTK_ALIGN_START);
+	example_pattern = g_strdup_printf ("<b>%s</b><i>%s</i> ", 
 					   _("Examples: "),
 					   "*.png, file\?\?.txt, pict*.\?\?\?");
 	gtk_label_set_markup (GTK_LABEL (example), example_pattern);
 	g_free (example_pattern);
-	gtk_misc_set_alignment (GTK_MISC (example), 0.0, 0.5);
+
 	entry = gtk_entry_new ();
 	gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
+	gtk_widget_set_hexpand (entry, TRUE);
+
+	grid = gtk_grid_new ();
+	g_object_set (grid,
+		      "orientation", GTK_ORIENTATION_VERTICAL,
+		      "border-width", 6,
+		      "row-spacing", 6,
+		      "column-spacing", 12,
+		      NULL);
 
-	table = gtk_table_new (2, 2, FALSE);
-	
-	gtk_table_attach (GTK_TABLE (table), label,
-			  0, 1,
-			  0, 1,
-			  GTK_FILL, GTK_FILL,
-			  5, 5);
-
-	gtk_table_attach (GTK_TABLE (table), entry,
-			  1, 2,
-			  0, 1,
-			  GTK_EXPAND | GTK_FILL, GTK_FILL,
-			  5, 5);
-
-	gtk_table_attach (GTK_TABLE (table), example,
-			  1, 2,
-			  1, 2,
-			  GTK_FILL, GTK_FILL,
-			  5, 0);
+	gtk_container_add (GTK_CONTAINER (grid), label);
+	gtk_grid_attach_next_to (GTK_GRID (grid), entry, label,
+				 GTK_POS_RIGHT, 1, 1);
+	gtk_grid_attach_next_to (GTK_GRID (grid), example, entry,
+				 GTK_POS_BOTTOM, 1, 1);
 
 	gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry);
-	gtk_widget_show_all (table);
-	gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), table);
+	gtk_widget_show_all (grid);
+	gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), grid);
 	g_object_set_data (G_OBJECT (dialog), "entry", entry);
 	g_signal_connect (dialog, "response",
 			  G_CALLBACK (pattern_select_response_cb),
@@ -1681,7 +1679,7 @@ action_save_search_as_callback (GtkAction *action,
 {
 	NautilusView	*directory_view;
 	NautilusSearchDirectory *search;
-	GtkWidget *dialog, *table, *label, *entry, *chooser, *save_button;
+	GtkWidget *dialog, *grid, *label, *entry, *chooser, *save_button;
 	const char *entry_text;
 	char *filename, *filename_utf8, *dirname, *path, *uri;
 	GFile *location;
@@ -1705,19 +1703,25 @@ action_save_search_as_callback (GtkAction *action,
 		gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 2);
 		gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
 
-		table = gtk_table_new (2, 2, FALSE);
-		gtk_container_set_border_width (GTK_CONTAINER (table), 5);
-		gtk_table_set_row_spacings (GTK_TABLE (table), 6);
-		gtk_table_set_col_spacings (GTK_TABLE (table), 12);
-		gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), table, TRUE, TRUE, 0);
-		gtk_widget_show (table);
+		grid = gtk_grid_new ();
+		g_object_set (grid,
+			      "orientation", GTK_ORIENTATION_VERTICAL,
+			      "border-width", 5,
+			      "row-spacing", 6,
+			      "column-spacing", 12,
+			      NULL);
+		gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), grid, TRUE, TRUE, 0);
+		gtk_widget_show (grid);
 		
 		label = gtk_label_new_with_mnemonic (_("Search _name:"));
-		gtk_misc_set_alignment (GTK_MISC(label), 0.0, 0.5);
-		gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0);
+		gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+		gtk_container_add (GTK_CONTAINER (grid), label);
 		gtk_widget_show (label);
+
 		entry = gtk_entry_new ();
-		gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 0, 1, GTK_FILL | GTK_EXPAND, 0, 0, 0);
+		gtk_widget_set_hexpand (entry, TRUE);
+		gtk_grid_attach_next_to (GTK_GRID (grid), entry, label,
+					 GTK_POS_RIGHT, 1, 1);
 		gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
 		gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry);
 		
@@ -1728,12 +1732,14 @@ action_save_search_as_callback (GtkAction *action,
 		gtk_widget_show (entry);
 		label = gtk_label_new_with_mnemonic (_("_Folder:"));
 		gtk_misc_set_alignment (GTK_MISC(label), 0.0, 0.5);
-		gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
+		gtk_container_add (GTK_CONTAINER (grid), label);
 		gtk_widget_show (label);
 
 		chooser = gtk_file_chooser_button_new (_("Select Folder to Save Search In"),
 						       GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
-		gtk_table_attach (GTK_TABLE (table), chooser, 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, 0, 0, 0);
+		gtk_widget_set_hexpand (chooser, TRUE);
+		gtk_grid_attach_next_to (GTK_GRID (grid), chooser, label,
+					 GTK_POS_RIGHT, 1, 1);
 		gtk_label_set_mnemonic_widget (GTK_LABEL (label), chooser);
 		gtk_widget_show (chooser);