[Freeciv-Dev] Re: (PR#14345) GTK2 client: add buttons to the players dialog

["Daniel Markstedt" <himasaram@xxxxxxxx>]

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

On Sat, 2006-02-18 at 08:22 -0800, Christian Prochaska wrote:
> <URL: http://bugs.freeciv.org/Ticket/Display.html?id=14345 >
> 
> > [dmarks - Fr 17. Feb 2006, 05:02:43]:
> > 
> > > [dmarks - Mon Feb 13 13:13:54 2006]:
> > > 
> > > This is as far I got on this project. Note that I had no idea what I was
> > > doing, so this might be a dead end.
> > > 
> > > The Diplomacy menu is removed and five buttons are added in it's place.
> > > The buttons are correctly activated and greyed out as you select
> > > different players, but clicking on them has no effect but closing the
> > > players dialog.
> > > 
> > > -Daniel
> > > 
> > 
> > This is how the players dialog looks like with this patch:
> > 
> > http://rt.freeciv.org/Ticket/Attachment/113058/73660/plrdlgbtns.png
> > 
> > -Daniel
> > 
> 
> Here's a patch with working callbacks. I think the buttons improve
> usability very much.

Marvellous!

Though I like the buttons in the opposite order... but that's just me
perhaps. :-)

-Daniel

Index: client/gui-gtk-2.0/plrdlg.c
===================================================================
--- client/gui-gtk-2.0/plrdlg.c (revision 11626)
+++ client/gui-gtk-2.0/plrdlg.c (working copy)
@@ -438,7 +438,43 @@
   gtk_box_pack_start(GTK_BOX(players_dialog_shell->vbox), sw,
                     TRUE, TRUE, 0);
 
+  players_int_command = gtk_button_new_with_mnemonic(_("_Intelligence"));
+  g_signal_connect(players_int_command, "clicked",
+      G_CALLBACK(players_intel_callback), NULL);
+  gui_dialog_add_widget(players_dialog_shell, players_int_command);  
+  gtk_size_group_add_widget(players_dialog_shell->gui_button, 
+      players_int_command);
+
+  players_meet_command = gtk_button_new_with_mnemonic(_("_Meet"));
+  g_signal_connect(players_meet_command, "clicked",
+      G_CALLBACK(players_meet_callback), NULL);
+  gui_dialog_add_widget(players_dialog_shell, players_meet_command);
+  gtk_size_group_add_widget(players_dialog_shell->gui_button, 
+      players_meet_command);
+
+  players_war_command = gtk_button_new_with_mnemonic(_("_Cancel Treaty"));
+  g_signal_connect(players_war_command, "clicked",
+      G_CALLBACK(players_war_callback), NULL);
+  gui_dialog_add_widget(players_dialog_shell, players_war_command);  
+  gtk_size_group_add_widget(players_dialog_shell->gui_button,
+      players_war_command);
+
+  players_vision_command  = gtk_button_new_with_mnemonic(_("_Withdraw 
vision"));
+  g_signal_connect(players_vision_command, "clicked",
+      G_CALLBACK(players_vision_callback), NULL);
+  gui_dialog_add_widget(players_dialog_shell, players_vision_command);  
+  gtk_size_group_add_widget(players_dialog_shell->gui_button,
+     players_vision_command);
+
+  players_sship_command = gtk_button_new_with_mnemonic(_("_Spaceship"));
+  g_signal_connect(players_sship_command, "clicked",
+      G_CALLBACK(players_sship_callback), NULL);
+  gui_dialog_add_widget(players_dialog_shell, players_sship_command);
+  gtk_size_group_add_widget(players_dialog_shell->gui_button,
+      players_sship_command);
+
   vbox = gtk_vbox_new(FALSE, 0);
+  
   sep = gtk_hseparator_new();
   gtk_box_pack_start(GTK_BOX(vbox), sep, FALSE, FALSE, 0);
 
@@ -476,53 +512,8 @@
   }
   gtk_widget_show_all(menu);
 
-  item = gtk_menu_item_new_with_mnemonic(_("_Diplomacy"));
-  gtk_menu_shell_append(GTK_MENU_SHELL(menubar), item);
-
-  menu = gtk_menu_new();
-  gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), menu);
-
-  players_int_command = gtk_menu_item_new_with_mnemonic(_("_Intelligence"));
-  gtk_widget_set_sensitive(players_int_command, FALSE);
-  gtk_menu_shell_append(GTK_MENU_SHELL(menu), players_int_command);
-
-  sep = gtk_separator_menu_item_new();
-  gtk_menu_shell_append(GTK_MENU_SHELL(menu), sep);
-
-  players_meet_command = gtk_menu_item_new_with_mnemonic(_("_Meet"));
-  gtk_widget_set_sensitive(players_meet_command, FALSE);
-  gtk_menu_shell_append(GTK_MENU_SHELL(menu), players_meet_command);
-
-  players_war_command = gtk_menu_item_new_with_mnemonic(_("_Cancel Treaty"));
-  gtk_widget_set_sensitive(players_war_command, FALSE);
-  gtk_menu_shell_append(GTK_MENU_SHELL(menu), players_war_command);
-
-  players_vision_command=gtk_menu_item_new_with_mnemonic(_("_Withdraw 
vision"));
-  gtk_widget_set_sensitive(players_vision_command, FALSE);
-  gtk_menu_shell_append(GTK_MENU_SHELL(menu), players_vision_command);
-
-  sep = gtk_separator_menu_item_new();
-  gtk_menu_shell_append(GTK_MENU_SHELL(menu), sep);
-
-  players_sship_command = gtk_menu_item_new_with_mnemonic(_("_Spaceship"));
-  gtk_widget_set_sensitive(players_sship_command, FALSE);
-  gtk_menu_shell_append(GTK_MENU_SHELL(menu), players_sship_command);
-
-
-
   gui_dialog_show_all(players_dialog_shell);
 
-  g_signal_connect(players_meet_command, "activate",
-    G_CALLBACK(players_meet_callback), NULL);
-  g_signal_connect(players_war_command, "activate",
-    G_CALLBACK(players_war_callback), NULL);
-  g_signal_connect(players_vision_command, "activate",
-    G_CALLBACK(players_vision_callback), NULL);
-  g_signal_connect(players_int_command, "activate",
-    G_CALLBACK(players_intel_callback), NULL);
-  g_signal_connect(players_sship_command, "activate",
-    G_CALLBACK(players_sship_callback), NULL);
-
   gtk_list_store_clear(store);
   update_players_dialog();
 
@@ -855,4 +846,3 @@
     gtk_tree_view_column_set_visible(col, player_dlg_columns[i].show);
   }
 };
-