Create space in dialogs for translation
authorH.G. Muller <h.g.muller@hccnet.nl>
Sun, 5 Dec 2010 12:51:20 +0000 (13:51 +0100)
committerArun Persaud <arun@nubati.net>
Sat, 11 Dec 2010 17:41:45 +0000 (09:41 -0800)
The translated texts often did not fit, because controls were defined
needlessly small (when there was empty space between them). In these
cases they have been enlarged to consume all available space. Some
dialogs are made wider.

winboard/winboard.rc

index 23d7c23..be39e94 100644 (file)
@@ -71,36 +71,36 @@ BEGIN
     LTEXT           "Within number of minutes:",OPT_TCtext2,113,54,81,8,NOT \r
                     WS_GROUP\r
     EDITTEXT        OPT_TCTime,197,52,32,12,ES_AUTOHSCROLL\r
-    LTEXT           "Initial number of minutes:",OPT_TCitext1,15,89,106,8,NOT \r
+    LTEXT           "Initial number of minutes:",OPT_TCitext1,15,89,126,8,NOT \r
                     WS_GROUP\r
-    EDITTEXT        OPT_TCTime2,127,87,32,12,ES_AUTOHSCROLL | WS_GROUP\r
-    LTEXT           "Plus number of seconds per move:",OPT_TCitext2,15,105,109,8,NOT \r
+    EDITTEXT        OPT_TCTime2,147,87,32,12,ES_AUTOHSCROLL | WS_GROUP\r
+    LTEXT           "Plus number of seconds per move:",OPT_TCitext2,15,105,129,8,NOT \r
                     WS_GROUP\r
-    EDITTEXT        OPT_TCInc,127,103,32,12,ES_AUTOHSCROLL\r
-    LTEXT           "Maximum seconds per move:",OPT_TCftext,15,142,109,8,NOT \r
+    EDITTEXT        OPT_TCInc,147,103,32,12,ES_AUTOHSCROLL\r
+    LTEXT           "Maximum seconds per move:",OPT_TCftext,15,142,129,8,NOT \r
                     WS_GROUP\r
-    EDITTEXT        OPT_TCFixed,127,140,32,12,ES_AUTOHSCROLL\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,47,171,32,12,ES_AUTOHSCROLL | WS_GROUP\r
-    LTEXT           "Engine #1:",IDC_Factor1,6,173,40,8,NOT WS_GROUP\r
-    EDITTEXT        OPT_TCOdds2,127,171,32,12,ES_AUTOHSCROLL\r
-    LTEXT           "Engine #2:",IDC_Factor2,86,173,40,8,NOT WS_GROUP\r
-    PUSHBUTTON      "OK",IDOK,29,190,40,14,WS_GROUP\r
-    PUSHBUTTON      "Cancel",IDCANCEL,85,190,40,14\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
+    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, 136, 55\r
+DLG_LoadOptions DIALOG DISCARDABLE  10, 18, 166, 55\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
-                    BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,4,4,130,10\r
+                    BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,4,4,160,10\r
     EDITTEXT        OPT_ASTimeDelay,16,16,28,14,ES_AUTOHSCROLL\r
-    LTEXT           "seconds per move",OPT_AStext1,46,20,60,8,NOT WS_GROUP\r
-    PUSHBUTTON      "OK",IDOK,26,36,50,14,WS_GROUP\r
-    PUSHBUTTON      "Cancel",IDCANCEL,82,36,50,14\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
 END\r
 \r
 DLG_SaveOptions DIALOG DISCARDABLE  6, 17, 178, 119\r
@@ -109,9 +109,9 @@ CAPTION "Save Game Options"
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
     CONTROL         "Save games automatically",OPT_Autosave,"Button",\r
-                    BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,4,4,97,10\r
+                    BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,4,4,157,10\r
     CONTROL         "Prompt for filename",OPT_AVPrompt,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,18,75,10\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
@@ -121,7 +121,7 @@ BEGIN
                     60,39,10\r
     CONTROL         "Old",OPT_Old,"Button",BS_AUTORADIOBUTTON,54,60,114,10\r
     CONTROL         "Save out of book info in PGN",OPT_OutOfBookInfo,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,4,82,109,10\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
 END\r
@@ -331,35 +331,35 @@ BEGIN
     ICON            32514,IDC_STATIC,4,4,20,20\r
 END\r
 \r
-DLG_Startup DIALOG DISCARDABLE  0, 0, 276, 159\r
+DLG_Startup DIALOG DISCARDABLE  0, 0, 326, 159\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "WinBoard Startup"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    GROUPBOX        "What would you like to do?",IDC_Welcome,4,4,211,56\r
+    GROUPBOX        "What would you like to do?",IDC_Welcome,4,4,318,56\r
     CONTROL         "&Play against a chess engine or match two engines",\r
                     OPT_ChessEngine,"Button",BS_AUTORADIOBUTTON | WS_GROUP | \r
-                    WS_TABSTOP,8,17,193,10\r
+                    WS_TABSTOP,8,17,310,10\r
     CONTROL         "&Use an Internet Chess Server",OPT_ChessServer,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,8,30,193,10\r
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,8,30,310,10\r
     CONTROL         "Just &view or edit game files",OPT_View,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,8,43,193,10\r
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,8,43,310,10\r
     LTEXT           "Specify Chess &Engines:",IDC_SPECIFY_ENG_STATIC,11,63,\r
                     102,10\r
-    COMBOBOX        OPT_ChessEngineName,17,74,194,129,CBS_DROPDOWN | \r
+    COMBOBOX        OPT_ChessEngineName,17,74,244,129,CBS_DROPDOWN | \r
                     CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP\r
-    COMBOBOX        OPT_SecondChessEngineName,17,92,194,129,CBS_DROPDOWN | \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
-    COMBOBOX        OPT_ChessServerName,17,122,194,129,CBS_DROPDOWN | \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
-                    BS_AUTOCHECKBOX | WS_TABSTOP,11,142,71,10\r
-    EDITTEXT        OPT_AdditionalOptions,85,142,187,13,ES_AUTOHSCROLL\r
-    DEFPUSHBUTTON   "OK",IDOK,222,4,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,222,21,50,14\r
-    PUSHBUTTON      "&Help",IDM_HELPCONTENTS,222,38,50,14\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,11,142,91,10\r
+    EDITTEXT        OPT_AdditionalOptions,105,142,215,13,ES_AUTOHSCROLL\r
+    DEFPUSHBUTTON   "OK",IDOK,272,73,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,272,91,50,14\r
+    PUSHBUTTON      "&Help",IDM_HELPCONTENTS,272,109,50,14\r
 END\r
 \r
 DLG_IndexNumber DIALOG DISCARDABLE  0, 0, 236, 18\r
@@ -390,86 +390,86 @@ BEGIN
     EDITTEXT        OPT_Name,4,4,86,13,ES_AUTOHSCROLL\r
 END\r
 \r
-DLG_Sound DIALOG DISCARDABLE  0, 0, 242, 105\r
+DLG_Sound DIALOG DISCARDABLE  0, 0, 262, 105\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Sounds"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    LTEXT           "&Event:",IDC_Event,4,7,26,9\r
-    COMBOBOX        CBO_Sounds,30,4,208,110,CBS_DROPDOWNLIST | WS_VSCROLL | \r
+    LTEXT           "&Event:",IDC_Event,4,7,46,9\r
+    COMBOBOX        CBO_Sounds,50,4,208,110,CBS_DROPDOWNLIST | WS_VSCROLL | \r
                     WS_TABSTOP\r
 //    GROUPBOX        "sound type",IDC_STATIC,8,18,66,62\r
     CONTROL         "&No sound",OPT_NoSound,"Button",BS_AUTORADIOBUTTON | \r
                     WS_GROUP | WS_TABSTOP,12,22,47,10\r
     CONTROL         "&Default beep",OPT_DefaultBeep,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,12,36,57,10\r
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,12,36,83,10\r
     CONTROL         "&Built-in sound:",OPT_BuiltInSound,"Button",\r
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,12,51,60,10\r
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,12,51,83,10\r
     CONTROL         "&WAV file:",OPT_WavFile,"Button",BS_AUTORADIOBUTTON | \r
-                    WS_TABSTOP,12,66,45,10\r
-    COMBOBOX        OPT_BuiltInSoundName,76,48,103,109,CBS_DROPDOWNLIST | \r
+                    WS_TABSTOP,12,66,83,10\r
+    COMBOBOX        OPT_BuiltInSoundName,96,48,103,109,CBS_DROPDOWNLIST | \r
                     CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_GROUP\r
-    EDITTEXT        OPT_WavFileName,76,65,103,12,ES_AUTOHSCROLL\r
-    PUSHBUTTON      "B&rowse...",OPT_BrowseSound,188,64,50,14\r
+    EDITTEXT        OPT_WavFileName,96,65,103,12,ES_AUTOHSCROLL\r
+    PUSHBUTTON      "B&rowse...",OPT_BrowseSound,208,64,50,14\r
     PUSHBUTTON      "Defaults",OPT_DefaultSounds,6,86,50,14\r
-    DEFPUSHBUTTON   "OK",IDOK,132,86,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,188,86,50,14\r
-    PUSHBUTTON      "&Play",OPT_PlaySound,188,47,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, 250, 197\r
+DLG_GeneralOptions DIALOG DISCARDABLE  0, 0, 300, 197\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "General Options"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    DEFPUSHBUTTON   "OK",IDOK,110,178,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,166,178,50,14\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,126,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,4,6,151,10\r
     CONTROL         "Highlight Last &Move",OPT_HighlightLastMove,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,131,6,126,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,156,6,151,10\r
     CONTROL         "Always &Queen            Ctrl+Shift+Q",OPT_AlwaysQueen,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,4,20,126,10\r
+                    WS_TABSTOP,4,20,151,10\r
     CONTROL         "Periodic &Updates",OPT_PeriodicUpdates,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,131,20,126,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,156,20,151,10\r
     CONTROL         "Animate &Dragging",OPT_AnimateDragging,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,4,34,126,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,4,34,151,10\r
     CONTROL         "Ponder &Next Move  Ctrl+Shift+P",OPT_PonderNextMove,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,131,34,126,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,156,34,151,10\r
     CONTROL         "&Animate Moving         Ctrl+Shift+A",OPT_AnimateMoving,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,4,48,126,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,4,48,151,10\r
     CONTROL         "&Popup Exit Message",OPT_PopupExitMessage,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,131,48,126,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,156,48,151,10\r
     CONTROL         "Auto &Flag                   Ctrl+Shift+F",OPT_AutoFlag,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,4,62,126,10\r
+                    WS_TABSTOP,4,62,151,10\r
     CONTROL         "Popup Move &Errors",OPT_PopupMoveErrors,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,131,62,126,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,156,62,151,10\r
     CONTROL         "Auto Flip &View",OPT_AutoFlipView,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,4,76,126,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,4,76,151,10\r
     CONTROL         "Show Butt&on Bar",OPT_ShowButtonBar,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,131,76,126,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,156,76,151,10\r
     CONTROL         "Auto &Raise Board",OPT_AutoRaiseBoard,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,4,90,71,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,4,90,151,10\r
     CONTROL         "Show &Coordinates",OPT_ShowCoordinates,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,131,90,126,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,156,90,151,10\r
     CONTROL         "&Blindfold",OPT_Blindfold,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,4,104,126,10\r
+                    WS_TABSTOP,4,104,151,10\r
     CONTROL         "&Send Engine Think",OPT_ShowThinking,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,131,104,126,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,156,104,151,10\r
     CONTROL         "Highlight Dra&gging",OPT_HighlightDragging,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,4,118,126,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,4,118,151,10\r
     CONTROL         "Test &Legality            Ctrl+Shift+L",OPT_TestLegality,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,131,118,126,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,156,118,151,10\r
     CONTROL         "E&xtended PGN Info    Ctrl+Shift+X",OPT_SaveExtPGN,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,4,132,126,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,4,132,151,10\r
     CONTROL         "&Hide Thinking          Ctrl+Shift+H",OPT_HideThinkFromHuman,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,131,132,126,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,156,132,151,10\r
     CONTROL         "&Info in Move History   Ctrl+Shift+I",OPT_ExtraInfoInMoveHistory,\r
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,146,126,10\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,146,151,10\r
     CONTROL         "Highlight with Arro&w",OPT_HighlightMoveArrow,\r
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,131,145,126,10\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,156,146,151,10\r
     CONTROL         "Displa&y Logos",OPT_AutoLogo,\r
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,160,126,10\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,160,151,10\r
 END\r
 \r
 DLG_IcsOptions DIALOGEX 0, 0, 302, 268\r
@@ -480,39 +480,39 @@ BEGIN
     DEFPUSHBUTTON   "OK",IDOK,194,250,50,15\r
     PUSHBUTTON      "Cancel",IDCANCEL,248,250,50,15\r
     CONTROL         "&Auto Comment",OPT_AutoComment,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,10,12,63,8\r
+                    WS_TABSTOP,10,12,73,8\r
     CONTROL         "&Auto Kibitz",OPT_AutoKibitz,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,84,12,63,8\r
+                    WS_TABSTOP,94,12,73,8\r
     CONTROL         "Auto &Observe",OPT_AutoObserve,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,10,25,63,8\r
+                    WS_TABSTOP,10,25,150,8\r
     CONTROL         "&Get Move List",OPT_GetMoveList,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,10,38,63,8\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,10,38,150,8\r
     CONTROL         "&Local Line Editing",OPT_LocalLineEditing,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,10,51,84,8\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,10,51,150,8\r
     CONTROL         "&Quiet Play",OPT_QuietPlay,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,10,64,63,8\r
+                    WS_TABSTOP,10,64,150,8\r
     CONTROL         "See&k Graph",OPT_SeekGraph,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,10,77,63,8\r
+                    WS_TABSTOP,10,77,73,8\r
     CONTROL         "auto-&Refresh",OPT_AutoRefresh,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,84,77,63,8\r
+                    WS_TABSTOP,94,77,73,8\r
     CONTROL         "Bckgnd Obser&ve",OPT_BgObserve,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,10,90,68,8\r
+                    WS_TABSTOP,10,90,73,8\r
     CONTROL         "&Dual Board",OPT_DualBoard,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,84,90,63,8\r
+                    WS_TABSTOP,94,90,73,8\r
     CONTROL         "&Premove",OPT_Premove,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,160,12,46,10\r
+                    WS_TABSTOP,180,12,117,10\r
     CONTROL         "&White first move",OPT_PremoveWhite,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,160,26,67,10\r
-    EDITTEXT        OPT_PremoveWhiteText,236,22,25,14,ES_AUTOHSCROLL\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,180,26,67,10\r
+    EDITTEXT        OPT_PremoveWhiteText,256,22,25,14,ES_AUTOHSCROLL\r
     CONTROL         "&Black first move",OPT_PremoveBlack,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,160,40,66,10\r
-    EDITTEXT        OPT_PremoveBlackText,236,38,25,14,ES_AUTOHSCROLL\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,180,40,66,10\r
+    EDITTEXT        OPT_PremoveBlackText,256,38,25,14,ES_AUTOHSCROLL\r
     CONTROL         "One-Click &Move",OPT_SmartMove,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,160,54,100,10\r
+                    WS_TABSTOP,180,54,117,10\r
     CONTROL         "&Sound alarm at",OPT_IcsAlarm,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,160,85,63,10\r
-    EDITTEXT        OPT_IcsAlarmTime,236,81,26,14,ES_AUTOHSCROLL\r
-    LTEXT           "seconds",IDC_Sec,264,85,28,8\r
+                    WS_TABSTOP,180,85,63,10\r
+    EDITTEXT        OPT_IcsAlarmTime,244,81,18,14,ES_AUTOHSCROLL\r
+    LTEXT           "seconds",IDC_Sec,264,85,33,8\r
     PUSHBUTTON      "Choose...",OPT_ChooseShoutColor,97,114,45,15\r
     PUSHBUTTON      "Choose...",OPT_ChooseSShoutColor,97,134,45,15\r
     PUSHBUTTON      "Choose...",OPT_ChooseChannel1Color,97,154,45,15\r
@@ -559,12 +559,12 @@ BEGIN
     LTEXT           "Startup &Chat Boxes:",IDC_Boxes,4,251,65,8\r
     EDITTEXT        OPT_StartupChatBoxes,72,249,90,14,ES_AUTOHSCROLL\r
     GROUPBOX        "Interaction Colors",GPB_Colors,4,103,294,140\r
-    GROUPBOX        "Premove",GPB_Premove,154,0,144,69\r
-    GROUPBOX        "General",GPB_General,4,0,146,101\r
-    GROUPBOX        "Alarm",GPB_Alarm,154,71,144,30\r
+    GROUPBOX        "Premove",GPB_Premove,174,0,124,69\r
+    GROUPBOX        "General",GPB_General,4,0,166,101\r
+    GROUPBOX        "Alarm",GPB_Alarm,174,71,124,30\r
 END\r
 \r
-DLG_BoardOptions DIALOG DISCARDABLE  0, 0, 194, 250\r
+DLG_BoardOptions DIALOG DISCARDABLE  0, 0, 224, 250\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Board Options"\r
 FONT 8, "MS Sans Serif"\r
@@ -574,39 +574,39 @@ BEGIN
     CONTROL         "&Tiny",OPT_SizeTiny,"Button",BS_AUTORADIOBUTTON | \r
                     WS_GROUP | WS_TABSTOP,9,14,50,10\r
     CONTROL         "T&eeny",OPT_SizeTeeny,"Button",BS_AUTORADIOBUTTON,9,24,\r
-                    50,10\r
+                    60,10\r
     CONTROL         "&Dinky",OPT_SizeDinky,"Button",BS_AUTORADIOBUTTON,9,34,\r
-                    50,10\r
+                    60,10\r
     CONTROL         "&Petite",OPT_SizePetite,"Button",BS_AUTORADIOBUTTON,9,\r
-                    44,50,10\r
-    CONTROL         "Sl&im",OPT_SizeSlim,"Button",BS_AUTORADIOBUTTON,9,54,50,\r
+                    44,60,10\r
+    CONTROL         "Sl&im",OPT_SizeSlim,"Button",BS_AUTORADIOBUTTON,9,54,60,\r
                     10\r
     CONTROL         "&Small",OPT_SizeSmall,"Button",BS_AUTORADIOBUTTON,9,64,\r
-                    50,10\r
+                    60,10\r
     CONTROL         "Medi&ocre",OPT_SizeMediocre,"Button",BS_AUTORADIOBUTTON,\r
-                    70,14,50,10\r
+                    80,14,60,10\r
     CONTROL         "&Middling",OPT_SizeMiddling,"Button",BS_AUTORADIOBUTTON,\r
-                    70,24,50,10\r
+                    80,24,60,10\r
     CONTROL         "&Average",OPT_SizeAverage,"Button",BS_AUTORADIOBUTTON,\r
-                    70,34,50,10\r
+                    80,34,60,10\r
     CONTROL         "Mode&rate",OPT_SizeModerate,"Button",BS_AUTORADIOBUTTON,\r
-                    70,44,50,10\r
-    CONTROL         "Medi&um",OPT_SizeMedium,"Button",BS_AUTORADIOBUTTON,70,\r
-                    54,50,10\r
-    CONTROL         "Bul&ky",OPT_SizeBulky,"Button",BS_AUTORADIOBUTTON,70,64,\r
-                    50,10\r
-    CONTROL         "&Large",OPT_SizeLarge,"Button",BS_AUTORADIOBUTTON,134,\r
-                    14,50,10\r
-    CONTROL         "&Big",OPT_SizeBig,"Button",BS_AUTORADIOBUTTON,134,24,50,\r
+                    80,44,60,10\r
+    CONTROL         "Medi&um",OPT_SizeMedium,"Button",BS_AUTORADIOBUTTON,80,\r
+                    54,60,10\r
+    CONTROL         "Bul&ky",OPT_SizeBulky,"Button",BS_AUTORADIOBUTTON,80,64,\r
+                    60,10\r
+    CONTROL         "&Large",OPT_SizeLarge,"Button",BS_AUTORADIOBUTTON,154,\r
+                    14,60,10\r
+    CONTROL         "&Big",OPT_SizeBig,"Button",BS_AUTORADIOBUTTON,154,24,60,\r
                     10\r
-    CONTROL         "&Huge",OPT_SizeHuge,"Button",BS_AUTORADIOBUTTON,134,34,\r
-                    50,10\r
-    CONTROL         "&Giant",OPT_SizeGiant,"Button",BS_AUTORADIOBUTTON,134,\r
-                    44,50,10\r
+    CONTROL         "&Huge",OPT_SizeHuge,"Button",BS_AUTORADIOBUTTON,154,34,\r
+                    60,10\r
+    CONTROL         "&Giant",OPT_SizeGiant,"Button",BS_AUTORADIOBUTTON,154,\r
+                    44,60,10\r
     CONTROL         "&Colossal",OPT_SizeColossal,"Button",BS_AUTORADIOBUTTON,\r
-                    134,54,50,10\r
+                    154,54,60,10\r
     CONTROL         "Tita&nic",OPT_SizeTitanic,"Button",BS_AUTORADIOBUTTON,\r
-                    134,64,50,10\r
+                    154,64,60,10\r
     PUSHBUTTON      "...",OPT_ChooseLightSquareColor,110,94,20,15\r
     PUSHBUTTON      "...",OPT_ChooseDarkSquareColor,110,112,20,15\r
     PUSHBUTTON      "...",OPT_ChooseWhitePieceColor,110,130,20,15\r
@@ -616,9 +616,9 @@ 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,53,10\r
+                    WS_TABSTOP,140,180,73,10\r
     CONTROL         "Flip Black",OPT_UpsideDown,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,140,192,53,10\r
+                    WS_TABSTOP,140,192,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 +630,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",IDC_STATIC,4,84,185,142\r
+    GROUPBOX        "Colors",GPB_Colors,4,84,215,142\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
@@ -639,81 +639,81 @@ BEGIN
     LTEXT           "Black Pieces",IDC_Black,10,152,60,10\r
     LTEXT           "Square Highlights",IDC_High,10,170,60,10\r
     LTEXT           "Premove Highlights",IDC_PreHigh,10,188,70,10\r
-    GROUPBOX        "Size",GPB_Size,4,4,185,75\r
+    GROUPBOX        "Size",GPB_Size,4,4,215,75\r
     EDITTEXT        OPT_SampleLightSquare,144,96,39,36,ES_READONLY | \r
                     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
 END\r
 \r
-DLG_NewVariant DIALOG DISCARDABLE  0, 0, 194, 250\r
+DLG_NewVariant DIALOG DISCARDABLE  0, 0, 224, 250\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Variants"\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
+    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,50,10\r
+                    WS_GROUP | WS_TABSTOP,9,14,70,10\r
     CONTROL         "&FRC",OPT_VariantFRC,"Button",BS_AUTORADIOBUTTON,9,\r
-                    24,50,10\r
+                    24,70,10\r
     CONTROL         "&wildcastle",OPT_VariantWildcastle,"Button",BS_AUTORADIOBUTTON,9,34,\r
                     50,10\r
     CONTROL         "&nocastle",OPT_VariantNocastle,"Button",BS_AUTORADIOBUTTON,9,\r
-                    44,50,10\r
+                    44,70,10\r
     CONTROL         "&losers",OPT_VariantLosers,"Button",BS_AUTORADIOBUTTON,\r
-                    9,54,50,10\r
+                    9,54,70,10\r
     CONTROL         "&giveaway",OPT_VariantGiveaway,"Button",BS_AUTORADIOBUTTON,\r
-                    9,64,50,10\r
+                    9,64,70,10\r
     CONTROL         "s&uicide",OPT_VariantSuicide,"Button",BS_AUTORADIOBUTTON,\r
-                    9,74,50,10\r
+                    9,74,70,10\r
     CONTROL         "&3Check",OPT_Variant3Check,"Button",BS_AUTORADIOBUTTON,9,84,\r
-                    50,10\r
+                    70,10\r
     CONTROL         "&twokings",OPT_VariantTwoKings,"Button",BS_AUTORADIOBUTTON,9,94,\r
-                    50,10\r
+                    70,10\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         "&bughouse",OPT_VariantBughouse,"Button",BS_AUTORADIOBUTTON,70,24,50,\r
+                    9,104,70,10\r
+    CONTROL         "cra&zyhouse",OPT_VariantCrazyhouse,"Button",BS_AUTORADIOBUTTON,80,14,\r
+                    70,10\r
+    CONTROL         "&bughouse",OPT_VariantBughouse,"Button",BS_AUTORADIOBUTTON,80,24,70,\r
                     10\r
-    CONTROL         "&Twilight",OPT_VariantTwilight,"Button",BS_AUTORADIOBUTTON,70,34,50,\r
+    CONTROL         "&Twilight",OPT_VariantTwilight,"Button",BS_AUTORADIOBUTTON,80,34,70,\r
                     10\r
-    CONTROL         "&shogi",OPT_VariantShogi,"Button",BS_AUTORADIOBUTTON,70,\r
-                    44,50,10\r
-    CONTROL         "su&per",OPT_VariantSuper,"Button",BS_AUTORADIOBUTTON,70,\r
-                    54,50,10\r
+    CONTROL         "&shogi",OPT_VariantShogi,"Button",BS_AUTORADIOBUTTON,80,\r
+                    44,70,10\r
+    CONTROL         "su&per",OPT_VariantSuper,"Button",BS_AUTORADIOBUTTON,80,\r
+                    54,70,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         "&makruk",OPT_VariantMakruk,"Button",BS_AUTORADIOBUTTON,70,\r
-                    104,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
-                    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
-    CONTROL         "Seira&wan",OPT_VariantSChess,"Button",BS_AUTORADIOBUTTON,134,94,50,\r
+                    80,64,70,10\r
+    CONTROL         "&Berolina",OPT_VariantBerolina,"Button",BS_AUTORADIOBUTTON,80,74,\r
+                    70,10\r
+    CONTROL         "c&ylinder",OPT_VariantCylinder,"Button",BS_AUTORADIOBUTTON,80,\r
+                    84,70,10\r
+    CONTROL         "&fairy",OPT_VariantFairy,"Button",BS_AUTORADIOBUTTON,80,\r
+                    94,70,10\r
+    CONTROL         "&makruk",OPT_VariantMakruk,"Button",BS_AUTORADIOBUTTON,80,\r
+                    104,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
+                    24,70,10\r
+    CONTROL         "&Janus",OPT_VariantJanus,"Button",BS_AUTORADIOBUTTON,154,34,\r
+                    70,10\r
+    CONTROL         "&CRC",OPT_VariantCRC,"Button",BS_AUTORADIOBUTTON,154,44,\r
+                    70,10\r
+    CONTROL         "&Falcon",OPT_VariantFalcon,"Button",BS_AUTORADIOBUTTON,154,\r
+                    54,70,10\r
+    CONTROL         "cou&rier",OPT_VariantCourier,"Button",BS_AUTORADIOBUTTON,154,64,\r
+                    70,10\r
+    CONTROL         "&Great",OPT_VariantGreat,"Button",BS_AUTORADIOBUTTON,154,74,\r
+                    70,10\r
+    CONTROL         "&Shatranj",OPT_VariantShatranj,"Button",BS_AUTORADIOBUTTON,154,\r
+                    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,134,104,50,\r
+    CONTROL         "&xiangqi",OPT_VariantXiangqi,"Button",BS_AUTORADIOBUTTON,154,104,70,\r
                     10\r
-    GROUPBOX        "Variant",GPB_Variant,4,4,185,115\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
@@ -722,7 +722,7 @@ BEGIN
     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,150,8\r
+    LTEXT           "('-1' means defaults for selected variant)",IDC_Def,10,171,210,8\r
 END\r
 \r
 DLG_Fonts DIALOG DISCARDABLE  0, 0, 266, 226\r
@@ -741,29 +741,29 @@ BEGIN
     PUSHBUTTON      "Choose...",OPT_ChooseMoveHistoryFont,212,174,45,15\r
     PUSHBUTTON      "&Defaults",OPT_DefaultFonts,3,208,50,15\r
     CONTROL         "",OPT_SampleCoordFont,"RICHEDIT",ES_READONLY | \r
-                    WS_DISABLED | WS_BORDER,67,59,140,20\r
+                    WS_DISABLED | WS_BORDER,77,59,130,20\r
     CONTROL         "",OPT_SampleTagFont,"RICHEDIT",ES_READONLY | \r
-                    WS_DISABLED | WS_BORDER,67,97,140,20\r
+                    WS_DISABLED | WS_BORDER,77,97,130,20\r
     CONTROL         "",OPT_SampleCommentsFont,"RICHEDIT",ES_READONLY | \r
-                    WS_DISABLED | WS_BORDER,67,121,140,20\r
+                    WS_DISABLED | WS_BORDER,77,121,130,20\r
     CONTROL         "",OPT_SampleConsoleFont,"RICHEDIT",ES_READONLY | \r
-                    WS_DISABLED | WS_BORDER,67,145,140,20\r
-    LTEXT           "Clocks",OPT_ClockFont,13,16,45,10,NOT WS_GROUP\r
-    LTEXT           "Messages",OPT_MessageFont,13,40,45,10,NOT WS_GROUP\r
-    LTEXT           "Coordinates",OPT_CoordFont,13,64,45,10,NOT WS_GROUP\r
-    LTEXT           "Tags",OPT_EditTagsFont,13,102,45,10,NOT WS_GROUP\r
-    LTEXT           "Comments",OPT_CommentsFont,13,126,45,10,NOT WS_GROUP\r
-    LTEXT           "I C S Interaction",OPT_MessageFont5,13,150,50,10,NOT \r
+                    WS_DISABLED | WS_BORDER,77,145,130,20\r
+    LTEXT           "Clocks",OPT_ClockFont,13,16,63,10,NOT WS_GROUP\r
+    LTEXT           "Messages",OPT_MessageFont,13,40,63,10,NOT WS_GROUP\r
+    LTEXT           "Coordinates",OPT_CoordFont,13,64,63,10,NOT WS_GROUP\r
+    LTEXT           "Tags",OPT_EditTagsFont,13,102,63,10,NOT WS_GROUP\r
+    LTEXT           "Comments",OPT_CommentsFont,13,126,63,10,NOT WS_GROUP\r
+    LTEXT           "I C S Interaction",OPT_MessageFont5,13,150,63,10,NOT \r
                     WS_GROUP\r
     CONTROL         "",OPT_SampleClockFont,"RICHEDIT",ES_READONLY | \r
-                    WS_DISABLED | WS_BORDER,67,11,140,20\r
+                    WS_DISABLED | WS_BORDER,77,11,130,20\r
     CONTROL         "",OPT_SampleMessageFont,"RICHEDIT",ES_READONLY | \r
-                    WS_DISABLED | WS_BORDER,67,35,140,20\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
     CONTROL         "",OPT_SampleMoveHistoryFont,"RICHEDIT",ES_READONLY | \r
-                    WS_DISABLED | WS_BORDER,67,170,140,20\r
-    LTEXT           "Move History, Engine Output",OPT_MessageFont6,13,171,50,20,NOT \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
 END\r
 \r
@@ -779,21 +779,21 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,122,28,50,14\r
 END\r
 \r
-DLG_GameListOptions DIALOG DISCARDABLE  0, 0, 206, 150\r
+DLG_GameListOptions DIALOG DISCARDABLE  0, 0, 218, 150\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Game List Options"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    LTEXT           "PGN &Tags:",IDC_GLT,2,2,36,8\r
-    LISTBOX         IDC_GameListTags,2,12,158,112,LBS_USETABSTOPS | \r
+    LTEXT           "PGN &Tags:",IDC_GLT,2,2,158,8\r
+    LISTBOX         IDC_GameListTags,2,12,153,112,LBS_USETABSTOPS | \r
                     LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
-    PUSHBUTTON      "&Up",IDC_GLT_Up,164,12,38,14\r
-    PUSHBUTTON      "&Down",IDC_GLT_Down,164,30,38,14\r
-    PUSHBUTTON      "Default",IDC_GLT_Restore,164,92,38,14\r
-    PUSHBUTTON      "Factory",IDC_GLT_Default,164,110,38,14\r
-    DEFPUSHBUTTON   "OK",IDOK,96,132,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,152,132,50,14\r
-    LTEXT           "Restore to:",IDC_GLT_RestoreTo,164,80,36,8\r
+    PUSHBUTTON      "&Up",IDC_GLT_Up,164,12,50,14\r
+    PUSHBUTTON      "&Down",IDC_GLT_Down,164,30,50,14\r
+    PUSHBUTTON      "Default",IDC_GLT_Restore,164,92,50,14\r
+    PUSHBUTTON      "Factory",IDC_GLT_Default,164,110,50,14\r
+    DEFPUSHBUTTON   "OK",IDOK,108,132,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,164,132,50,14\r
+    LTEXT           "Restore to:",IDC_GLT_RestoreTo,159,80,58,8\r
 END\r
 \r
 DLG_MoveHistory DIALOGEX 0, 0, 225, 130\r
@@ -859,89 +859,89 @@ BEGIN
                     WS_BORDER | WS_TABSTOP,3,90,284,13\r
 END\r
 \r
-DLG_EnginePlayOptions DIALOG DISCARDABLE  0, 0, 208, 202\r
+DLG_EnginePlayOptions DIALOG DISCARDABLE  0, 0, 248, 202\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Adjudications"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
     CONTROL         "Ponder Next Move",IDC_EpPonder,"Button",BS_AUTOCHECKBOX |\r
-                    WS_TABSTOP,4,4,75,10\r
+                    WS_TABSTOP,4,4,240,10\r
     CONTROL         "Enable and Show Thinking (recommended)",\r
                     IDC_EpShowThinking,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,\r
-                    4,16,152,10\r
+                    4,16,240,10\r
     CONTROL         "Hide Thinking when Playing against Human",\r
                     IDC_EpHideThinkingHuman,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,4,28,153,10\r
+                    WS_TABSTOP,4,28,240,10\r
     CONTROL         "Periodic Updates (for Analysis Mode)",\r
                     IDC_EpPeriodicUpdates,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,4,40,131,10\r
-    GROUPBOX        "Adjudications in non-ICS games",GPB_Adjudications,4,56,200,98\r
-    LTEXT           "Adjudicate draw after:",IDC_Draw,10,72,70,8\r
-    EDITTEXT        IDC_EpDrawMoveCount,116,68,40,14,ES_AUTOHSCROLL\r
-    LTEXT           "moves",IDC_Moves,158,72,22,8\r
-    LTEXT           "Win/loss adjudication threshold:",IDC_Threshold,10,90,102,\r
+                    WS_TABSTOP,4,40,240,10\r
+    GROUPBOX        "Adjudications in non-ICS games",GPB_Adjudications,4,56,240,98\r
+    LTEXT           "Adjudicate draw after:",IDC_Draw,10,72,124,8\r
+    EDITTEXT        IDC_EpDrawMoveCount,136,68,40,14,ES_AUTOHSCROLL\r
+    LTEXT           "moves",IDC_Moves,178,72,22,8\r
+    LTEXT           "Win/loss adjudication threshold:",IDC_Threshold,10,90,124,\r
                     8\r
-    EDITTEXT        IDC_EpAdjudicationThreshold,116,86,40,14,ES_AUTOHSCROLL\r
-    LTEXT           "centipawns",IDC_Centi,158,90,37,8\r
+    EDITTEXT        IDC_EpAdjudicationThreshold,136,86,40,14,ES_AUTOHSCROLL\r
+    LTEXT           "centipawns",IDC_Centi,178,90,65,8\r
     CONTROL         "&Verify Engine Claims",IDC_TestClaims,"Button",BS_AUTOCHECKBOX |\r
-                    WS_TABSTOP,10,108,100,10\r
+                    WS_TABSTOP,10,108,119,10\r
     CONTROL         "Detect &Mates",\r
                     IDC_DetectMates,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,\r
-                    10,118,100,10\r
+                    10,118,119,10\r
     CONTROL         "Draw if &Insufficient Material",\r
                     IDC_MaterialDraws,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,10,128,100,10\r
+                    WS_TABSTOP,10,128,119,10\r
     CONTROL         "Adjudicate &Trivial Draws",\r
                     IDC_TrivialDraws,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,10,138,100,10\r
-    GROUPBOX        "Apply",GPB_Apply,115,102,81,47\r
-    EDITTEXT        IDC_RuleMoves,120,113,20,14,ES_AUTOHSCROLL\r
-    LTEXT           "-move rule",IDC_Rule,142,117,35,8\r
-    EDITTEXT        IDC_DrawRepeats,120,130,20,14,ES_AUTOHSCROLL\r
-    LTEXT           "-fold repeats",IDC_Repeats,142,134,50,8\r
+                    WS_TABSTOP,10,138,119,10\r
+    GROUPBOX        "Apply",GPB_Apply,130,102,106,47\r
+    EDITTEXT        IDC_RuleMoves,135,113,20,14,ES_AUTOHSCROLL\r
+    LTEXT           "-move rule",IDC_Rule,157,117,75,8\r
+    EDITTEXT        IDC_DrawRepeats,135,130,20,14,ES_AUTOHSCROLL\r
+    LTEXT           "-fold repeats",IDC_Repeats,157,134,75,8\r
     CONTROL         "Engine #1 Score is Absolute",\r
                     IDC_ScoreAbs1,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,10,156,120,10\r
+                    WS_TABSTOP,10,156,140,10\r
     CONTROL         "Engine #2 Score is Absolute",\r
                     IDC_ScoreAbs2,"Button",BS_AUTOCHECKBOX | \r
-                    WS_TABSTOP,10,168,120,10\r
-    DEFPUSHBUTTON   "OK",IDOK,98,185,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,154,185,50,14\r
+                    WS_TABSTOP,10,168,140,10\r
+    DEFPUSHBUTTON   "OK",IDOK,138,185,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,194,185,50,14\r
 END\r
 \r
-DLG_OptionsUCI DIALOG DISCARDABLE  0, 0, 228, 160\r
+DLG_OptionsUCI DIALOG DISCARDABLE  0, 0, 248, 160\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "Common Engine Settings"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    LTEXT           "Polyglot Directory:",IDC_PolyDir,2,8,58,8\r
-    EDITTEXT        IDC_PolyglotDir,62,4,140,14,ES_AUTOHSCROLL\r
-    PUSHBUTTON      "...",IDC_BrowseForPolyglotDir,206,4,17,14\r
-    LTEXT           "Hash Size (MB):",IDC_Hash,2,26,52,8\r
-    EDITTEXT        IDC_HashSize,62,22,40,14,ES_AUTOHSCROLL\r
-    LTEXT           "EGTB Path:",IDC_Path,2,44,39,8\r
-    EDITTEXT        IDC_PathToEGTB,62,40,140,14,ES_AUTOHSCROLL\r
-    PUSHBUTTON      "...",IDC_BrowseForEGTB,206,40,17,14\r
-    LTEXT           "EGTB Size (MB):",IDC_Cache,2,62,54,8\r
-    EDITTEXT        IDC_SizeOfEGTB,62,58,40,14,ES_AUTOHSCROLL\r
+    LTEXT           "Polyglot Directory:",IDC_PolyDir,2,8,78,8\r
+    EDITTEXT        IDC_PolyglotDir,82,4,140,14,ES_AUTOHSCROLL\r
+    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           "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
-    EDITTEXT        IDC_BookFile,62,76,140,14,ES_AUTOHSCROLL\r
-    PUSHBUTTON      "...",IDC_BrowseForBook,206,76,17,14\r
-    LTEXT           "Max nr of CPUs:",IDC_CPU,106,26,52,8\r
-    EDITTEXT        IDC_Cores,162,22,40,14,ES_AUTOHSCROLL\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
                     WS_TABSTOP,2,107,100,10\r
-    LTEXT           "Book Depth:",IDC_Depth,106,98,52,8\r
-    EDITTEXT        IDC_BookDep,162,94,40,14,ES_AUTOHSCROLL\r
-    LTEXT           "Book Variation:",IDC_Variation,106,116,52,8\r
-    EDITTEXT        IDC_BookStr,162,112,40,14,ES_AUTOHSCROLL\r
+    LTEXT           "Book Depth:",IDC_Depth,126,98,60,8\r
+    EDITTEXT        IDC_BookDep,187,94,35,14,ES_AUTOHSCROLL\r
+    LTEXT           "Book Variation:",IDC_Variation,126,116,60,8\r
+    EDITTEXT        IDC_BookStr,187,112,35,14,ES_AUTOHSCROLL\r
     LTEXT           "Default Match Games:",IDC_DefGames,2,135,72,8\r
-    EDITTEXT        IDC_Games,76,131,28,14,ES_AUTOHSCROLL\r
-    DEFPUSHBUTTON   "OK",IDOK,118,142,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,174,142,50,14\r
+    EDITTEXT        IDC_Games,82,131,28,14,ES_AUTOHSCROLL\r
+    DEFPUSHBUTTON   "OK",IDOK,128,142,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,194,142,50,14\r
 END\r
 \r
 DLG_Null DIALOG DISCARDABLE  0, 0, 186, 50\r