[Freeciv-Dev] (PR#13929) no way to know who you're meeting with

["Mateusz Stefek" <mstefek@xxxxxxxxx>]

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

> [jdorje - Sat Sep /home/mateusz/nation10 04:46:47 2005]:
> 
> The diplomacy dialog now doesn't say the nation's name.  This makes it 
> impossible to know who you're meeting with.
> 
> If you guys want to keep the ruler name (and title?) in there that's 
> fine.  There's plenty of room to have it in addition to the nation name. 
>   But we have to have the nation there.
> 
> -jason
> 
Actually the nation name is on the tab label.
But no problem, here's a patch.
--
mateusz

--- freeciv/client/gui-gtk-2.0/diplodlg.c       2005-09-08 19:56:59.000000000 
+0200
+++ freecivcopy/client/gui-gtk-2.0/diplodlg.c   2005-09-10 09:07:51.000000000 
+0200
@@ -515,6 +515,14 @@
   gtk_container_set_border_width(GTK_CONTAINER(vbox), 2);
   gtk_box_pack_start(GTK_BOX(bottom), vbox, TRUE, TRUE, 0);
 
+  label = gtk_label_new(NULL);
+  gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+  my_snprintf(buf, sizeof(buf),
+             "<span size=\"large\" weight=\"bold\">%s</span>",
+              get_nation_name_plural(plr0->nation));
+  gtk_label_set_markup(GTK_LABEL(label), buf);
+  gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);
+
   hbox = gtk_hbox_new(FALSE, 12);
   gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
   
@@ -536,7 +544,7 @@
   image = gtk_image_new();
   pdialog->image0 = image;
   gtk_box_pack_end(GTK_BOX(hbox), image, FALSE, FALSE, 0);
-
+  
   table = gtk_table_new(2, 2, FALSE);
   gtk_table_set_row_spacings(GTK_TABLE(table), 6);
   gtk_box_pack_start(GTK_BOX(vbox), table, TRUE, TRUE, 0);
@@ -578,6 +586,15 @@
   gtk_container_set_border_width(GTK_CONTAINER(vbox), 2);
   gtk_box_pack_start(GTK_BOX(bottom), vbox, TRUE, TRUE, 0);
 
+
+  label = gtk_label_new(NULL);
+  gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+  my_snprintf(buf, sizeof(buf),
+             "<span size=\"large\" weight=\"bold\">%s</span>",
+              get_nation_name_plural(plr1->nation));
+  gtk_label_set_markup(GTK_LABEL(label), buf);
+  gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);
+
   hbox = gtk_hbox_new(FALSE, 12);
   gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
 
@@ -600,7 +617,7 @@
   image = gtk_image_new();
   pdialog->image1 = image;
   gtk_box_pack_end(GTK_BOX(hbox), image, FALSE, FALSE, 0);
-
+  
   table = gtk_table_new(2, 2, FALSE);
   gtk_table_set_row_spacings(GTK_TABLE(table), 6);
   gtk_box_pack_start(GTK_BOX(vbox), table, TRUE, TRUE, 0);