Index: prefs.c
===================================================================
RCS file: /cvs/gnome/gnome-games/gnect/src/prefs.c,v
retrieving revision 1.30
diff -u -p -r1.30 prefs.c
--- prefs.c	15 Sep 2004 11:07:11 -0000	1.30
+++ prefs.c	22 Mar 2005 04:58:57 -0000
@@ -377,25 +377,30 @@ prefsbox_open (void)
 	                                        GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT,
 	                                        NULL);
 	gtk_dialog_set_has_separator (GTK_DIALOG(prefsbox), FALSE);
+	gtk_container_set_border_width (GTK_CONTAINER(prefsbox), 5);
+	gtk_box_set_spacing (GTK_BOX (GTK_DIALOG(prefsbox)->vbox), 2);
+
 	g_signal_connect (G_OBJECT(prefsbox), "destroy",
 	                  G_CALLBACK(gtk_widget_destroyed), &prefsbox);
 
 	notebook = gtk_notebook_new ();
+	gtk_container_set_border_width (GTK_CONTAINER (notebook), 5);
 	gtk_box_pack_start (GTK_BOX(GTK_DIALOG(prefsbox)->vbox), notebook,
 	                    TRUE, TRUE, 0);
 
 
 	/* game tab */
 
-	vbox1 = gtk_vbox_new (FALSE, 0);
-	label = gtk_label_new_with_mnemonic (_("_Game"));
+	vbox1 = gtk_vbox_new (FALSE, 18);
+	gtk_container_set_border_width (GTK_CONTAINER (vbox1), 12);
+	label = gtk_label_new (_("Game"));
 	gtk_notebook_append_page (GTK_NOTEBOOK(notebook), vbox1, label);
 
-	hbox = gtk_hbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox1), hbox, TRUE, TRUE, 0);
+	hbox = gtk_hbox_new (FALSE, 18);
+	gtk_box_pack_start (GTK_BOX (vbox1), hbox, FALSE, FALSE, 0);
 
 	frame_player1 = games_frame_new (NULL);
-	gtk_box_pack_start (GTK_BOX(hbox), frame_player1, TRUE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX(hbox), frame_player1, FALSE, FALSE, 0);
 
 	vbox2 = gtk_vbox_new (FALSE, 0);
 	gtk_container_add (GTK_CONTAINER(frame_player1), vbox2);
@@ -408,7 +413,7 @@ prefsbox_open (void)
 	}
 
 	frame_player2 = games_frame_new (NULL);
-	gtk_box_pack_start (GTK_BOX(hbox), frame_player2, TRUE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX(hbox), frame_player2, FALSE, FALSE, 0);
 
 	vbox2 = gtk_vbox_new (FALSE, 0);
 	gtk_container_add (GTK_CONTAINER(frame_player2), vbox2);
@@ -421,16 +426,16 @@ prefsbox_open (void)
 	}
 
 	frame = games_frame_new (_("Appearance"));
-	gtk_box_pack_start (GTK_BOX(vbox1), frame, TRUE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX(vbox1), frame, FALSE, FALSE, 0);
 
-	vbox2 = gtk_vbox_new (FALSE, 0);
+	vbox2 = gtk_vbox_new (FALSE, 6);
 	gtk_container_add (GTK_CONTAINER(frame), vbox2);
 
-	hbox = gtk_hbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX(vbox2), hbox, FALSE, FALSE, 0);
+	hbox = gtk_hbox_new (FALSE, 12);
+	gtk_box_pack_start (GTK_BOX(vbox2), hbox, TRUE, TRUE, 0);
 
 	label = gtk_label_new_with_mnemonic (_("_Theme:"));
-	gtk_box_pack_start (GTK_BOX(hbox), label, TRUE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX(hbox), label, FALSE, FALSE, 0);
 	gtk_misc_set_alignment (GTK_MISC(label), 7.45058e-09, 0.5);
 
 	combobox_theme = gtk_combo_box_new_text ();
@@ -444,7 +449,7 @@ prefsbox_open (void)
 	gtk_label_set_mnemonic_widget (GTK_LABEL(label), combobox_theme);
 
 	checkbutton_animate = gtk_check_button_new_with_mnemonic (_("Enable _animation"));
-	gtk_box_pack_start (GTK_BOX(vbox2), checkbutton_animate, FALSE, FALSE, 6);
+	gtk_box_pack_start (GTK_BOX(vbox2), checkbutton_animate, FALSE, FALSE, 0);
 
 
 	/* keyboard tab */
@@ -452,8 +457,9 @@ prefsbox_open (void)
 	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"));
+	frame = games_frame_new (_("Keyboard Controls"));
 	gtk_container_add (GTK_CONTAINER(vbox1), frame);
 
 	vbox2 = gtk_vbox_new (FALSE, 6);
@@ -462,7 +468,7 @@ prefsbox_open (void)
 	controls_list = games_controls_list_new ();
 	games_controls_list_add_controls (GAMES_CONTROLS_LIST (controls_list), KEY_MOVE_LEFT, KEY_MOVE_RIGHT, KEY_MOVE_DROP, NULL);
 
-	gtk_box_pack_start (GTK_BOX(vbox2), controls_list, FALSE, FALSE, 0);
+	gtk_box_pack_start (GTK_BOX(vbox2), controls_list, TRUE, TRUE, 0);
 
 	/* fill in initial values */
 
Index: main.c
===================================================================
RCS file: /cvs/gnome/gnome-games/gnect/src/main.c,v
retrieving revision 1.20
diff -u -p -r1.20 main.c
--- main.c	16 Feb 2005 21:28:27 -0000	1.20
+++ main.c	22 Mar 2005 04:58:58 -0000
@@ -687,12 +687,12 @@ scorebox_update (void)
 
 	if (get_n_human_players () == 1) {
 		if (p.level[PLAYER1] == LEVEL_HUMAN) {
-			gtk_label_set_text (GTK_LABEL(label_name[PLAYER1]), _("You"));
-			gtk_label_set_text (GTK_LABEL(label_name[PLAYER2]), _("Me"));
+			gtk_label_set_text (GTK_LABEL(label_name[PLAYER1]), _("You:"));
+			gtk_label_set_text (GTK_LABEL(label_name[PLAYER2]), _("Me:"));
 		}
 		else {
-			gtk_label_set_text (GTK_LABEL(label_name[PLAYER1]), _("Me"));
-			gtk_label_set_text (GTK_LABEL(label_name[PLAYER2]), _("You"));
+			gtk_label_set_text (GTK_LABEL(label_name[PLAYER1]), _("Me:"));
+			gtk_label_set_text (GTK_LABEL(label_name[PLAYER2]), _("You:"));
 		}
 	}
 	else {
@@ -745,24 +745,28 @@ on_game_scores (GtkMenuItem *m, gpointer
 	                                        GTK_RESPONSE_CLOSE,
 	                                        NULL);
 
+	gtk_dialog_set_has_separator (GTK_DIALOG (scorebox), FALSE);
+	gtk_window_set_resizable (GTK_WINDOW (scorebox), FALSE);
+	gtk_container_set_border_width (GTK_CONTAINER (scorebox), 5);
+	gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (scorebox)->vbox), 2);
+
 	g_signal_connect (GTK_OBJECT(scorebox), "destroy",
 	                  GTK_SIGNAL_FUNC(gtk_widget_destroyed), &scorebox);
 
-	vbox = gtk_vbox_new (FALSE, 0);
-	gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
+	vbox = gtk_vbox_new (FALSE, 6);
+	gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 	gtk_box_pack_start (GTK_BOX(GTK_DIALOG(scorebox)->vbox), vbox, TRUE, TRUE, 0);
 
 	if (fname_icon != NULL) {
 		GtkWidget *icon = gtk_image_new_from_file (fname_icon);
 		if (icon != NULL) {
-			gtk_box_pack_start (GTK_BOX(vbox), icon, FALSE, FALSE, 6);
+			gtk_box_pack_start (GTK_BOX(vbox), icon, FALSE, FALSE, 0);
 		}
 	}
 
 	table = gtk_table_new (3, 2, FALSE);
 	gtk_box_pack_start (GTK_BOX(vbox), table, TRUE, TRUE, 0);
-	gtk_container_set_border_width (GTK_CONTAINER(table), 5);
-	gtk_table_set_col_spacings (GTK_TABLE(table), 10);
+	gtk_table_set_col_spacings (GTK_TABLE(table), 12);
 	gtk_table_set_col_spacings (GTK_TABLE(table), 6);
 
 	label_name[PLAYER1] = gtk_label_new (NULL);
@@ -773,7 +777,7 @@ on_game_scores (GtkMenuItem *m, gpointer
 	label_score[PLAYER1] = gtk_label_new (NULL);
 	gtk_table_attach (GTK_TABLE(table), label_score[PLAYER1], 1, 2, 0, 1,
 	                  (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)0, 0, 0);
-	gtk_misc_set_alignment (GTK_MISC(label_score[PLAYER1]), 0, 0.5);
+	gtk_misc_set_alignment (GTK_MISC(label_score[PLAYER1]), 1, 0.5);
 
 	label_name[PLAYER2] = gtk_label_new (NULL);
 	gtk_table_attach (GTK_TABLE(table), label_name[PLAYER2], 0, 1, 1, 2,
@@ -783,9 +787,9 @@ on_game_scores (GtkMenuItem *m, gpointer
 	label_score[PLAYER2] = gtk_label_new (NULL);
 	gtk_table_attach (GTK_TABLE(table), label_score[PLAYER2], 1, 2, 1, 2,
 	                  (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)0, 0, 0);
-	gtk_misc_set_alignment (GTK_MISC(label_score[PLAYER2]), 0, 0.5);
+	gtk_misc_set_alignment (GTK_MISC(label_score[PLAYER2]), 1, 0.5);
 
-	label_name[NOBODY] = gtk_label_new (_("Drawn"));
+	label_name[NOBODY] = gtk_label_new (_("Drawn:"));
 	gtk_table_attach (GTK_TABLE(table), label_name[NOBODY], 0, 1, 2, 3,
 	                  (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)0, 0, 0);
 	gtk_misc_set_alignment (GTK_MISC(label_name[NOBODY]), 0, 0.5);
@@ -793,7 +797,7 @@ on_game_scores (GtkMenuItem *m, gpointer
 	label_score[NOBODY] = gtk_label_new (NULL);
 	gtk_table_attach (GTK_TABLE(table), label_score[NOBODY], 1, 2, 2, 3,
 	                  (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)0, 0, 0);
-	gtk_misc_set_alignment (GTK_MISC(label_score[NOBODY]), 0, 0.5);
+	gtk_misc_set_alignment (GTK_MISC(label_score[NOBODY]), 1, 0.5);
 
 	g_signal_connect (GTK_DIALOG(scorebox), "response",
 	                  GTK_SIGNAL_FUNC(on_dialog_close), NULL);
