--- freeciv/client/gui-gtk/cma_fe.c	Tue Feb  5 10:03:53 2002
+++ work/client/gui-gtk/cma_fe.c	Tue Feb  5 14:42:49 2002
@@ -132,8 +132,8 @@
 {
   struct cma_dialog *pdialog;
   struct cma_parameter param;
-  GtkWidget *frame, *page, *hbox, *label, *table;
-  GtkWidget *vbox, *scrolledwindow, *hscale;
+  GtkWidget *frame, *top, *page, *hbox, *label, *table;
+  GtkWidget *bottom, *vbox, *scrolledwindow, *hscale;
   static gchar *preset_title_[] = { N_("Presets") };
   static gchar **preset_title = NULL;
   int i;
@@ -151,11 +151,14 @@
   frame = gtk_frame_new(_("Citizen Management Agent"));
   gtk_box_pack_start(GTK_BOX(pdialog->shell), frame, TRUE, TRUE, 0);
 
-  page = gtk_hbox_new(FALSE, 0);
+  page = gtk_vbox_new(FALSE, 0);
   gtk_container_add(GTK_CONTAINER(frame), page);
 
+  top = gtk_hbox_new(FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(page), top, TRUE, TRUE, 0);
+
   vbox = gtk_vbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(page), vbox, TRUE, TRUE, 0);
+  gtk_box_pack_start(GTK_BOX(top), vbox, TRUE, TRUE, 0);
 
   scrolledwindow = gtk_scrolled_window_new(NULL, NULL);
   gtk_box_pack_start(GTK_BOX(vbox), scrolledwindow, TRUE, TRUE, 0);
@@ -176,34 +179,16 @@
 		     pdialog);
 
 
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-
-  pdialog->add_preset_command = gtk_accelbutton_new(_("_Add preset"),
-						    pdialog->accel);
-  gtk_box_pack_start(GTK_BOX(hbox), pdialog->add_preset_command,
-		     TRUE, TRUE, 0);
-  GTK_WIDGET_SET_FLAGS(pdialog->add_preset_command, GTK_CAN_DEFAULT);
-  gtk_signal_connect(GTK_OBJECT(pdialog->add_preset_command), "clicked",
-		     GTK_SIGNAL_FUNC(cma_add_preset_callback), pdialog);
-
-  pdialog->del_preset_command = gtk_accelbutton_new(_("_Delete preset"),
-						    pdialog->accel);
-  gtk_box_pack_start(GTK_BOX(hbox), pdialog->del_preset_command,
-		     TRUE, TRUE, 0);
-  GTK_WIDGET_SET_FLAGS(pdialog->del_preset_command, GTK_CAN_DEFAULT);
-  gtk_signal_connect(GTK_OBJECT(pdialog->del_preset_command), "clicked",
-		     GTK_SIGNAL_FUNC(cma_del_preset_callback), pdialog);
 
   /* the right-hand side */
 
   vbox = gtk_vbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(page), vbox, FALSE, FALSE, 2);
+  gtk_box_pack_start(GTK_BOX(top), vbox, FALSE, FALSE, 2);
 
   /* Result */
 
   frame = gtk_frame_new(_("Results"));
-  gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, FALSE, 0);
+  gtk_box_pack_end(GTK_BOX(vbox), frame, TRUE, FALSE, 0);
 
   pdialog->result_label =
       gtk_label_new("food\n prod\n trade\n\n people\n grow\n prod\n name");
@@ -287,19 +272,35 @@
 
   /* buttons */
 
-  hbox = gtk_hbox_new(FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+  bottom = gtk_hbox_new(FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(page), bottom, FALSE, FALSE, 0);
+
+  pdialog->add_preset_command = gtk_accelbutton_new(_("_Add preset"),
+						    pdialog->accel);
+  gtk_box_pack_start(GTK_BOX(bottom), pdialog->add_preset_command,
+		     TRUE, TRUE, 0);
+  GTK_WIDGET_SET_FLAGS(pdialog->add_preset_command, GTK_CAN_DEFAULT);
+  gtk_signal_connect(GTK_OBJECT(pdialog->add_preset_command), "clicked",
+		     GTK_SIGNAL_FUNC(cma_add_preset_callback), pdialog);
+
+  pdialog->del_preset_command = gtk_accelbutton_new(_("_Delete preset"),
+						    pdialog->accel);
+  gtk_box_pack_start(GTK_BOX(bottom), pdialog->del_preset_command,
+		     TRUE, TRUE, 0);
+  GTK_WIDGET_SET_FLAGS(pdialog->del_preset_command, GTK_CAN_DEFAULT);
+  gtk_signal_connect(GTK_OBJECT(pdialog->del_preset_command), "clicked",
+		     GTK_SIGNAL_FUNC(cma_del_preset_callback), pdialog);
 
   pdialog->change_command =
-      gtk_accelbutton_new(_("_Change"), pdialog->accel);
-  gtk_box_pack_start(GTK_BOX(hbox), pdialog->change_command, TRUE, FALSE, 0);
+      gtk_accelbutton_new(_("Apply _once"), pdialog->accel);
+  gtk_box_pack_start(GTK_BOX(bottom), pdialog->change_command, TRUE, TRUE, 0);
   GTK_WIDGET_SET_FLAGS(pdialog->change_command, GTK_CAN_DEFAULT);
   gtk_signal_connect(GTK_OBJECT(pdialog->change_command), "clicked",
 		     GTK_SIGNAL_FUNC(cma_change_to_callback), pdialog);
 
-  pdialog->perm_command = gtk_accelbutton_new(_("C_hange permanent"),
+  pdialog->perm_command = gtk_accelbutton_new(_("_Control City"),
 					      pdialog->accel);
-  gtk_box_pack_start(GTK_BOX(hbox), pdialog->perm_command, TRUE, FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(bottom), pdialog->perm_command, TRUE, TRUE, 0);
   GTK_WIDGET_SET_FLAGS(pdialog->perm_command, GTK_CAN_DEFAULT);
   gtk_signal_connect(GTK_OBJECT(pdialog->perm_command), "clicked",
 		     GTK_SIGNAL_FUNC(cma_change_permanent_to_callback),
@@ -307,7 +308,7 @@
 
   pdialog->release_command = gtk_accelbutton_new(_("_Release city"),
 						 pdialog->accel);
-  gtk_box_pack_start(GTK_BOX(hbox), pdialog->release_command, TRUE, FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(bottom), pdialog->release_command, TRUE, TRUE, 0);
   GTK_WIDGET_SET_FLAGS(pdialog->release_command, GTK_CAN_DEFAULT);
   gtk_signal_connect(GTK_OBJECT(pdialog->release_command), "clicked",
 		     GTK_SIGNAL_FUNC(cma_release_callback), pdialog);