Implement variant ASEAN
[xboard.git] / winboard / winboard.rc
index be39e94..e75cc19 100644 (file)
@@ -44,7 +44,7 @@ BEGIN
     LTEXT           "Chessboard for Windows",400,25,15,121,8\r
     LTEXT           "Copyright 1991 Digital Equipment Corporation",201,6,34,\r
                     149,8\r
-    LTEXT           "Enhancements Copyright 1992-2010  Free Software Foundation",\r
+    LTEXT           "Enhancements Copyright 1992-2013  Free Software Foundation",\r
                     OPT_TCtext1,6,45,121,17\r
     CONTROL         "",OPT_TCTime,"Static",SS_BLACKRECT,4,28,159,1\r
     LTEXT           "WinBoard 0.0.0",ABOUTBOX_Version,25,5,160,8\r
@@ -81,29 +81,55 @@ BEGIN
                     WS_GROUP\r
     EDITTEXT        OPT_TCFixed,147,140,32,12,ES_AUTOHSCROLL\r
     LTEXT           "",OPT_TCitext3,185,148,67,8,NOT WS_GROUP\r
-    LTEXT           "Time-Odds Factors:",GPB_Factors,6,158,150,8,NOT WS_GROUP\r
-    EDITTEXT        OPT_TCOdds1,57,171,32,12,ES_AUTOHSCROLL | WS_GROUP\r
-    LTEXT           "Engine #1:",IDC_Factor1,6,173,50,8,NOT WS_GROUP\r
-    EDITTEXT        OPT_TCOdds2,147,171,32,12,ES_AUTOHSCROLL\r
-    LTEXT           "Engine #2:",IDC_Factor2,96,173,50,8,NOT WS_GROUP\r
+    LTEXT           "Time-Odds Factors:",GPB_Factors,6,158,150,8,NOT WS_GROUP | WS_TABSTOP\r
+    LTEXT           "Engine #1:",IDC_Factor1,6,173,60,8,NOT WS_GROUP\r
+    EDITTEXT        OPT_TCOdds1,67,171,32,12,ES_AUTOHSCROLL | WS_GROUP\r
+    LTEXT           "Engine #2:",IDC_Factor2,106,173,60,8,NOT WS_GROUP\r
+    EDITTEXT        OPT_TCOdds2,167,171,32,12,ES_AUTOHSCROLL\r
     PUSHBUTTON      "OK",IDOK,139,190,40,14,WS_GROUP\r
     PUSHBUTTON      "Cancel",IDCANCEL,195,190,40,14\r
 END\r
 \r
-DLG_LoadOptions DIALOG DISCARDABLE  10, 18, 166, 55\r
+DLG_LoadOptions DIALOG DISCARDABLE  10, 18, 170, 261\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Load Game Options"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    CONTROL         "Load games with automatic stepping",OPT_Autostep,"Button",\r
+    CONTROL         "Load games with &automatic stepping",OPT_Autostep,"Button",\r
                     BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,4,4,160,10\r
+    LTEXT           "&seconds per move",OPT_AStext1,46,20,90,8,NOT WS_GROUP\r
     EDITTEXT        OPT_ASTimeDelay,16,16,28,14,ES_AUTOHSCROLL\r
-    LTEXT           "seconds per move",OPT_AStext1,46,20,90,8,NOT WS_GROUP\r
-    PUSHBUTTON      "OK",IDOK,56,36,50,14,WS_GROUP\r
-    PUSHBUTTON      "Cancel",IDCANCEL,112,36,50,14\r
+    LTEXT           "when filtering game list on position, use thresholds:",OPT_thresholds,4,36,160,8,NOT WS_GROUP\r
+    LTEXT           "minimum Elo for &best player",OPT_elo1t,46,54,90,8,NOT WS_GROUP\r
+    EDITTEXT        OPT_elo1,16,50,28,14,ES_AUTOHSCROLL\r
+    LTEXT           "minimum Elo for &weakest players",OPT_elo2t,46,74,90,8,NOT WS_GROUP\r
+    EDITTEXT        OPT_elo2,16,70,28,14,ES_AUTOHSCROLL\r
+    LTEXT           "or later &year",OPT_datet,46,94,94,8,NOT WS_GROUP\r
+    EDITTEXT        OPT_date,16,90,28,14,ES_AUTOHSCROLL\r
+    LTEXT           "co&nsecutive positions",OPT_Stretcht,46,114,94,8,NOT WS_GROUP\r
+    EDITTEXT        OPT_Stretch,16,110,28,14,ES_AUTOHSCROLL\r
+    CONTROL         "Match exact &position",OPT_Exact,"Button",\r
+                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,6,136,159,10\r
+    CONTROL         "Match if position is s&ubset",OPT_Subset,"Button",\r
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,6,149,159,10\r
+    CONTROL         "Match material with e&xact pawn structure",OPT_Struct,"Button",\r
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,6,162,159,10\r
+    CONTROL         "Match &material",OPT_Material,"Button",\r
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,6,175,159,10\r
+    CONTROL         "Material &range (upper board-half is optional)",OPT_Range,"Button",\r
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,6,188,159,10\r
+    CONTROL         "Material &difference (optional material balanced)",OPT_Difference,"Button",\r
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,6,201,159,10\r
+    GROUPBOX        "Search Mode: ",OPT_SearchMode,3,126,164,87,WS_GROUP\r
+    CONTROL         "Also match reversed &colors",OPT_Reversed,"Button",\r
+                    BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,4,214,160,10\r
+    CONTROL         "Also match &left-right mirror image",OPT_Mirror,"Button",\r
+                    BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,4,227,160,10\r
+    PUSHBUTTON      "OK",IDOK,56,242,50,14,WS_GROUP\r
+    PUSHBUTTON      "Cancel",IDCANCEL,112,242,50,14\r
 END\r
 \r
-DLG_SaveOptions DIALOG DISCARDABLE  6, 17, 178, 119\r
+DLG_SaveOptions DIALOG DISCARDABLE  6, 17, 218, 119\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Save Game Options"\r
 FONT 8, "MS Sans Serif"\r
@@ -113,17 +139,17 @@ BEGIN
     CONTROL         "Prompt for filename",OPT_AVPrompt,"Button",\r
                     BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,18,150,10\r
     CONTROL         "To file:",OPT_AVToFile,"Button",BS_AUTORADIOBUTTON,16,\r
-                    32,36,10\r
-    EDITTEXT        OPT_AVFilename,54,30,97,14,ES_AUTOHSCROLL\r
-    PUSHBUTTON      "...",OPT_AVBrowse,156,30,18,14\r
-    GROUPBOX        "Save As: ",801,4,48,170,28,WS_GROUP\r
+                    32,56,10\r
+    EDITTEXT        OPT_AVFilename,74,30,117,14,ES_AUTOHSCROLL\r
+    PUSHBUTTON      "...",OPT_AVBrowse,196,30,18,14\r
+    GROUPBOX        "Save As: ",801,4,48,210,28,WS_GROUP\r
     CONTROL         "PGN",OPT_PGN,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,\r
-                    60,39,10\r
-    CONTROL         "Old",OPT_Old,"Button",BS_AUTORADIOBUTTON,54,60,114,10\r
+                    60,59,10\r
+    CONTROL         "Old",OPT_Old,"Button",BS_AUTORADIOBUTTON,74,60,114,10\r
     CONTROL         "Save out of book info in PGN",OPT_OutOfBookInfo,"Button",\r
                     BS_AUTOCHECKBOX | WS_TABSTOP,4,82,169,10\r
-    PUSHBUTTON      "OK",IDOK,68,100,50,14,WS_GROUP\r
-    PUSHBUTTON      "Cancel",IDCANCEL,124,100,50,14\r
+    PUSHBUTTON      "OK",IDOK,108,100,50,14,WS_GROUP\r
+    PUSHBUTTON      "Cancel",IDCANCEL,164,100,50,14\r
 END\r
 \r
 1536 DIALOG DISCARDABLE  36, 24, 264, 134\r
@@ -222,7 +248,7 @@ BEGIN
     RTEXT           "Chessboard for Windows",IDC_ChessBoard,196,154,80,8\r
     LTEXT           "Copyright 1991 Digital Equipment Corporation",201,4,168,\r
                     151,8\r
-    LTEXT           "Enhancements Copyright 1992-2003   Free Software Foundation",\r
+    LTEXT           "Enhancements Copyright 1992-2013   Free Software Foundation",\r
                     OPT_TCtext1,4,179,126,17\r
     CONTROL         "",OPT_TCTime,"Static",SS_BLACKRECT,4,164,272,1\r
     LTEXT           "WinBoard 0.0.0",ABOUTBOX_Version,4,154,64,8\r
@@ -233,19 +259,20 @@ BEGIN
     LTEXT           "(unofficial version ""X"")",IDC_STATIC,68,154,71,8\r
 END\r
 \r
-DLG_GameList DIALOG DISCARDABLE  6, 18, 259, 153\r
+DLG_GameList DIALOG DISCARDABLE  6, 18, 282, 153\r
 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME\r
 CAPTION "Game List"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    LISTBOX         OPT_GameListText,2,2,254,130,LBS_NOINTEGRALHEIGHT | \r
+    LISTBOX         OPT_GameListText,2,2,277,130,LBS_NOINTEGRALHEIGHT | \r
                     WS_VSCROLL | WS_HSCROLL | WS_TABSTOP\r
-    PUSHBUTTON      "&Load",OPT_GameListLoad,2,135,32,15\r
-    PUSHBUTTON      "&<",OPT_GameListPrev,38,135,22,15\r
-    PUSHBUTTON      "&>",OPT_GameListNext,64,135,24,15\r
-    PUSHBUTTON      "&Close",OPT_GameListClose,92,135,32,15\r
-    PUSHBUTTON      "Filter",IDC_GameListDoFilter,144,136,30,14\r
-    EDITTEXT        IDC_GameListFilter,178,136,78,14,ES_AUTOHSCROLL\r
+    PUSHBUTTON      "&Thresholds",OPT_GameListLoad,2,136,40,15\r
+    PUSHBUTTON      "&Find Position",OPT_GameListFind,45,136,48,15\r
+    PUSHBUTTON      "&Narrow",OPT_GameListNarrow,96,136,30,15\r
+    PUSHBUTTON      "&Close",OPT_GameListClose,129,136,20,15\r
+    PUSHBUTTON      ">",OPT_GameListNext,152,136,17,15\r
+    PUSHBUTTON      "&Filter",IDC_GameListDoFilter,172,136,25,14\r
+    EDITTEXT        IDC_GameListFilter,201,136,78,14,ES_AUTOHSCROLL\r
 END\r
 \r
 DLG_EditTags DIALOG DISCARDABLE  6, 18, 167, 140\r
@@ -345,13 +372,13 @@ BEGIN
     CONTROL         "Just &view or edit game files",OPT_View,"Button",\r
                     BS_AUTORADIOBUTTON | WS_TABSTOP,8,43,310,10\r
     LTEXT           "Specify Chess &Engines:",IDC_SPECIFY_ENG_STATIC,11,63,\r
-                    102,10\r
+                    200,10\r
     COMBOBOX        OPT_ChessEngineName,17,74,244,129,CBS_DROPDOWN | \r
                     CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP\r
     COMBOBOX        OPT_SecondChessEngineName,17,92,244,129,CBS_DROPDOWN | \r
                     CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP\r
     LTEXT           "Specify Chess &Server:",IDC_SPECIFY_SERVER_STATIC,11,\r
-                    108,102,10\r
+                    108,200,10\r
     COMBOBOX        OPT_ChessServerName,17,122,244,129,CBS_DROPDOWN | \r
                     CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP\r
     CONTROL         "&Additional options",OPT_AnyAdditional,"Button",\r
@@ -411,10 +438,10 @@ BEGIN
                     CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_GROUP\r
     EDITTEXT        OPT_WavFileName,96,65,103,12,ES_AUTOHSCROLL\r
     PUSHBUTTON      "B&rowse...",OPT_BrowseSound,208,64,50,14\r
+    PUSHBUTTON      "&Play",OPT_PlaySound,208,47,50,14\r
     PUSHBUTTON      "Defaults",OPT_DefaultSounds,6,86,50,14\r
     DEFPUSHBUTTON   "OK",IDOK,152,86,50,14\r
     PUSHBUTTON      "Cancel",IDCANCEL,208,86,50,14\r
-    PUSHBUTTON      "&Play",OPT_PlaySound,208,47,50,14\r
 END\r
 \r
 DLG_GeneralOptions DIALOG DISCARDABLE  0, 0, 300, 197\r
@@ -422,8 +449,6 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "General Options"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    DEFPUSHBUTTON   "OK",IDOK,180,178,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,236,178,50,14\r
     CONTROL         "Always on &Top",OPT_AlwaysOnTop,"Button",\r
                     BS_AUTOCHECKBOX | WS_TABSTOP,4,6,151,10\r
     CONTROL         "Highlight Last &Move",OPT_HighlightLastMove,"Button",\r
@@ -470,6 +495,10 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,156,146,151,10\r
     CONTROL         "Displa&y Logos",OPT_AutoLogo,\r
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,160,151,10\r
+    CONTROL         "One-Click Move",OPT_SmartMove,\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,156,160,151,10\r
+    DEFPUSHBUTTON   "OK",IDOK,180,178,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,236,178,50,14\r
 END\r
 \r
 DLG_IcsOptions DIALOGEX 0, 0, 302, 268\r
@@ -484,7 +513,9 @@ BEGIN
     CONTROL         "&Auto Kibitz",OPT_AutoKibitz,"Button",BS_AUTOCHECKBOX | \r
                     WS_TABSTOP,94,12,73,8\r
     CONTROL         "Auto &Observe",OPT_AutoObserve,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,10,25,150,8\r
+                    WS_TABSTOP,10,25,73,8\r
+    CONTROL         "Auto &Create Logon",OPT_AutoCreate,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,94,25,73,8\r
     CONTROL         "&Get Move List",OPT_GetMoveList,"Button",\r
                     BS_AUTOCHECKBOX | WS_TABSTOP,10,38,150,8\r
     CONTROL         "&Local Line Editing",OPT_LocalLineEditing,"Button",\r
@@ -564,15 +595,13 @@ BEGIN
     GROUPBOX        "Alarm",GPB_Alarm,174,71,124,30\r
 END\r
 \r
-DLG_BoardOptions DIALOG DISCARDABLE  0, 0, 224, 250\r
+DLG_BoardOptions DIALOG DISCARDABLE  0, 0, 224, 262\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Board Options"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    DEFPUSHBUTTON   "OK",IDOK,84,232,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,140,232,50,14\r
     CONTROL         "&Tiny",OPT_SizeTiny,"Button",BS_AUTORADIOBUTTON | \r
-                    WS_GROUP | WS_TABSTOP,9,14,50,10\r
+                    WS_GROUP,9,14,50,10\r
     CONTROL         "T&eeny",OPT_SizeTeeny,"Button",BS_AUTORADIOBUTTON,9,24,\r
                     60,10\r
     CONTROL         "&Dinky",OPT_SizeDinky,"Button",BS_AUTORADIOBUTTON,9,34,\r
@@ -616,9 +645,15 @@ BEGIN
     CONTROL         "Monochrome",OPT_Monochrome,"Button",BS_AUTOCHECKBOX | \r
                     WS_TABSTOP,10,210,64,10\r
     CONTROL         "All White",OPT_AllWhite,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,140,180,73,10\r
+                    WS_TABSTOP,140,179,73,10\r
     CONTROL         "Flip Black",OPT_UpsideDown,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,140,192,73,10\r
+                    WS_TABSTOP,140,191,73,10\r
+    CONTROL         "Use Board Textures",OPT_Bitmaps,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,140,203,73,10\r
+    CONTROL         "Use Piece Font",OPT_PieceFont,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,140,215,73,10\r
+    CONTROL         "Suppress Grid",OPT_Grid,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,140,227,73,10\r
     PUSHBUTTON      "Defaults",OPT_DefaultBoardColors,80,206,50,15\r
     EDITTEXT        OPT_DarkSquareColor,80,112,25,15,ES_READONLY | \r
                     WS_DISABLED | NOT WS_BORDER | NOT WS_TABSTOP\r
@@ -630,7 +665,7 @@ BEGIN
                     WS_DISABLED | NOT WS_BORDER | NOT WS_TABSTOP\r
     EDITTEXT        OPT_HighlightSquareColor,80,166,25,15,ES_READONLY | \r
                     WS_DISABLED | NOT WS_BORDER | NOT WS_TABSTOP\r
-    GROUPBOX        "Colors",GPB_Colors,4,84,215,142\r
+    GROUPBOX        "Colors",GPB_Colors,4,84,215,154\r
     EDITTEXT        OPT_PremoveHighlightColor,80,184,25,15,ES_READONLY | \r
                     WS_DISABLED | NOT WS_BORDER | NOT WS_TABSTOP\r
     LTEXT           "Light Squares",IDC_Light,10,98,60,10\r
@@ -644,6 +679,8 @@ BEGIN
                     WS_DISABLED | NOT WS_BORDER | NOT WS_TABSTOP\r
     EDITTEXT        OPT_SampleDarkSquare,144,138,39,36,ES_READONLY | \r
                     WS_DISABLED | NOT WS_BORDER | NOT WS_TABSTOP\r
+    DEFPUSHBUTTON   "OK",IDOK,84,244,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,140,244,50,14\r
 END\r
 \r
 DLG_NewVariant DIALOG DISCARDABLE  0, 0, 224, 250\r
@@ -651,10 +688,8 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Variants"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    DEFPUSHBUTTON   "OK",IDOK,114,232,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,170,232,50,14\r
     CONTROL         "&normal",OPT_VariantNormal,"Button",BS_AUTORADIOBUTTON | \r
-                    WS_GROUP | WS_TABSTOP,9,14,70,10\r
+                    WS_GROUP,9,14,70,10\r
     CONTROL         "&FRC",OPT_VariantFRC,"Button",BS_AUTORADIOBUTTON,9,\r
                     24,70,10\r
     CONTROL         "&wildcastle",OPT_VariantWildcastle,"Button",BS_AUTORADIOBUTTON,9,34,\r
@@ -677,7 +712,7 @@ BEGIN
                     70,10\r
     CONTROL         "&bughouse",OPT_VariantBughouse,"Button",BS_AUTORADIOBUTTON,80,24,70,\r
                     10\r
-    CONTROL         "&Twilight",OPT_VariantTwilight,"Button",BS_AUTORADIOBUTTON,80,34,70,\r
+    CONTROL         "Sp&artan",OPT_VariantSpartan,"Button",BS_AUTORADIOBUTTON,80,34,70,\r
                     10\r
     CONTROL         "&shogi",OPT_VariantShogi,"Button",BS_AUTORADIOBUTTON,80,\r
                     44,70,10\r
@@ -693,6 +728,8 @@ BEGIN
                     94,70,10\r
     CONTROL         "&makruk",OPT_VariantMakruk,"Button",BS_AUTORADIOBUTTON,80,\r
                     104,70,10\r
+    CONTROL         "&ASEAN",OPT_VariantASEAN,"Button",BS_AUTORADIOBUTTON,80,\r
+                    114,70,10\r
     CONTROL         "&gothic",OPT_VariantGothic,"Button",BS_AUTORADIOBUTTON,154,14,\r
                     70,10\r
     CONTROL         "&capablanca",OPT_VariantCapablanca,"Button",BS_AUTORADIOBUTTON,154,\r
@@ -711,27 +748,31 @@ BEGIN
                     84,70,10\r
     CONTROL         "Seira&wan",OPT_VariantSChess,"Button",BS_AUTORADIOBUTTON,154,94,70,\r
                     10\r
-    CONTROL         "&xiangqi",OPT_VariantXiangqi,"Button",BS_AUTORADIOBUTTON,154,104,70,\r
+    CONTROL         "&Grand",OPT_VariantGrand,"Button",BS_AUTORADIOBUTTON,154,104,70,\r
+                    10\r
+    CONTROL         "&xiangqi",OPT_VariantXiangqi,"Button",BS_AUTORADIOBUTTON,154,114,70,\r
                     10\r
-    GROUPBOX        "Variant",GPB_Variant,4,4,215,115\r
-    LTEXT           "Board size:",GPB_Board,10,135,40,8\r
-    EDITTEXT        IDC_Ranks,60,131,14,14,ES_AUTOHSCROLL\r
-    LTEXT           "ranks",IDC_Height,77,135,22,8\r
-    EDITTEXT        IDC_Files,116,131,14,14,ES_AUTOHSCROLL\r
-    LTEXT           "files",IDC_Width,133,135,37,8\r
-    LTEXT           "Holdings with room for:",IDC_Hand,10,153,90,8\r
-    EDITTEXT        IDC_Holdings,93,149,14,14,ES_AUTOHSCROLL\r
-    LTEXT           "pieces",IDC_Pieces,110,153,22,8\r
-    LTEXT           "('-1' means defaults for selected variant)",IDC_Def,10,171,210,8\r
+    GROUPBOX        "Variant",GPB_Variant,4,4,215,125\r
+    LTEXT           "Board size:",GPB_Board,10,165,40,8,WS_TABSTOP\r
+    LTEXT           "ranks",IDC_Height,77,165,38,8\r
+    EDITTEXT        IDC_Ranks,60,161,14,14,ES_AUTOHSCROLL\r
+    LTEXT           "files",IDC_Width,133,165,80,8\r
+    EDITTEXT        IDC_Files,116,161,14,14,ES_AUTOHSCROLL\r
+    LTEXT           "Holdings with room for:",IDC_Hand,10,183,90,8\r
+    EDITTEXT        IDC_Holdings,93,179,14,14,ES_AUTOHSCROLL\r
+    LTEXT           "pieces",IDC_Pieces,110,183,100,8\r
+    LTEXT           "('-1' means defaults for selected variant)",IDC_Def,10,201,210,8\r
+    DEFPUSHBUTTON   "OK",IDOK,114,232,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,170,232,50,14\r
 END\r
 \r
-DLG_Fonts DIALOG DISCARDABLE  0, 0, 266, 226\r
+DLG_Fonts DIALOG DISCARDABLE  0, 0, 266, 274\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Fonts"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    DEFPUSHBUTTON   "OK",IDOK,156,208,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,212,208,50,14\r
+    DEFPUSHBUTTON   "OK",IDOK,156,256,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,212,256,50,14\r
     PUSHBUTTON      "Choose...",OPT_ChooseClockFont,212,15,45,15\r
     PUSHBUTTON      "Choose...",OPT_ChooseMessageFont,212,39,45,15\r
     PUSHBUTTON      "Choose...",OPT_ChooseCoordFont,212,63,45,15\r
@@ -739,7 +780,9 @@ BEGIN
     PUSHBUTTON      "Choose...",OPT_ChooseCommentsFont,212,125,45,15\r
     PUSHBUTTON      "Choose...",OPT_ChooseConsoleFont,212,149,45,15\r
     PUSHBUTTON      "Choose...",OPT_ChooseMoveHistoryFont,212,174,45,15\r
-    PUSHBUTTON      "&Defaults",OPT_DefaultFonts,3,208,50,15\r
+    PUSHBUTTON      "Choose...",OPT_ChooseGameListFont,212,198,45,15\r
+    PUSHBUTTON      "Choose...",OPT_ChoosePieceFont,212,222,45,15\r
+    PUSHBUTTON      "&Defaults",OPT_DefaultFonts,3,256,50,15\r
     CONTROL         "",OPT_SampleCoordFont,"RICHEDIT",ES_READONLY | \r
                     WS_DISABLED | WS_BORDER,77,59,130,20\r
     CONTROL         "",OPT_SampleTagFont,"RICHEDIT",ES_READONLY | \r
@@ -760,11 +803,19 @@ BEGIN
     CONTROL         "",OPT_SampleMessageFont,"RICHEDIT",ES_READONLY | \r
                     WS_DISABLED | WS_BORDER,77,35,130,20\r
     GROUPBOX        "Current Board Size",GPB_Current,3,1,259,83\r
-    GROUPBOX        "All Board Sizes",GPB_All,3,87,259,109\r
+    GROUPBOX        "All Board Sizes",GPB_All,3,87,259,157\r
     CONTROL         "",OPT_SampleMoveHistoryFont,"RICHEDIT",ES_READONLY | \r
                     WS_DISABLED | WS_BORDER,77,170,130,20\r
     LTEXT           "Move History, Engine Output",OPT_MessageFont6,13,171,63,20,NOT \r
                     WS_GROUP\r
+    CONTROL         "",OPT_SampleGameListFont,"RICHEDIT",ES_READONLY | \r
+                    WS_DISABLED | WS_BORDER,77,194,130,20\r
+    LTEXT           "Game List",OPT_MessageFont7,13,199,63,20,NOT \r
+                    WS_GROUP\r
+    CONTROL         "",OPT_SamplePieceFont,"RICHEDIT", ES_AUTOHSCROLL | \r
+                    WS_BORDER,77,218,130,20\r
+    LTEXT           "Piece Font",OPT_MessageFont8,13,223,63,20,NOT \r
+                    WS_GROUP\r
 END\r
 \r
 DLG_NewGameFRC DIALOG DISCARDABLE  0, 0, 176, 47\r
@@ -820,16 +871,16 @@ EXSTYLE WS_EX_TOOLWINDOW
 CAPTION "Engine output"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    LTEXT           "Engine #1",IDC_EngineLabel1,14,2,84,8\r
     RTEXT           "NPS",IDC_Engine1_NPS,206,2,57,8\r
+    LTEXT           "Engine #1",IDC_EngineLabel1,14,2,84,8\r
     CONTROL         "",IDC_EngineMemo1,"RICHEDIT",ES_MULTILINE | \r
                     ES_AUTOVSCROLL | ES_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | \r
                     WS_HSCROLL | WS_TABSTOP,0,10,262,72\r
     LTEXT           "Engine #2",IDC_EngineLabel2,15,84,103,8\r
-    RTEXT           "NPS",IDC_Engine2_NPS,210,84,55,8\r
     CONTROL         "",IDC_EngineMemo2,"RICHEDIT",ES_MULTILINE | \r
                     ES_AUTOVSCROLL | ES_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | \r
                     WS_HSCROLL | WS_TABSTOP,2,92,262,74\r
+    RTEXT           "NPS",IDC_Engine2_NPS,210,84,55,8\r
     ICON            IDI_UNKNOWN_14,IDC_Color1,2,4,20,20,SS_REALSIZEIMAGE\r
     ICON            IDI_UNKNOWN_14,IDC_Color2,4,84,20,20\r
     LTEXT           "Static",IDC_StateData1,120,2,83,8\r
@@ -919,17 +970,17 @@ BEGIN
     PUSHBUTTON      "...",IDC_BrowseForPolyglotDir,226,4,17,14\r
     LTEXT           "Hash Size (MB):",IDC_Hash,2,26,78,8\r
     EDITTEXT        IDC_HashSize,82,22,40,14,ES_AUTOHSCROLL\r
+    LTEXT           "Max nr of CPUs:",IDC_CPU,126,26,60,8\r
+    EDITTEXT        IDC_Cores,187,22,35,14,ES_AUTOHSCROLL\r
     LTEXT           "EGTB Path:",IDC_Path,2,44,78,8\r
     EDITTEXT        IDC_PathToEGTB,82,40,140,14,ES_AUTOHSCROLL\r
     PUSHBUTTON      "...",IDC_BrowseForEGTB,226,40,17,14\r
     LTEXT           "EGTB Size (MB):",IDC_Cache,2,62,78,8\r
     EDITTEXT        IDC_SizeOfEGTB,82,58,40,14,ES_AUTOHSCROLL\r
     CONTROL         "Use Book:",IDC_UseBook,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,2,80,49,10\r
+                    WS_TABSTOP,2,80,78,10\r
     EDITTEXT        IDC_BookFile,82,76,140,14,ES_AUTOHSCROLL\r
     PUSHBUTTON      "...",IDC_BrowseForBook,226,76,17,14\r
-    LTEXT           "Max nr of CPUs:",IDC_CPU,126,26,60,8\r
-    EDITTEXT        IDC_Cores,187,22,35,14,ES_AUTOHSCROLL\r
     CONTROL         "First has Own Book",IDC_OwnBook1,"Button",BS_AUTOCHECKBOX | \r
                     WS_TABSTOP,2,94,100,10\r
     CONTROL         "Second has Own Book",IDC_OwnBook2,"Button",BS_AUTOCHECKBOX | \r
@@ -1080,6 +1131,7 @@ IDI_WHITE_14            ICON    DISCARDABLE     "bitmaps/white_14.ico"
 ICON_BLACK              ICON    DISCARDABLE     "bitmaps/icon_ob.ico"\r
 ICON_BOARD              ICON    DISCARDABLE     "bitmaps/board.ico"\r
 ICON_WHITE              ICON    DISCARDABLE     "bitmaps/icon_whi.ico"\r
+ICON_XTOURNEY           ICON    DISCARDABLE     "bitmaps/cross.ico"\r
 IDI_BLACK_14            ICON    DISCARDABLE     "bitmaps/black_14.ico"\r
 IDI_PONDER_14           ICON    DISCARDABLE     "bitmaps/ponder_14.ico"\r
 IDI_TRANS_14            ICON    DISCARDABLE     "bitmaps/trans_14.ico"\r
@@ -1107,15 +1159,16 @@ BEGIN
 //        MENUITEM "Load &Next Game\tAlt+PgDn",   IDM_LoadNextGame\r
 //        MENUITEM "Load &Previous Game\tAlt+PgUp", IDM_LoadPrevGame\r
 //        MENUITEM "&Reload Same Game",           IDM_ReloadGame\r
-//        MENUITEM "Load N&ext Position\tAlt+Shift+PgDn", IDM_LoadNextPosition\r
-//        MENUITEM "Load Pre&vious Position\tAlt+Shift+PgUp", \r
-//                                                IDM_LoadPrevPosition\r
+        MENUITEM "Load N&ext Position\tAlt+Shift+PgDn", IDM_LoadNextPosition\r
+        MENUITEM "Load Pre&vious Position\tAlt+Shift+PgUp", \r
+                                                IDM_LoadPrevPosition\r
 //        MENUITEM "Reload Sa&me Position",       IDM_ReloadPosition\r
         MENUITEM SEPARATOR\r
         MENUITEM "&Save Game...\tCtrl-S",       IDM_SaveGame\r
         MENUITEM "S&ave Position...\tCtrl+Shift+S",IDM_SavePosition\r
         MENUITEM SEPARATOR\r
         MENUITEM "Save as &Diagram...",         IDM_SaveDiagram\r
+        MENUITEM "Save Games to &Book",         IDM_CreateBook\r
         MENUITEM SEPARATOR\r
         MENUITEM "&Quit",                       IDM_Exit\r
     END\r
@@ -1134,7 +1187,8 @@ BEGIN
         MENUITEM "E&dit Position\tCtrl+Shift+E",IDM_EditPosition2\r
         MENUITEM SEPARATOR\r
         MENUITEM "Edit Ta&gs...",               IDM_EditTags\r
-        MENUITEM "Edit &Comment...",            IDM_EditComment\r
+        MENUITEM "Edit Co&mment...",            IDM_EditComment\r
+        MENUITEM "Edit Boo&k...",               IDM_EditBook\r
         MENUITEM "Enter &Username...",          IDM_TypeInName\r
         MENUITEM SEPARATOR\r
         MENUITEM "&Revert\tHome",               IDM_Revert\r
@@ -1162,7 +1216,8 @@ BEGIN
         MENUITEM "&Comments",                   IDM_Comment\r
         MENUITEM SEPARATOR\r
         MENUITEM "&Game List Tags...",          IDM_GameListOptions\r
-        MENUITEM "&Board...",                   IDM_BoardOptions\r
+        MENUITEM "Colo&rs...",                  IDM_BoardOptions\r
+        MENUITEM "&Board Themes...",            IDM_ThemeOptions\r
         MENUITEM "&Fonts...",                   IDM_Fonts\r
     END\r
     POPUP "&Mode"\r
@@ -1172,7 +1227,7 @@ BEGIN
         MENUITEM "&Two Machines\tCtrl+T",       IDM_TwoMachines\r
 //        MENUITEM "Machine Both",                IDM_MachineBoth\r
         MENUITEM "&Analysis Mode\tCtrl+A",      IDM_AnalysisMode\r
-        MENUITEM "Analyze &File\tCtrl+F",       IDM_AnalyzeFile\r
+        MENUITEM "Analyze &Game\tCtrl+G",       IDM_AnalyzeFile\r
         MENUITEM "&Edit Game\tCtrl+E",          IDM_EditGame\r
         MENUITEM "E&dit Position\tCtrl+Shift+E",IDM_EditPosition\r
         MENUITEM "Trai&ning",                   IDM_Training, GRAYED\r
@@ -1203,11 +1258,12 @@ BEGIN
     END\r
     POPUP "E&ngine"\r
     BEGIN\r
-        MENUITEM "Install 1st...",              IDM_EditProgs1\r
-        MENUITEM "Install 2nd...",              IDM_EditProgs2\r
+        MENUITEM "Edit Engine List...",         IDM_EditProgs1\r
+        MENUITEM "Load &First Engine...",       IDM_LoadProg1\r
+        MENUITEM "Load &Second Engine...",      IDM_LoadProg2\r
         MENUITEM SEPARATOR\r
-        MENUITEM "Engine #&1 Settings...",       IDM_Engine1Options\r
-        MENUITEM "Engine #&2 Settings...",       IDM_Engine2Options\r
+        MENUITEM "Engine #&1 Settings...",      IDM_Engine1Options\r
+        MENUITEM "Engine #&2 Settings...",      IDM_Engine2Options\r
         MENUITEM SEPARATOR\r
         MENUITEM "&Hint...",                    IDM_Hint\r
         MENUITEM "&Book...",                    IDM_Book\r
@@ -1223,6 +1279,7 @@ BEGIN
         MENUITEM "&Time Control...\tAlt+Shift+T",IDM_TimeControl\r
         MENUITEM "Common &Engine...\tAlt+Shift+U",IDM_OptionsUCI\r
         MENUITEM "Ad&judications...\tAlt+Shift+J",IDM_EnginePlayOptions\r
+        MENUITEM "Tournament...",               IDM_Tourney\r
         MENUITEM SEPARATOR\r
         MENUITEM "&Load Game...\tAlt+Shift+L",  IDM_LoadOptions\r
         MENUITEM "&Save Game...\tAlt+Shift+S",  IDM_SaveOptions\r
@@ -1438,7 +1495,8 @@ BEGIN
     "T",            IDM_TwoMachines,        VIRTKEY, CONTROL, NOINVERT\r
     "E",            IDM_EditGame,           VIRTKEY, CONTROL, NOINVERT\r
     "E",            IDM_EditPosition,       VIRTKEY, SHIFT, CONTROL, NOINVERT\r
-    "F",            IDM_AnalyzeFile,        VIRTKEY, CONTROL, NOINVERT\r
+    "D",            IDM_Debug,              VIRTKEY, CONTROL, NOINVERT\r
+    "G",            IDM_AnalyzeFile,        VIRTKEY, CONTROL, NOINVERT\r
     "M",            IDM_MoveNow,            VIRTKEY, CONTROL, NOINVERT\r
     "X",            IDM_RetractMove,        VIRTKEY, CONTROL, NOINVERT\r
     VK_DOWN,        IDM_ToEnd,              VIRTKEY, ALT, NOINVERT\r
@@ -1472,18 +1530,20 @@ END
 NO_ALT ACCELERATORS MOVEABLE PURE \r
 BEGIN\r
     VK_DELETE,      IDM_RetractMove,        VIRTKEY, NOINVERT\r
+    VK_INSERT,      IDM_MoveNow,            VIRTKEY, NOINVERT\r
+#ifndef JAWS\r
     VK_END,         IDM_TruncateGame,       VIRTKEY, NOINVERT\r
     VK_HOME,        IDM_Revert,             VIRTKEY, NOINVERT\r
-    VK_INSERT,      IDM_MoveNow,            VIRTKEY, NOINVERT\r
     VK_NEXT,        IDM_LoadNextGame,       VIRTKEY, NOINVERT\r
     VK_NEXT,        IDM_LoadNextPosition,   VIRTKEY, SHIFT, NOINVERT\r
     VK_PRIOR,       IDM_LoadPrevGame,       VIRTKEY, NOINVERT\r
     VK_PRIOR,       IDM_LoadPrevPosition,   VIRTKEY, SHIFT, NOINVERT\r
-#ifndef JAWS\r
     VK_LEFT,        IDM_Backward,           VIRTKEY, NOINVERT\r
     VK_RIGHT,       IDM_Forward,            VIRTKEY, NOINVERT\r
     VK_DOWN,        IDM_ToEnd,              VIRTKEY, NOINVERT\r
     VK_UP,          IDM_ToStart,            VIRTKEY, NOINVERT\r
+    VK_DOWN,        OPT_GameListNext,       VIRTKEY, CONTROL, NOINVERT\r
+    VK_UP,          OPT_GameListPrev,       VIRTKEY, CONTROL, NOINVERT\r
 #endif\r
 END\r
 \r