X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.rc;h=1a1bfc9c46074b5eb533f4e715b9ebe256ee4608;hb=e70077aab0199817f37aef9ed0bdba1bbca93b45;hp=efaa9db811de02895aa3701ae03c24b9f77911ad;hpb=1a680c0201a56f10027a213d097e71f2d894720a;p=xboard.git diff --git a/winboard/winboard.rc b/winboard/winboard.rc index efaa9db..1a1bfc9 100644 --- a/winboard/winboard.rc +++ b/winboard/winboard.rc @@ -44,7 +44,7 @@ BEGIN LTEXT "Chessboard for Windows",400,25,15,121,8 LTEXT "Copyright 1991 Digital Equipment Corporation",201,6,34, 149,8 - LTEXT "Enhancements Copyright 1992-2010 Free Software Foundation", + LTEXT "Enhancements Copyright 1992-2012 Free Software Foundation", OPT_TCtext1,6,45,121,17 CONTROL "",OPT_TCTime,"Static",SS_BLACKRECT,4,28,159,1 LTEXT "WinBoard 0.0.0",ABOUTBOX_Version,25,5,160,8 @@ -90,17 +90,43 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,195,190,40,14 END -DLG_LoadOptions DIALOG DISCARDABLE 10, 18, 166, 55 +DLG_LoadOptions DIALOG DISCARDABLE 10, 18, 170, 261 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Load Game Options" FONT 8, "MS Sans Serif" BEGIN - CONTROL "Load games with automatic stepping",OPT_Autostep,"Button", + CONTROL "Load games with &automatic stepping",OPT_Autostep,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,4,4,160,10 + LTEXT "&seconds per move",OPT_AStext1,46,20,90,8,NOT WS_GROUP EDITTEXT OPT_ASTimeDelay,16,16,28,14,ES_AUTOHSCROLL - LTEXT "seconds per move",OPT_AStext1,46,20,90,8,NOT WS_GROUP - PUSHBUTTON "OK",IDOK,56,36,50,14,WS_GROUP - PUSHBUTTON "Cancel",IDCANCEL,112,36,50,14 + LTEXT "when filtering game list on position, use thresholds:",OPT_thresholds,4,36,160,8,NOT WS_GROUP + LTEXT "minimum Elo for &best player",OPT_elo1t,46,54,90,8,NOT WS_GROUP + EDITTEXT OPT_elo1,16,50,28,14,ES_AUTOHSCROLL + LTEXT "minimum Elo for &weakest players",OPT_elo2t,46,74,90,8,NOT WS_GROUP + EDITTEXT OPT_elo2,16,70,28,14,ES_AUTOHSCROLL + LTEXT "or later &year",OPT_datet,46,94,94,8,NOT WS_GROUP + EDITTEXT OPT_date,16,90,28,14,ES_AUTOHSCROLL + LTEXT "co&nsecutive positions",OPT_Stretcht,46,114,94,8,NOT WS_GROUP + EDITTEXT OPT_Stretch,16,110,28,14,ES_AUTOHSCROLL + CONTROL "Match exact &position",OPT_Exact,"Button", + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,6,136,159,10 + CONTROL "Match if position is s&ubset",OPT_Subset,"Button", + BS_AUTORADIOBUTTON | WS_TABSTOP,6,149,159,10 + CONTROL "Match material with e&xact pawn structure",OPT_Struct,"Button", + BS_AUTORADIOBUTTON | WS_TABSTOP,6,162,159,10 + CONTROL "Match &material",OPT_Material,"Button", + BS_AUTORADIOBUTTON | WS_TABSTOP,6,175,159,10 + CONTROL "Material &range (upper board-half is optional)",OPT_Range,"Button", + BS_AUTORADIOBUTTON | WS_TABSTOP,6,188,159,10 + CONTROL "Material &difference (optional material balanced)",OPT_Difference,"Button", + BS_AUTORADIOBUTTON | WS_TABSTOP,6,201,159,10 + GROUPBOX "Search Mode: ",OPT_SearchMode,3,126,164,87,WS_GROUP + CONTROL "Also match reversed &colors",OPT_Reversed,"Button", + BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,4,214,160,10 + CONTROL "Also match &left-right mirror image",OPT_Mirror,"Button", + BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,4,227,160,10 + PUSHBUTTON "OK",IDOK,56,242,50,14,WS_GROUP + PUSHBUTTON "Cancel",IDCANCEL,112,242,50,14 END DLG_SaveOptions DIALOG DISCARDABLE 6, 17, 178, 119 @@ -240,11 +266,11 @@ FONT 8, "MS Sans Serif" BEGIN LISTBOX OPT_GameListText,2,2,254,130,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "&Load",OPT_GameListLoad,2,135,32,15 - PUSHBUTTON "&<",OPT_GameListPrev,38,135,22,15 - PUSHBUTTON "&>",OPT_GameListNext,64,135,24,15 - PUSHBUTTON "&Close",OPT_GameListClose,92,135,32,15 - PUSHBUTTON "Filter",IDC_GameListDoFilter,144,136,30,14 + PUSHBUTTON "&Thresholds",OPT_GameListLoad,2,136,40,15 + PUSHBUTTON "&Find Position",OPT_GameListFind,45,136,48,15 + PUSHBUTTON "&Close",OPT_GameListClose,96,136,30,15 + PUSHBUTTON ">",OPT_GameListNext,129,136,17,15 + PUSHBUTTON "&Filter",IDC_GameListDoFilter,149,136,25,14 EDITTEXT IDC_GameListFilter,178,136,78,14,ES_AUTOHSCROLL END @@ -616,9 +642,13 @@ BEGIN CONTROL "Monochrome",OPT_Monochrome,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,210,64,10 CONTROL "All White",OPT_AllWhite,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,140,180,73,10 + WS_TABSTOP,140,179,73,10 CONTROL "Flip Black",OPT_UpsideDown,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,140,192,73,10 + WS_TABSTOP,140,191,73,10 + CONTROL "Use Board Textures",OPT_Bitmaps,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,140,203,73,10 + CONTROL "Use Piece Font",OPT_PieceFont,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,140,215,73,10 PUSHBUTTON "Defaults",OPT_DefaultBoardColors,80,206,50,15 EDITTEXT OPT_DarkSquareColor,80,112,25,15,ES_READONLY | WS_DISABLED | NOT WS_BORDER | NOT WS_TABSTOP @@ -677,7 +707,7 @@ BEGIN 70,10 CONTROL "&bughouse",OPT_VariantBughouse,"Button",BS_AUTORADIOBUTTON,80,24,70, 10 - CONTROL "&Twilight",OPT_VariantTwilight,"Button",BS_AUTORADIOBUTTON,80,34,70, + CONTROL "Sp&artan",OPT_VariantSpartan,"Button",BS_AUTORADIOBUTTON,80,34,70, 10 CONTROL "&shogi",OPT_VariantShogi,"Button",BS_AUTORADIOBUTTON,80, 44,70,10 @@ -711,29 +741,31 @@ BEGIN 84,70,10 CONTROL "Seira&wan",OPT_VariantSChess,"Button",BS_AUTORADIOBUTTON,154,94,70, 10 - CONTROL "&xiangqi",OPT_VariantXiangqi,"Button",BS_AUTORADIOBUTTON,154,104,70, + CONTROL "&Grand",OPT_VariantGrand,"Button",BS_AUTORADIOBUTTON,154,104,70, 10 - GROUPBOX "Variant",GPB_Variant,4,4,215,115 - LTEXT "Board size:",GPB_Board,10,135,40,8 - EDITTEXT IDC_Ranks,60,131,14,14,ES_AUTOHSCROLL - LTEXT "ranks",IDC_Height,77,135,22,8 - EDITTEXT IDC_Files,116,131,14,14,ES_AUTOHSCROLL - LTEXT "files",IDC_Width,133,135,37,8 - LTEXT "Holdings with room for:",IDC_Hand,10,153,90,8 - EDITTEXT IDC_Holdings,93,149,14,14,ES_AUTOHSCROLL - LTEXT "pieces",IDC_Pieces,110,153,22,8 - LTEXT "('-1' means defaults for selected variant)",IDC_Def,10,171,210,8 + CONTROL "&xiangqi",OPT_VariantXiangqi,"Button",BS_AUTORADIOBUTTON,154,114,70, + 10 + GROUPBOX "Variant",GPB_Variant,4,4,215,125 + LTEXT "Board size:",GPB_Board,10,165,40,8,WS_TABSTOP + LTEXT "ranks",IDC_Height,77,165,22,8 + EDITTEXT IDC_Ranks,60,161,14,14,ES_AUTOHSCROLL + LTEXT "files",IDC_Width,133,165,37,8 + EDITTEXT IDC_Files,116,161,14,14,ES_AUTOHSCROLL + LTEXT "Holdings with room for:",IDC_Hand,10,183,90,8 + EDITTEXT IDC_Holdings,93,179,14,14,ES_AUTOHSCROLL + LTEXT "pieces",IDC_Pieces,110,183,22,8 + LTEXT "('-1' means defaults for selected variant)",IDC_Def,10,201,210,8 DEFPUSHBUTTON "OK",IDOK,114,232,50,14 PUSHBUTTON "Cancel",IDCANCEL,170,232,50,14 END -DLG_Fonts DIALOG DISCARDABLE 0, 0, 266, 226 +DLG_Fonts DIALOG DISCARDABLE 0, 0, 266, 274 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Fonts" FONT 8, "MS Sans Serif" BEGIN - DEFPUSHBUTTON "OK",IDOK,156,208,50,14 - PUSHBUTTON "Cancel",IDCANCEL,212,208,50,14 + DEFPUSHBUTTON "OK",IDOK,156,256,50,14 + PUSHBUTTON "Cancel",IDCANCEL,212,256,50,14 PUSHBUTTON "Choose...",OPT_ChooseClockFont,212,15,45,15 PUSHBUTTON "Choose...",OPT_ChooseMessageFont,212,39,45,15 PUSHBUTTON "Choose...",OPT_ChooseCoordFont,212,63,45,15 @@ -741,7 +773,9 @@ BEGIN PUSHBUTTON "Choose...",OPT_ChooseCommentsFont,212,125,45,15 PUSHBUTTON "Choose...",OPT_ChooseConsoleFont,212,149,45,15 PUSHBUTTON "Choose...",OPT_ChooseMoveHistoryFont,212,174,45,15 - PUSHBUTTON "&Defaults",OPT_DefaultFonts,3,208,50,15 + PUSHBUTTON "Choose...",OPT_ChooseGameListFont,212,198,45,15 + PUSHBUTTON "Choose...",OPT_ChoosePieceFont,212,222,45,15 + PUSHBUTTON "&Defaults",OPT_DefaultFonts,3,256,50,15 CONTROL "",OPT_SampleCoordFont,"RICHEDIT",ES_READONLY | WS_DISABLED | WS_BORDER,77,59,130,20 CONTROL "",OPT_SampleTagFont,"RICHEDIT",ES_READONLY | @@ -762,11 +796,19 @@ BEGIN CONTROL "",OPT_SampleMessageFont,"RICHEDIT",ES_READONLY | WS_DISABLED | WS_BORDER,77,35,130,20 GROUPBOX "Current Board Size",GPB_Current,3,1,259,83 - GROUPBOX "All Board Sizes",GPB_All,3,87,259,109 + GROUPBOX "All Board Sizes",GPB_All,3,87,259,157 CONTROL "",OPT_SampleMoveHistoryFont,"RICHEDIT",ES_READONLY | WS_DISABLED | WS_BORDER,77,170,130,20 LTEXT "Move History, Engine Output",OPT_MessageFont6,13,171,63,20,NOT WS_GROUP + CONTROL "",OPT_SampleGameListFont,"RICHEDIT",ES_READONLY | + WS_DISABLED | WS_BORDER,77,194,130,20 + LTEXT "Game List",OPT_MessageFont7,13,199,63,20,NOT + WS_GROUP + CONTROL "",OPT_SamplePieceFont,"RICHEDIT", ES_AUTOHSCROLL | + WS_BORDER,77,218,130,20 + LTEXT "Piece Font",OPT_MessageFont8,13,223,63,20,NOT + WS_GROUP END DLG_NewGameFRC DIALOG DISCARDABLE 0, 0, 176, 47 @@ -822,16 +864,16 @@ EXSTYLE WS_EX_TOOLWINDOW CAPTION "Engine output" FONT 8, "MS Sans Serif" BEGIN - LTEXT "Engine #1",IDC_EngineLabel1,14,2,84,8 RTEXT "NPS",IDC_Engine1_NPS,206,2,57,8 + LTEXT "Engine #1",IDC_EngineLabel1,14,2,84,8 CONTROL "",IDC_EngineMemo1,"RICHEDIT",ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,0,10,262,72 LTEXT "Engine #2",IDC_EngineLabel2,15,84,103,8 - RTEXT "NPS",IDC_Engine2_NPS,210,84,55,8 CONTROL "",IDC_EngineMemo2,"RICHEDIT",ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,2,92,262,74 + RTEXT "NPS",IDC_Engine2_NPS,210,84,55,8 ICON IDI_UNKNOWN_14,IDC_Color1,2,4,20,20,SS_REALSIZEIMAGE ICON IDI_UNKNOWN_14,IDC_Color2,4,84,20,20 LTEXT "Static",IDC_StateData1,120,2,83,8 @@ -921,6 +963,8 @@ BEGIN PUSHBUTTON "...",IDC_BrowseForPolyglotDir,226,4,17,14 LTEXT "Hash Size (MB):",IDC_Hash,2,26,78,8 EDITTEXT IDC_HashSize,82,22,40,14,ES_AUTOHSCROLL + LTEXT "Max nr of CPUs:",IDC_CPU,126,26,60,8 + EDITTEXT IDC_Cores,187,22,35,14,ES_AUTOHSCROLL LTEXT "EGTB Path:",IDC_Path,2,44,78,8 EDITTEXT IDC_PathToEGTB,82,40,140,14,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_BrowseForEGTB,226,40,17,14 @@ -930,8 +974,6 @@ BEGIN WS_TABSTOP,2,80,49,10 EDITTEXT IDC_BookFile,82,76,140,14,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_BrowseForBook,226,76,17,14 - LTEXT "Max nr of CPUs:",IDC_CPU,126,26,60,8 - EDITTEXT IDC_Cores,187,22,35,14,ES_AUTOHSCROLL CONTROL "First has Own Book",IDC_OwnBook1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,2,94,100,10 CONTROL "Second has Own Book",IDC_OwnBook2,"Button",BS_AUTOCHECKBOX | @@ -1082,6 +1124,7 @@ IDI_WHITE_14 ICON DISCARDABLE "bitmaps/white_14.ico" ICON_BLACK ICON DISCARDABLE "bitmaps/icon_ob.ico" ICON_BOARD ICON DISCARDABLE "bitmaps/board.ico" ICON_WHITE ICON DISCARDABLE "bitmaps/icon_whi.ico" +ICON_XTOURNEY ICON DISCARDABLE "bitmaps/cross.ico" IDI_BLACK_14 ICON DISCARDABLE "bitmaps/black_14.ico" IDI_PONDER_14 ICON DISCARDABLE "bitmaps/ponder_14.ico" IDI_TRANS_14 ICON DISCARDABLE "bitmaps/trans_14.ico" @@ -1109,9 +1152,9 @@ BEGIN // MENUITEM "Load &Next Game\tAlt+PgDn", IDM_LoadNextGame // MENUITEM "Load &Previous Game\tAlt+PgUp", IDM_LoadPrevGame // MENUITEM "&Reload Same Game", IDM_ReloadGame -// MENUITEM "Load N&ext Position\tAlt+Shift+PgDn", IDM_LoadNextPosition -// MENUITEM "Load Pre&vious Position\tAlt+Shift+PgUp", -// IDM_LoadPrevPosition + MENUITEM "Load N&ext Position\tAlt+Shift+PgDn", IDM_LoadNextPosition + MENUITEM "Load Pre&vious Position\tAlt+Shift+PgUp", + IDM_LoadPrevPosition // MENUITEM "Reload Sa&me Position", IDM_ReloadPosition MENUITEM SEPARATOR MENUITEM "&Save Game...\tCtrl-S", IDM_SaveGame @@ -1137,6 +1180,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Edit Ta&gs...", IDM_EditTags MENUITEM "Edit Co&mment...", IDM_EditComment + MENUITEM "Edit Boo&k...", IDM_EditBook MENUITEM "Enter &Username...", IDM_TypeInName MENUITEM SEPARATOR MENUITEM "&Revert\tHome", IDM_Revert @@ -1174,7 +1218,7 @@ BEGIN MENUITEM "&Two Machines\tCtrl+T", IDM_TwoMachines // MENUITEM "Machine Both", IDM_MachineBoth MENUITEM "&Analysis Mode\tCtrl+A", IDM_AnalysisMode - MENUITEM "Analyze &File\tCtrl+F", IDM_AnalyzeFile + MENUITEM "Analyze &Game\tCtrl+G", IDM_AnalyzeFile MENUITEM "&Edit Game\tCtrl+E", IDM_EditGame MENUITEM "E&dit Position\tCtrl+Shift+E",IDM_EditPosition MENUITEM "Trai&ning", IDM_Training, GRAYED @@ -1205,8 +1249,8 @@ BEGIN END POPUP "E&ngine" BEGIN - MENUITEM "Install 1st...", IDM_EditProgs1 - MENUITEM "Install 2nd...", IDM_EditProgs2 + MENUITEM "Edit Engine List...", IDM_EditProgs1 + MENUITEM "Load Engine...", IDM_EditProgs2 MENUITEM SEPARATOR MENUITEM "Engine #&1 Settings...", IDM_Engine1Options MENUITEM "Engine #&2 Settings...", IDM_Engine2Options @@ -1225,6 +1269,7 @@ BEGIN MENUITEM "&Time Control...\tAlt+Shift+T",IDM_TimeControl MENUITEM "Common &Engine...\tAlt+Shift+U",IDM_OptionsUCI MENUITEM "Ad&judications...\tAlt+Shift+J",IDM_EnginePlayOptions + MENUITEM "Tournament...", IDM_Tourney MENUITEM SEPARATOR MENUITEM "&Load Game...\tAlt+Shift+L", IDM_LoadOptions MENUITEM "&Save Game...\tAlt+Shift+S", IDM_SaveOptions @@ -1440,7 +1485,7 @@ BEGIN "T", IDM_TwoMachines, VIRTKEY, CONTROL, NOINVERT "E", IDM_EditGame, VIRTKEY, CONTROL, NOINVERT "E", IDM_EditPosition, VIRTKEY, SHIFT, CONTROL, NOINVERT - "F", IDM_AnalyzeFile, VIRTKEY, CONTROL, NOINVERT + "G", IDM_AnalyzeFile, VIRTKEY, CONTROL, NOINVERT "M", IDM_MoveNow, VIRTKEY, CONTROL, NOINVERT "X", IDM_RetractMove, VIRTKEY, CONTROL, NOINVERT VK_DOWN, IDM_ToEnd, VIRTKEY, ALT, NOINVERT @@ -1474,18 +1519,20 @@ END NO_ALT ACCELERATORS MOVEABLE PURE BEGIN VK_DELETE, IDM_RetractMove, VIRTKEY, NOINVERT + VK_INSERT, IDM_MoveNow, VIRTKEY, NOINVERT +#ifndef JAWS VK_END, IDM_TruncateGame, VIRTKEY, NOINVERT VK_HOME, IDM_Revert, VIRTKEY, NOINVERT - VK_INSERT, IDM_MoveNow, VIRTKEY, NOINVERT VK_NEXT, IDM_LoadNextGame, VIRTKEY, NOINVERT VK_NEXT, IDM_LoadNextPosition, VIRTKEY, SHIFT, NOINVERT VK_PRIOR, IDM_LoadPrevGame, VIRTKEY, NOINVERT VK_PRIOR, IDM_LoadPrevPosition, VIRTKEY, SHIFT, NOINVERT -#ifndef JAWS VK_LEFT, IDM_Backward, VIRTKEY, NOINVERT VK_RIGHT, IDM_Forward, VIRTKEY, NOINVERT VK_DOWN, IDM_ToEnd, VIRTKEY, NOINVERT VK_UP, IDM_ToStart, VIRTKEY, NOINVERT + VK_DOWN, OPT_GameListNext, VIRTKEY, CONTROL, NOINVERT + VK_UP, OPT_GameListPrev, VIRTKEY, CONTROL, NOINVERT #endif END