--- freeciv-01-26-02/client/gui-gtk/dialogs.c	Sat Dec 22 02:06:11 2001
+++ freeciv/client/gui-gtk/dialogs.c	Tue Feb 26 14:42:46 2002
@@ -54,6 +54,7 @@
 /******************************************************************/
 static GtkWidget  *races_dialog_shell=NULL;
 static GtkWidget  *races_toggles_form;
+static GtkWidget  *races_name_label;
 static GtkWidget  *races_sex_toggles_form;
 static GtkWidget  *city_style_toggles_form;
 static GtkWidget  *races_ok_command;            /* ok button */
@@ -1918,7 +1919,7 @@
 *****************************************************************/
 void create_races_dialog(void)
 {
-  int       per_row = 5;
+  int       per_row = 8;
   int       i;
   GSList    *group = NULL;
   GSList    *sgroup = NULL;
@@ -1951,16 +1952,30 @@
   sorted_races_list=g_list_sort(sorted_races_list,cmp_func);
   for(i=0; i<g_list_length(sorted_races_list); i++) {
     gint nat_id=GPOINTER_TO_INT(g_list_nth_data(sorted_races_list,i));
-    races_toggles[i]=gtk_radio_button_new_with_label(group,
-						     get_nation_name(nat_id));
+    GtkWidget *flag;
+    SPRITE *s;
+    races_toggles[i]=gtk_radio_button_new(group);
+    s=get_nation_by_idx(nat_id)->flag_sprite;
+    flag=gtk_pixmap_new(s->pixmap,s->mask);
+    gtk_misc_set_alignment(GTK_MISC(flag),0,1);
+    gtk_container_add(GTK_CONTAINER(races_toggles[i]),flag);
     gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(races_toggles[i]), FALSE);
     group = gtk_radio_button_group( GTK_RADIO_BUTTON( races_toggles[i] ) );
     gtk_table_attach_defaults(GTK_TABLE(races_toggles_form),races_toggles[i],
 			      i%per_row, i%per_row+1, i/per_row, i/per_row+1);
   }
 
+  /* --- show nation name, or rather, leave space to do so --- */
+
+  /*Don't bother i18nizing, it'll probably never appear*/
+  races_name_label=gtk_label_new("no nation selected"); 
+  gtk_box_pack_start( GTK_BOX( GTK_DIALOG( races_dialog_shell )->vbox ),
+		      races_name_label, FALSE, FALSE, 0 );
+
   /* ------- nation leader combo ------- */
 
+
+
   races_name = gtk_combo_new();
 
   gtk_box_pack_start( GTK_BOX( GTK_DIALOG( races_dialog_shell )->vbox ),
@@ -2150,6 +2165,9 @@
 static void races_toggles_callback( GtkWidget *w, gpointer race_id_p )
 {
   selected_nation = GPOINTER_TO_INT(race_id_p);
+
+  gtk_label_set_text(GTK_LABEL(races_name_label),
+		     get_nation_by_idx(selected_nation)->name);
 
   select_random_leader();