Fix Load Options dialog WB

Defined fastkeys; reordered elements so that fastkeys focus edit they
are intended for. Changed some of the more obscure texts. Corrected
list of transatble dialog items, adding a few missing ones.

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 7a5860a..febef6b 100644 (file)
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -254,7 +254,7 @@ int dialogItems[][41        ] = {
 { DLG_TimeControl, IDC_Babble, OPT_TCUseMoves, OPT_TCUseInc, OPT_TCUseFixed, \r
   OPT_TCtext1, OPT_TCtext2, OPT_TCitext1, OPT_TCitext2, OPT_TCftext, GPB_Factors,   IDC_Factor1, IDC_Factor2, IDOK, IDCANCEL }, \r
 { DLG_LoadOptions, OPT_Autostep, OPT_AStext1, OPT_Exact, OPT_Subset, OPT_Struct, OPT_Material, OPT_Range, OPT_Difference,\r
-  OPT_elo1, OPT_elo2, OPT_date, OPT_Stretch, OPT_Stretcht, OPT_Reversed, OPT_SearchMode, IDOK, IDCANCEL }, \r
+  OPT_elo1t, OPT_elo2t, OPT_datet, OPT_Stretch, OPT_Stretcht, OPT_Reversed, OPT_SearchMode, OPT_Mirror, OPT_thresholds, IDOK, IDCANCEL }, \r
 { DLG_SaveOptions, OPT_Autosave, OPT_AVPrompt, OPT_AVToFile, OPT_AVBrowse,\r
   801, OPT_PGN, OPT_Old, OPT_OutOfBookInfo, IDOK, IDCANCEL }, \r
 { 1536, 1090, IDC_Directories, 1089, 1091, IDOK, IDCANCEL, 1038, IDC_IndexNr, 1037 }, \r

diff --git a/winboard/winboard.rc b/winboard/winboard.rc
index 5713678..e138969 100644 (file)
--- a/winboard/winboard.rc
+++ b/winboard/winboard.rc
@@ -95,35 +95,35 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 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
     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           "Elo for at least one player",OPT_elo1t,46,54,90,8,NOT WS_GROUP\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           "Elo for both players",OPT_elo2t,46,74,90,8,NOT WS_GROUP\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           "or later year",OPT_datet,46,94,94,8,NOT WS_GROUP\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
-    LTEXT           "consecutive positions",OPT_Stretcht,46,114,94,8,NOT WS_GROUP\r
-    CONTROL         "Match exact position",OPT_Exact,"Button",\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 subset",OPT_Subset,"Button",\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 exact pawn structure",OPT_Struct,"Button",\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
+    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
+    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
+    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
+    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 miror image",OPT_Mirror,"Button",\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