Reorganize order of WB New Variant dialog controls

[xboard.git] / winboard / winboard.rc

diff --git a/winboard/winboard.rc b/winboard/winboard.rc
index 2a3af69..5e1c209 100644 (file)
--- a/winboard/winboard.rc
+++ b/winboard/winboard.rc
@@ -81,11 +81,11 @@ 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,40,8,NOT WS_GROUP\r
+    EDITTEXT        OPT_TCOdds1,47,171,32,12,ES_AUTOHSCROLL | WS_GROUP\r
+    LTEXT           "Engine #2:",IDC_Factor2,86,173,40,8,NOT WS_GROUP\r
+    EDITTEXT        OPT_TCOdds2,127,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
@@ -411,10 +411,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
@@ -572,7 +572,7 @@ CAPTION "Board Options"
 FONT 8, "MS Sans Serif"\r
 BEGIN\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
@@ -654,7 +654,7 @@ CAPTION "Variants"
 FONT 8, "MS Sans Serif"\r
 BEGIN\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
@@ -714,11 +714,11 @@ BEGIN
     CONTROL         "&xiangqi",OPT_VariantXiangqi,"Button",BS_AUTORADIOBUTTON,154,104,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           "Board size:",GPB_Board,10,135,40,8,WS_TABSTOP\r
     LTEXT           "ranks",IDC_Height,77,135,22,8\r
-    EDITTEXT        IDC_Files,116,131,14,14,ES_AUTOHSCROLL\r
+    EDITTEXT        IDC_Ranks,60,131,14,14,ES_AUTOHSCROLL\r
     LTEXT           "files",IDC_Width,133,135,37,8\r
+    EDITTEXT        IDC_Files,116,131,14,14,ES_AUTOHSCROLL\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