[gnome-font-viewer] font-view: port GtkTable -> GtkGrid

[Cosimo Cecchi <cosimoc src gnome org>]

commit ad362dfcb692581c02a1cb9c734a418171a0f329
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Tue Oct 25 11:55:46 2011 -0400

    font-view: port GtkTable -> GtkGrid

 src/font-view.c |   73 ++++++++++++++++++++++++++----------------------------
 1 files changed, 35 insertions(+), 38 deletions(-)
---
diff --git a/src/font-view.c b/src/font-view.c
index ab05968..c43f537 100644
--- a/src/font-view.c
+++ b/src/font-view.c
@@ -212,8 +212,7 @@ draw_callback (GtkWidget *drawing_area,
 }
 
 static void
-add_row (GtkWidget *table,
-	 gint *row_p,
+add_row (GtkWidget *grid,
 	 const gchar *name,
 	 const gchar *value,
 	 gboolean multiline,
@@ -228,8 +227,7 @@ add_row (GtkWidget *table,
     gtk_misc_set_alignment (GTK_MISC (name_w), 0.0, 0.0);
     gtk_label_set_use_markup (GTK_LABEL (name_w), TRUE);
 
-    gtk_table_attach (GTK_TABLE(table), name_w, 0, 1, *row_p, *row_p + 1,
-		      GTK_FILL, GTK_FILL, 0, 0);
+    gtk_container_add (GTK_CONTAINER (grid), name_w);
 
     if (multiline) {
 	GtkWidget *label, *viewport;
@@ -251,33 +249,30 @@ add_row (GtkWidget *table,
         gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_NONE);
 
         gtk_container_add (GTK_CONTAINER (swin), viewport);
-        (*row_p)++;
 
-        if (expand)
-          flags = GTK_FILL | GTK_EXPAND;
-        else
-          flags = GTK_FILL;
+        if (expand) {
+            gtk_widget_set_hexpand (GTK_WIDGET (swin), TRUE);
+            gtk_widget_set_vexpand (GTK_WIDGET (swin), TRUE);
+        }
 
-        gtk_table_attach (GTK_TABLE (table), GTK_WIDGET (swin),
-			  0, 2, *row_p, *row_p + 1,
-			  GTK_FILL | GTK_EXPAND, flags, 0, 0);
+        gtk_container_add_with_properties (GTK_CONTAINER (grid), GTK_WIDGET (swin),
+                                           "width", 2,
+                                           NULL);
 
         gtk_container_add (GTK_CONTAINER (viewport), label);
     } else {
         GtkWidget *label = gtk_label_new (value);
         gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 	gtk_label_set_selectable (GTK_LABEL(label), TRUE);
-        gtk_table_attach (GTK_TABLE (table), label,
-			  1, 2, *row_p, *row_p + 1,
-			  GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
-    }
 
-    (*row_p)++;
+        gtk_grid_attach_next_to (GTK_GRID (grid), label, 
+                                 name_w, GTK_POS_RIGHT,
+                                 1, 1);
+    }
 }
 
 static void
-add_face_info (GtkWidget *table,
-	       gint *row_p,
+add_face_info (GtkWidget *grid,
 	       const gchar *uri,
 	       FT_Face face)
 {
@@ -286,10 +281,10 @@ add_face_info (GtkWidget *table,
     GFileInfo *info;
     PS_FontInfoRec ps_info;
 
-    add_row (table, row_p, _("Name:"), face->family_name, FALSE, FALSE);
+    add_row (grid, _("Name:"), face->family_name, FALSE, FALSE);
 
     if (face->style_name)
-	add_row (table, row_p, _("Style:"), face->style_name, FALSE, FALSE);
+	add_row (grid, _("Style:"), face->style_name, FALSE, FALSE);
 
     file = g_file_new_for_uri (uri);
     info = g_file_query_info (file,
@@ -301,11 +296,11 @@ add_face_info (GtkWidget *table,
 
     if (info != NULL) {
         s = g_content_type_get_description (g_file_info_get_content_type (info));
-        add_row (table, row_p, _("Type:"), s, FALSE, FALSE);
+        add_row (grid, _("Type:"), s, FALSE, FALSE);
         g_free (s);
 
         s = g_format_size_for_display (g_file_info_get_size (info));
-        add_row (table, row_p, _("Size:"), s, FALSE, FALSE);
+        add_row (grid, _("Size:"), s, FALSE, FALSE);
         g_free (s);
 
         g_object_unref (info);
@@ -349,22 +344,22 @@ add_face_info (GtkWidget *table,
 	    }
 	}
 	if (version) {
-	    add_row (table, row_p, _("Version:"), version, FALSE, FALSE);
+	    add_row (grid, _("Version:"), version, FALSE, FALSE);
 	    g_free (version);
 	}
 	if (copyright) {
-	    add_row (table, row_p, _("Copyright:"), copyright, TRUE, TRUE);
+	    add_row (grid, _("Copyright:"), copyright, TRUE, TRUE);
 	    g_free (copyright);
 	}
 	if (description) {
-	    add_row (table, row_p, _("Description:"), description, TRUE, TRUE);
+	    add_row (grid, _("Description:"), description, TRUE, TRUE);
 	    g_free (description);
 	}
     } else if (FT_Get_PS_Font_Info (face, &ps_info) == 0) {
 	if (ps_info.version && g_utf8_validate (ps_info.version, -1, NULL))
-	    add_row (table, row_p, _("Version:"), ps_info.version, FALSE, FALSE);
+	    add_row (grid, _("Version:"), ps_info.version, FALSE, FALSE);
 	if (ps_info.notice && g_utf8_validate (ps_info.notice, -1, NULL))
-	    add_row (table, row_p, _("Copyright:"), ps_info.notice, TRUE, FALSE);
+	    add_row (grid, _("Copyright:"), ps_info.notice, TRUE, FALSE);
     }
 }
 
@@ -488,7 +483,7 @@ main (int argc,
     GFile *file;
     gchar *font_file, *title;
     gint row;
-    GtkWidget *window, *hbox, *table, *swin, *drawing_area;
+    GtkWidget *window, *hbox, *grid, *swin, *drawing_area;
     GdkColor white = { 0, 0xffff, 0xffff, 0xffff };
     GtkWidget *button, *align;
 
@@ -557,25 +552,27 @@ main (int argc,
     g_signal_connect (window, "destroy",
 		      G_CALLBACK (gtk_main_quit), NULL);
 
-    table = gtk_table_new (1, 2, FALSE);
-    gtk_container_set_border_width (GTK_CONTAINER (table), 5);
-    gtk_box_pack_start (GTK_BOX (hbox), table, FALSE, TRUE, 0);
+    grid = gtk_grid_new ();
+    gtk_orientable_set_orientation (GTK_ORIENTABLE (grid), GTK_ORIENTATION_VERTICAL);
+    gtk_container_set_border_width (GTK_CONTAINER (grid), 5);
+    gtk_box_pack_start (GTK_BOX (hbox), grid, FALSE, TRUE, 0);
 
-    row = 0;
-    add_face_info (table, &row, font_file, face);
+    add_face_info (grid, font_file, face);
 
     /* add install button */
     align = gtk_alignment_new (1.0, 0.5, 0.0, 0.0);
-    gtk_table_attach (GTK_TABLE (table), align, 0, 2, row, row + 1,
-                      GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
+    gtk_widget_set_hexpand (align, TRUE);
+    gtk_container_add_with_properties (GTK_CONTAINER (grid), align,
+                                       "width", 2,
+                                       NULL);
 
     button = gtk_button_new_with_mnemonic (_("I_nstall Font"));
     g_signal_connect (button, "clicked",
                       G_CALLBACK (install_button_clicked_cb), font_file);
     gtk_container_add (GTK_CONTAINER (align), button);
 
-    gtk_table_set_col_spacings (GTK_TABLE (table), 8);
-    gtk_table_set_row_spacings (GTK_TABLE (table), 2);
+    gtk_grid_set_column_spacing (GTK_GRID (grid), 8);
+    gtk_grid_set_row_spacing (GTK_GRID (grid), 2);
     gtk_widget_show_all (window);
 
     gtk_main ();