X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.rc;h=e1389691d68d4d5ac1d3563962f184d34cfc573f;hb=2c6cd481ba85455e761248831c7eee4a50e8b5c7;hp=29b1f915a984092a346d6c867c0a72e119bcb8ee;hpb=d9f4b584106f4d7477158476ff792f6fa0b2630a;p=xboard.git diff --git a/winboard/winboard.rc b/winboard/winboard.rc index 29b1f91..e138969 100644 --- a/winboard/winboard.rc +++ b/winboard/winboard.rc @@ -90,32 +90,43 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,195,190,40,14 END -DLG_LoadOptions DIALOG DISCARDABLE 10, 18, 166, 184 +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 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 "Elo for at least one player",OPT_elo1t,46,54,90,8,NOT WS_GROUP + 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 "Elo for both players",OPT_elo2t,46,74,90,8,NOT WS_GROUP + LTEXT "or later &year",OPT_datet,46,94,94,8,NOT WS_GROUP EDITTEXT OPT_date,16,90,28,14,ES_AUTOHSCROLL - LTEXT "or later year",OPT_datet,46,94,94,8,NOT WS_GROUP - CONTROL "Match exact position",OPT_Exact,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,4,111,159,10 - CONTROL "Match if position is subset",OPT_Subset,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP,4,124,159,10 - CONTROL "Match material with exact pawn structure",OPT_Struct,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP,4,137,159,10 - CONTROL "Match material",OPT_Material,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP,4,150,159,10 - PUSHBUTTON "OK",IDOK,56,165,50,14,WS_GROUP - PUSHBUTTON "Cancel",IDCANCEL,112,165,50,14 + 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 @@ -256,8 +267,9 @@ BEGIN LISTBOX OPT_GameListText,2,2,254,130,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP PUSHBUTTON "&Thresholds",OPT_GameListLoad,2,136,40,15 - PUSHBUTTON "&Find Position",OPT_GameListPrev,45,136,48,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 @@ -630,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 @@ -743,13 +759,13 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,170,232,50,14 END -DLG_Fonts DIALOG DISCARDABLE 0, 0, 266, 250 +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,232,50,14 - PUSHBUTTON "Cancel",IDCANCEL,212,232,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 @@ -758,7 +774,8 @@ BEGIN PUSHBUTTON "Choose...",OPT_ChooseConsoleFont,212,149,45,15 PUSHBUTTON "Choose...",OPT_ChooseMoveHistoryFont,212,174,45,15 PUSHBUTTON "Choose...",OPT_ChooseGameListFont,212,198,45,15 - PUSHBUTTON "&Defaults",OPT_DefaultFonts,3,232,50,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 | @@ -779,7 +796,7 @@ 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,133 + 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 @@ -788,6 +805,10 @@ BEGIN 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 @@ -1197,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 @@ -1464,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 @@ -1510,6 +1531,8 @@ BEGIN 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