[Freeciv-Dev] (PR#12041) CMA / preset tab

["Vasco Alexandre da Silva Costa" <vasc@xxxxxxxxxxxxxx>]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=12041 >

> [chrisk - Wed Feb 02 09:53:21 2005]:
> 
> This works ok. But I have still some issues, sorry.
> 
> The factor sliders are broken in S2 CVS + Patch.

How can I reproduce this issue?

> The help button is between the 'new preset' and the 'delete preset'
> button
> (which should be positioned next to next). Better put it next to the
> 'enable' button.

See how it looks with this patch.

> We've discussed already that the results are not tested/approved as
> long as
> the CMA is not enabled. Now, in the top right result table, you can
> see *no*
> difference whether there are valid results or just numbers. This can
> be
> confusing. Maybe a simple solution is to grey out that table, as long
> as the
> CMA is disabled?

This patch also does that.

Index: client/gui-gtk-2.0/cma_fe.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/cma_fe.c,v
retrieving revision 1.19.2.4
diff -u -u -r1.19.2.4 cma_fe.c
--- client/gui-gtk-2.0/cma_fe.c 2 Feb 2005 23:22:11 -0000       1.19.2.4
+++ client/gui-gtk-2.0/cma_fe.c 2 Feb 2005 23:45:12 -0000
@@ -282,11 +282,6 @@
   g_signal_connect(pdialog->add_preset_command, "clicked",
                   G_CALLBACK(cma_add_preset_callback), pdialog);
 
-  button = gtk_button_new_from_stock(GTK_STOCK_HELP);
-  g_signal_connect(button, "clicked",
-                  G_CALLBACK(help_callback), NULL);
-  gtk_container_add(GTK_CONTAINER(hbox), button);
-
   pdialog->del_preset_command = gtk_button_new_from_stock(GTK_STOCK_DELETE);
   gtk_container_add(GTK_CONTAINER(hbox), pdialog->del_preset_command);
   g_signal_connect(pdialog->del_preset_command, "clicked",
@@ -385,9 +380,14 @@
   /* buttons */
 
   hbox = gtk_hbutton_box_new();
-  gtk_button_box_set_layout(GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_SPREAD);
+  gtk_button_box_set_layout(GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_EDGE);
   gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
+  button = gtk_button_new_from_stock(GTK_STOCK_HELP);
+  g_signal_connect(button, "clicked",
+                  G_CALLBACK(help_callback), NULL);
+  gtk_container_add(GTK_CONTAINER(hbox), button);
+
   pdialog->active_command = gtk_toggle_button_new();
   gtk_container_add(GTK_CONTAINER(hbox), pdialog->active_command);
 
@@ -464,6 +464,7 @@
     gtk_label_set_text_with_mnemonic(GTK_LABEL(pdialog->active_label),
        _("CMA Disabl_ed"));
   }
+  gtk_widget_set_sensitive(pdialog->result_label, controlled);
 }
 
 /**************************************************************************