X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.rc;h=5e1c209732b731ac40e167069b235d6f8e1a04a1;hb=d0da14dee09f66a509dac5467e9f1af2cfc8f969;hp=be39e9477ae0bab1dc58cdaff26c1002ea733bcb;hpb=c992f0773fac06d94e6df6d4ba6059fe731a62c1;p=xboard.git

diff --git a/winboard/winboard.rc b/winboard/winboard.rc
index be39e94..5e1c209 100644
--- a/winboard/winboard.rc
+++ b/winboard/winboard.rc
@@ -81,11 +81,11 @@ BEGIN
                     WS_GROUP
     EDITTEXT        OPT_TCFixed,147,140,32,12,ES_AUTOHSCROLL
     LTEXT           "",OPT_TCitext3,185,148,67,8,NOT WS_GROUP
-    LTEXT           "Time-Odds Factors:",GPB_Factors,6,158,150,8,NOT WS_GROUP
-    EDITTEXT        OPT_TCOdds1,57,171,32,12,ES_AUTOHSCROLL | WS_GROUP
-    LTEXT           "Engine #1:",IDC_Factor1,6,173,50,8,NOT WS_GROUP
-    EDITTEXT        OPT_TCOdds2,147,171,32,12,ES_AUTOHSCROLL
-    LTEXT           "Engine #2:",IDC_Factor2,96,173,50,8,NOT WS_GROUP
+    LTEXT           "Time-Odds Factors:",GPB_Factors,6,158,150,8,NOT WS_GROUP | WS_TABSTOP
+    LTEXT           "Engine #1:",IDC_Factor1,6,173,40,8,NOT WS_GROUP
+    EDITTEXT        OPT_TCOdds1,47,171,32,12,ES_AUTOHSCROLL | WS_GROUP
+    LTEXT           "Engine #2:",IDC_Factor2,86,173,40,8,NOT WS_GROUP
+    EDITTEXT        OPT_TCOdds2,127,171,32,12,ES_AUTOHSCROLL
     PUSHBUTTON      "OK",IDOK,139,190,40,14,WS_GROUP
     PUSHBUTTON      "Cancel",IDCANCEL,195,190,40,14
 END
@@ -411,10 +411,10 @@ BEGIN
                     CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_GROUP
     EDITTEXT        OPT_WavFileName,96,65,103,12,ES_AUTOHSCROLL
     PUSHBUTTON      "B&rowse...",OPT_BrowseSound,208,64,50,14
+    PUSHBUTTON      "&Play",OPT_PlaySound,208,47,50,14
     PUSHBUTTON      "Defaults",OPT_DefaultSounds,6,86,50,14
     DEFPUSHBUTTON   "OK",IDOK,152,86,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,208,86,50,14
-    PUSHBUTTON      "&Play",OPT_PlaySound,208,47,50,14
 END
 
 DLG_GeneralOptions DIALOG DISCARDABLE  0, 0, 300, 197
@@ -422,8 +422,6 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "General Options"
 FONT 8, "MS Sans Serif"
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,180,178,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,236,178,50,14
     CONTROL         "Always on &Top",OPT_AlwaysOnTop,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,4,6,151,10
     CONTROL         "Highlight Last &Move",OPT_HighlightLastMove,"Button",
@@ -470,6 +468,10 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,156,146,151,10
     CONTROL         "Displa&y Logos",OPT_AutoLogo,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,160,151,10
+    CONTROL         "One-Click Move",OPT_SmartMove,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,156,160,151,10
+    DEFPUSHBUTTON   "OK",IDOK,180,178,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,236,178,50,14
 END
 
 DLG_IcsOptions DIALOGEX 0, 0, 302, 268
@@ -569,10 +571,8 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Board Options"
 FONT 8, "MS Sans Serif"
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,84,232,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,140,232,50,14
     CONTROL         "&Tiny",OPT_SizeTiny,"Button",BS_AUTORADIOBUTTON | 
-                    WS_GROUP | WS_TABSTOP,9,14,50,10
+                    WS_GROUP,9,14,50,10
     CONTROL         "T&eeny",OPT_SizeTeeny,"Button",BS_AUTORADIOBUTTON,9,24,
                     60,10
     CONTROL         "&Dinky",OPT_SizeDinky,"Button",BS_AUTORADIOBUTTON,9,34,
@@ -644,6 +644,8 @@ BEGIN
                     WS_DISABLED | NOT WS_BORDER | NOT WS_TABSTOP
     EDITTEXT        OPT_SampleDarkSquare,144,138,39,36,ES_READONLY | 
                     WS_DISABLED | NOT WS_BORDER | NOT WS_TABSTOP
+    DEFPUSHBUTTON   "OK",IDOK,84,232,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,140,232,50,14
 END
 
 DLG_NewVariant DIALOG DISCARDABLE  0, 0, 224, 250
@@ -651,10 +653,8 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Variants"
 FONT 8, "MS Sans Serif"
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,114,232,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,170,232,50,14
     CONTROL         "&normal",OPT_VariantNormal,"Button",BS_AUTORADIOBUTTON | 
-                    WS_GROUP | WS_TABSTOP,9,14,70,10
+                    WS_GROUP,9,14,70,10
     CONTROL         "&FRC",OPT_VariantFRC,"Button",BS_AUTORADIOBUTTON,9,
                     24,70,10
     CONTROL         "&wildcastle",OPT_VariantWildcastle,"Button",BS_AUTORADIOBUTTON,9,34,
@@ -714,15 +714,17 @@ BEGIN
     CONTROL         "&xiangqi",OPT_VariantXiangqi,"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           "Board size:",GPB_Board,10,135,40,8,WS_TABSTOP
     LTEXT           "ranks",IDC_Height,77,135,22,8
-    EDITTEXT        IDC_Files,116,131,14,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_Ranks,60,131,14,14,ES_AUTOHSCROLL
     LTEXT           "files",IDC_Width,133,135,37,8
+    EDITTEXT        IDC_Files,116,131,14,14,ES_AUTOHSCROLL
     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
+    DEFPUSHBUTTON   "OK",IDOK,114,232,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,170,232,50,14
 END
 
 DLG_Fonts DIALOG DISCARDABLE  0, 0, 266, 226
@@ -1134,7 +1136,7 @@ BEGIN
         MENUITEM "E&dit Position\tCtrl+Shift+E",IDM_EditPosition2
         MENUITEM SEPARATOR
         MENUITEM "Edit Ta&gs...",               IDM_EditTags
-        MENUITEM "Edit &Comment...",            IDM_EditComment
+        MENUITEM "Edit Co&mment...",            IDM_EditComment
         MENUITEM "Enter &Username...",          IDM_TypeInName
         MENUITEM SEPARATOR
         MENUITEM "&Revert\tHome",               IDM_Revert