gnome-games r8636 - in trunk: glines gnect/src gnobots2 iagno

[chpe svn gnome org]

Author: chpe
Date: Tue Feb  3 14:39:21 2009
New Revision: 8636
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8636&view=rev

Log:
Fix various packing properties and spacings.

Modified:
   trunk/glines/glines.c
   trunk/gnect/src/prefs.c
   trunk/gnobots2/properties.c
   trunk/iagno/properties.c

Modified: trunk/glines/glines.c
==============================================================================
--- trunk/glines/glines.c	(original)
+++ trunk/glines/glines.c	Tue Feb  3 14:39:21 2009
@@ -1466,7 +1466,7 @@
     table = gtk_table_new (2, 2, FALSE);
     gtk_container_set_border_width (GTK_CONTAINER (table), 0);
     gtk_table_set_row_spacings (GTK_TABLE (table), 6);
-    gtk_table_set_col_spacings (GTK_TABLE (table), 6);
+    gtk_table_set_col_spacings (GTK_TABLE (table), 12);
     gtk_container_add (GTK_CONTAINER (frame), table);
     gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
 
@@ -1497,8 +1497,7 @@
 
 
     frame = games_frame_new (_("Board Size"));
-    fv = gtk_vbox_new (FALSE, FALSE);
-    gtk_box_set_spacing (GTK_BOX (fv), 6);
+    fv = gtk_vbox_new (FALSE, 6);
     gtk_container_add (GTK_CONTAINER (frame), fv);
     gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
 
@@ -1517,8 +1516,7 @@
     }
 
     frame = games_frame_new (C_("preferences", "General"));
-    fv = gtk_vbox_new (FALSE, FALSE);
-    gtk_box_set_spacing (GTK_BOX (fv), 6);
+    fv = gtk_vbox_new (FALSE, 6);
     gtk_container_add (GTK_CONTAINER (frame), fv);
     gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
 

Modified: trunk/gnect/src/prefs.c
==============================================================================
--- trunk/gnect/src/prefs.c	(original)
+++ trunk/gnect/src/prefs.c	Tue Feb  3 14:39:21 2009
@@ -363,16 +363,7 @@
 
   /* keyboard tab */
 
-  vbox1 = gtk_vbox_new (FALSE, 0);
-  label = gtk_label_new_with_mnemonic (_("Controls"));
-  gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox1, label);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox1), 12);
-
-  frame = games_frame_new (_("Keyboard Controls"));
-  gtk_container_add (GTK_CONTAINER (vbox1), frame);
-
-  vbox2 = gtk_vbox_new (FALSE, 6);
-  gtk_container_add (GTK_CONTAINER (frame), vbox2);
+  label = gtk_label_new_with_mnemonic (_("Keyboard Controls"));
 
   controls_list = games_controls_list_new (NULL);
   games_controls_list_add_controls (GAMES_CONTROLS_LIST (controls_list),
@@ -380,8 +371,8 @@
                                     KEY_MOVE_RIGHT, _("Move right"), DEFAULT_KEY_RIGHT,
 				    KEY_MOVE_DROP, _("Drop marble"), DEFAULT_KEY_DROP,
                                     NULL);
-
-  gtk_box_pack_start (GTK_BOX (vbox2), controls_list, TRUE, TRUE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (controls_list), 12);
+  gtk_notebook_append_page (GTK_NOTEBOOK (notebook), controls_list, label);
 
   /* fill in initial values */
 

Modified: trunk/gnobots2/properties.c
==============================================================================
--- trunk/gnobots2/properties.c	(original)
+++ trunk/gnobots2/properties.c	Tue Feb  3 14:39:21 2009
@@ -457,7 +457,7 @@
   gtk_container_set_border_width (GTK_CONTAINER (cpage), 12);
 
   frame = games_frame_new (_("Game Type"));
-  gtk_box_pack_start (GTK_BOX (cpage), frame, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (cpage), frame, FALSE, FALSE, 0);
 
   vbox = gtk_vbox_new (FALSE, 6);
   gtk_container_add (GTK_CONTAINER (frame), vbox);

Modified: trunk/iagno/properties.c
==============================================================================
--- trunk/iagno/properties.c	(original)
+++ trunk/iagno/properties.c	Tue Feb  3 14:39:21 2009
@@ -423,7 +423,7 @@
   gtk_table_set_col_spacings (GTK_TABLE (table), 18);
   gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
 
-  vbox2 = gtk_vbox_new (FALSE, 0);
+  vbox2 = gtk_vbox_new (FALSE, 6);
   gtk_box_pack_start (GTK_BOX (vbox), vbox2, FALSE, FALSE, 0);
 
   button = gtk_check_button_new_with_mnemonic (_("_Use quick moves"));