some renaming and restructuring of WB menu items, to conform more to XBoard

diff --git a/winboard/winboard.rc b/winboard/winboard.rc
index 6d5008b..6fd769d 100644 (file)
--- a/winboard/winboard.rc
+++ b/winboard/winboard.rc
@@ -623,66 +623,70 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,140,232,50,14\r
     CONTROL         "&normal",OPT_VariantNormal,"Button",BS_AUTORADIOBUTTON | \r
                     WS_GROUP | WS_TABSTOP,9,14,50,10\r
-    CONTROL         "&gothic",OPT_VariantGothic,"Button",BS_AUTORADIOBUTTON,9,24,\r
+    CONTROL         "&FRC",OPT_VariantFRC,"Button",BS_AUTORADIOBUTTON,9,\r
+                    24,50,10\r
+    CONTROL         "&wildcastle",OPT_VariantWildcastle,"Button",BS_AUTORADIOBUTTON,9,34,\r
                     50,10\r
-    CONTROL         "cra&zyhouse",OPT_VariantCrazyhouse,"Button",BS_AUTORADIOBUTTON,9,34,\r
-                    50,10\r
-    CONTROL         "&shogi",OPT_VariantShogi,"Button",BS_AUTORADIOBUTTON,9,\r
+    CONTROL         "&nocastle",OPT_VariantNocastle,"Button",BS_AUTORADIOBUTTON,9,\r
                     44,50,10\r
-    CONTROL         "&xiangqi",OPT_VariantXiangqi,"Button",BS_AUTORADIOBUTTON,9,54,50,\r
-                    10\r
-    CONTROL         "cou&rier",OPT_VariantCourier,"Button",BS_AUTORADIOBUTTON,9,64,\r
-                    50,10\r
-    CONTROL         "&Berolina",OPT_VariantBerolina,"Button",BS_AUTORADIOBUTTON,9,74,\r
-                    50,10\r
-    CONTROL         "&Janus",OPT_VariantJanus,"Button",BS_AUTORADIOBUTTON,9,84,\r
-                    50,10\r
-    CONTROL         "&3Check",OPT_Variant3Check,"Button",BS_AUTORADIOBUTTON,9,94,\r
-                    50,10\r
-    CONTROL         "&knightmate",OPT_VariantKnightmate,"Button",BS_AUTORADIOBUTTON,\r
-                    70,14,50,10\r
-    CONTROL         "&atomic",OPT_VariantAtomic,"Button",BS_AUTORADIOBUTTON,\r
-                    70,24,50,10\r
     CONTROL         "&losers",OPT_VariantLosers,"Button",BS_AUTORADIOBUTTON,\r
-                    70,34,50,10\r
+                    9,54,50,10\r
+    CONTROL         "&giveaway",OPT_VariantGiveaway,"Button",BS_AUTORADIOBUTTON,\r
+                    9,64,50,10\r
     CONTROL         "s&uicide",OPT_VariantSuicide,"Button",BS_AUTORADIOBUTTON,\r
-                    70,44,50,10\r
-    CONTROL         "&capablanca",OPT_VariantCapablanca,"Button",BS_AUTORADIOBUTTON,70,\r
-                    54,50,10\r
-    CONTROL         "&twokings",OPT_VariantTwoKings,"Button",BS_AUTORADIOBUTTON,70,64,\r
-                    50,10\r
-    CONTROL         "&CRC",OPT_VariantCRC,"Button",BS_AUTORADIOBUTTON,70,74,\r
+                    9,74,50,10\r
+    CONTROL         "&3Check",OPT_Variant3Check,"Button",BS_AUTORADIOBUTTON,9,84,\r
                     50,10\r
-    CONTROL         "&wildcastle",OPT_VariantWildcastle,"Button",BS_AUTORADIOBUTTON,70,84,\r
+    CONTROL         "&twokings",OPT_VariantTwoKings,"Button",BS_AUTORADIOBUTTON,9,94,\r
                     50,10\r
-    CONTROL         "&great",OPT_VariantGreat,"Button",BS_AUTORADIOBUTTON,70,94,\r
+    CONTROL         "&atomic",OPT_VariantAtomic,"Button",BS_AUTORADIOBUTTON,\r
+                    9,104,50,10\r
+    CONTROL         "cra&zyhouse",OPT_VariantCrazyhouse,"Button",BS_AUTORADIOBUTTON,70,14,\r
                     50,10\r
-    CONTROL         "&fairy",OPT_VariantFairy,"Button",BS_AUTORADIOBUTTON,134,\r
-                    14,50,10\r
-    CONTROL         "&bughouse",OPT_VariantBughouse,"Button",BS_AUTORADIOBUTTON,134,24,50,\r
+    CONTROL         "&bughouse",OPT_VariantBughouse,"Button",BS_AUTORADIOBUTTON,70,24,50,\r
                     10\r
-    CONTROL         "&Shatranj",OPT_VariantShatranj,"Button",BS_AUTORADIOBUTTON,134,\r
-                    34,50,10\r
-    CONTROL         "&FRC",OPT_VariantFRC,"Button",BS_AUTORADIOBUTTON,134,\r
+    CONTROL         "&Twilight",OPT_VariantBughouse,"Button",BS_AUTORADIOBUTTON,70,34,50,\r
+                    10\r
+    CONTROL         "&shogi",OPT_VariantShogi,"Button",BS_AUTORADIOBUTTON,70,\r
                     44,50,10\r
-    CONTROL         "c&ylinder",OPT_VariantCylinder,"Button",BS_AUTORADIOBUTTON,134,\r
+    CONTROL         "su&per",OPT_VariantSuper,"Button",BS_AUTORADIOBUTTON,70,\r
                     54,50,10\r
+    CONTROL         "&knightmate",OPT_VariantKnightmate,"Button",BS_AUTORADIOBUTTON,\r
+                    70,64,50,10\r
+    CONTROL         "&Berolina",OPT_VariantBerolina,"Button",BS_AUTORADIOBUTTON,70,74,\r
+                    50,10\r
+    CONTROL         "c&ylinder",OPT_VariantCylinder,"Button",BS_AUTORADIOBUTTON,70,\r
+                    84,50,10\r
+    CONTROL         "&fairy",OPT_VariantFairy,"Button",BS_AUTORADIOBUTTON,70,\r
+                    94,50,10\r
+    CONTROL         "&gothic",OPT_VariantGothic,"Button",BS_AUTORADIOBUTTON,134,14,\r
+                    50,10\r
+    CONTROL         "&capablanca",OPT_VariantCapablanca,"Button",BS_AUTORADIOBUTTON,134,\r
+                    24,50,10\r
+    CONTROL         "&Janus",OPT_VariantJanus,"Button",BS_AUTORADIOBUTTON,134,34,\r
+                    50,10\r
+    CONTROL         "&CRC",OPT_VariantCRC,"Button",BS_AUTORADIOBUTTON,134,44,\r
+                    50,10\r
     CONTROL         "&Falcon",OPT_VariantFalcon,"Button",BS_AUTORADIOBUTTON,134,\r
-                    64,50,10\r
-    CONTROL         "su&per",OPT_VariantSuper,"Button",BS_AUTORADIOBUTTON,134,\r
-                    74,50,10\r
-    CONTROL         "&nocastle",OPT_VariantNocastle,"Button",BS_AUTORADIOBUTTON,134,\r
+                    54,50,10\r
+    CONTROL         "cou&rier",OPT_VariantCourier,"Button",BS_AUTORADIOBUTTON,134,64,\r
+                    50,10\r
+    CONTROL         "&Great",OPT_VariantGreat,"Button",BS_AUTORADIOBUTTON,134,74,\r
+                    50,10\r
+    CONTROL         "&Shatranj",OPT_VariantShatranj,"Button",BS_AUTORADIOBUTTON,134,\r
                     84,50,10\r
-    GROUPBOX        "Variant",IDC_STATIC,4,4,185,105\r
-    LTEXT           "Board size:",IDC_STATIC,10,125,40,8\r
-    EDITTEXT        IDC_Ranks,60,121,14,14,ES_AUTOHSCROLL\r
-    LTEXT           "ranks",IDC_STATIC,77,125,22,8\r
-    EDITTEXT        IDC_Files,116,121,14,14,ES_AUTOHSCROLL\r
-    LTEXT           "files",IDC_STATIC,133,125,37,8\r
-    LTEXT           "Holdings with room for:",IDC_STATIC,10,143,90,8\r
-    EDITTEXT        IDC_Holdings,93,139,14,14,ES_AUTOHSCROLL\r
-    LTEXT           "pieces",IDC_STATIC,110,143,22,8\r
-    LTEXT           "('-1' means defaults for selected variant)",IDC_STATIC,10,161,150,8\r
+    CONTROL         "&xiangqi",OPT_VariantXiangqi,"Button",BS_AUTORADIOBUTTON,134,94,50,\r
+                    10\r
+    GROUPBOX        "Variant",IDC_STATIC,4,4,185,115\r
+    LTEXT           "Board size:",IDC_STATIC,10,135,40,8\r
+    EDITTEXT        IDC_Ranks,60,131,14,14,ES_AUTOHSCROLL\r
+    LTEXT           "ranks",IDC_STATIC,77,135,22,8\r
+    EDITTEXT        IDC_Files,116,131,14,14,ES_AUTOHSCROLL\r
+    LTEXT           "files",IDC_STATIC,133,135,37,8\r
+    LTEXT           "Holdings with room for:",IDC_STATIC,10,153,90,8\r
+    EDITTEXT        IDC_Holdings,93,149,14,14,ES_AUTOHSCROLL\r
+    LTEXT           "pieces",IDC_STATIC,110,153,22,8\r
+    LTEXT           "('-1' means defaults for selected variant)",IDC_STATIC,10,171,150,8\r
 END\r
 \r
 DLG_Fonts DIALOG DISCARDABLE  0, 0, 266, 226\r
@@ -800,7 +804,7 @@ END
 \r
 DLG_EnginePlayOptions DIALOG DISCARDABLE  0, 0, 208, 202\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
-CAPTION "Engine Options"\r
+CAPTION "Adjudications"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
     CONTROL         "Ponder Next Move",IDC_EpPonder,"Button",BS_AUTOCHECKBOX |\r
@@ -850,7 +854,7 @@ END
 \r
 DLG_OptionsUCI DIALOG DISCARDABLE  0, 0, 228, 124\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
-CAPTION "UCI Options"\r
+CAPTION "Engine Settings"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
     LTEXT           "Polyglot Directory:",IDC_STATIC,2,8,58,8\r
@@ -1124,8 +1128,8 @@ BEGIN
         MENUITEM SEPARATOR\r
         MENUITEM "&General...",                 IDM_GeneralOptions\r
         MENUITEM "&Board...",                   IDM_BoardOptions\r
-        MENUITEM "Engines...",                  IDM_EnginePlayOptions\r
-        MENUITEM "UCI...",                      IDM_OptionsUCI\r
+        MENUITEM "Adjudications...",            IDM_EnginePlayOptions\r
+        MENUITEM "Engine Settings...",          IDM_OptionsUCI\r
         MENUITEM "&ICS...",                     IDM_IcsOptions, GRAYED\r
         MENUITEM "&Fonts...",                   IDM_Fonts\r
         MENUITEM "Soun&ds...",                  IDM_Sounds\r