[Freeciv-Dev] Re: (PR#5140) Help needs updating for AI diplomacy

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

John Wheeler wrote:
> [per - Tue Aug 19 18:10:36 2003]:
> 
> 
>>On Tue, 19 Aug 2003, John Wheeler wrote:
>>
>>>I also wonder if Diplomacy should have a seperate entry under help,
>>>since it's describing how the game works, rather than choosing a
> 
> strategy.
> 
>>Yes, there should be. Could you write it?
> 
> 
> Okay, here's a patch that should apply to today's CVS that has the
> modified helpdata.txt and adds a help menu entry for "Diplomacy" for the
> gtk2+ client.

What's with the \n\n at the beginning?  That seems out of place.

>  (My ability to test other clients is limited, so if
> someone wants that for another client, maybe they should do that.)

The attached patch adds gtk and xaw support (the gtk patch is identical 
to the gtk2 one).  Tested under both.

jason

Index: client/gui-gtk/menu.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/menu.c,v
retrieving revision 1.79
diff -u -r1.79 menu.c
--- client/gui-gtk/menu.c       2003/09/15 16:05:35     1.79
+++ client/gui-gtk/menu.c       2003/09/19 20:31:34
@@ -144,6 +144,7 @@
   MENU_HELP_CHATLINE,
   MENU_HELP_WORKLIST_EDITOR,
   MENU_HELP_CMA,
+  MENU_HELP_DIPLOMACY,
   MENU_HELP_PLAYING,
   MENU_HELP_IMPROVEMENTS,
   MENU_HELP_UNITS,
@@ -493,6 +494,9 @@
   case MENU_HELP_CMA:
     popup_help_dialog_string(HELP_CMA_ITEM);
     break;
+  case MENU_HELP_DIPLOMACY:
+    popup_help_dialog_string(HELP_DIPLOMACY_ITEM);
+    break;
   case MENU_HELP_PLAYING:
     popup_help_dialog_string(HELP_PLAYING_ITEM);
     break;
@@ -774,10 +778,12 @@
        help_menu_callback,     MENU_HELP_CONTROLS                              
        },
   { "/" N_("Help") "/" N_("C_hatline"),                        NULL,
        help_menu_callback,     MENU_HELP_CHATLINE                              
        },
-  { "/" N_("Help") "/" N_("_Worklist Editor"),                 NULL,
+  { "/" N_("Help") "/" N_("_Worklist Editor"),         NULL,
        help_menu_callback,     MENU_HELP_WORKLIST_EDITOR                       
        },
-  { "/" N_("Help") "/" N_("Citizen _Management"),                      NULL,
+  { "/" N_("Help") "/" N_("Citizen _Management"),      NULL,
        help_menu_callback,     MENU_HELP_CMA                                   
        },
+  { "/" N_("Help") "/" N_("_Diplomacy"),               NULL,
+       help_menu_callback,     MENU_HELP_DIPLOMACY                             
        },
   { "/" N_("Help") "/" N_("_Playing"),                 NULL,
        help_menu_callback,     MENU_HELP_PLAYING                               
        },
   { "/" N_("Help") "/sep1",                            NULL,
Index: client/gui-xaw/menu.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/menu.c,v
retrieving revision 1.57
diff -u -r1.57 menu.c
--- client/gui-xaw/menu.c       2003/09/15 16:05:35     1.57
+++ client/gui-xaw/menu.c       2003/09/19 20:31:34
@@ -218,6 +218,7 @@
     { { N_("Connecting"), 0           },      "", MENU_HELP_CONNECTING, 0 },
     { { N_("Controls"), 0             },      "", MENU_HELP_CONTROLS, 0 },
     { { N_("Chatline"), 0             },      "", MENU_HELP_CHATLINE, 0 },
+    { { N_("Diplomacy"), 0            },      "", MENU_HELP_DIPLOMACY, 0 },
     { { N_("Playing"), 0              },      "", MENU_HELP_PLAYING, 0 },
     { { 0                             },      "", MENU_SEPARATOR_LINE, 0 },
     { { N_("Improvements"), 0         },      "", MENU_HELP_IMPROVEMENTS, 0 },
@@ -750,6 +751,9 @@
     break;
   case MENU_HELP_CHATLINE:
     popup_help_dialog_string(HELP_CHATLINE_ITEM);
+    break;
+  case MENU_HELP_DIPLOMACY:
+    popup_help_dialog_string(HELP_DIPLOMACY_ITEM);
     break;
   case MENU_HELP_PLAYING:
     popup_help_dialog_string(HELP_PLAYING_ITEM);
Index: client/gui-xaw/menu.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/menu.h,v
retrieving revision 1.16
diff -u -r1.16 menu.h
--- client/gui-xaw/menu.h       2003/07/23 13:46:03     1.16
+++ client/gui-xaw/menu.h       2003/09/19 20:31:34
@@ -113,6 +113,7 @@
   MENU_HELP_CONNECTING,
   MENU_HELP_CONTROLS,
   MENU_HELP_CHATLINE,
+  MENU_HELP_DIPLOMACY,
   MENU_HELP_PLAYING,
   MENU_HELP_IMPROVEMENTS,
   MENU_HELP_UNITS,