[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 - Thu Feb 03 11:21:58 2005]:
> 
> On Wed, Feb 02, 2005 at 03:51:22PM -0800, Vasco Alexandre da Silva
> Costa wrote:
> > >
> > > 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?
> 
> Apply your patch to current S2_0 CVS, I'd say ;)
> 
> Sorry, I don't know. PNG attached.
> I have Debian Sarge here.

Interesting. I do not see that bug in here. It is probably something
specific to your GTK+ version or theme. I've made a small hack on this
patch, see if that helps.

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 -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 3 Feb 2005 15:19:07 -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",
@@ -310,7 +305,7 @@
 
   /* Minimal Surplus and Factor */
 
-  table = gtk_table_new(NUM_STATS + 2, 3, FALSE);
+  table = gtk_table_new(NUM_STATS + 2, 3, TRUE);
   gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 2);
 
   label = gtk_label_new(_("Minimal Surplus"));
@@ -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);
 }
 
 /**************************************************************************