X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.rc;h=3097934c2fa318a9ad4561d23ff8e0928e039582;hb=9141872e84a1ce7db0c62539d23c6a3f105dd8f8;hp=e1a03b47c97bbc28c06b96b2f9358c0222d965d5;hpb=ba4dd4bb37eb309ad38763eea87b37323cf071f2;p=xboard.git

diff --git a/winboard/winboard.rc b/winboard/winboard.rc
index e1a03b4..3097934 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
@@ -714,11 +714,11 @@ 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
@@ -822,16 +822,16 @@ EXSTYLE WS_EX_TOOLWINDOW
 CAPTION "Engine output"
 FONT 8, "MS Sans Serif"
 BEGIN
-    LTEXT           "Engine #1",IDC_EngineLabel1,14,2,84,8
     RTEXT           "NPS",IDC_Engine1_NPS,206,2,57,8
+    LTEXT           "Engine #1",IDC_EngineLabel1,14,2,84,8
     CONTROL         "",IDC_EngineMemo1,"RICHEDIT",ES_MULTILINE | 
                     ES_AUTOVSCROLL | ES_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | 
                     WS_HSCROLL | WS_TABSTOP,0,10,262,72
     LTEXT           "Engine #2",IDC_EngineLabel2,15,84,103,8
-    RTEXT           "NPS",IDC_Engine2_NPS,210,84,55,8
     CONTROL         "",IDC_EngineMemo2,"RICHEDIT",ES_MULTILINE | 
                     ES_AUTOVSCROLL | ES_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | 
                     WS_HSCROLL | WS_TABSTOP,2,92,262,74
+    RTEXT           "NPS",IDC_Engine2_NPS,210,84,55,8
     ICON            IDI_UNKNOWN_14,IDC_Color1,2,4,20,20,SS_REALSIZEIMAGE
     ICON            IDI_UNKNOWN_14,IDC_Color2,4,84,20,20
     LTEXT           "Static",IDC_StateData1,120,2,83,8
@@ -921,6 +921,8 @@ BEGIN
     PUSHBUTTON      "...",IDC_BrowseForPolyglotDir,226,4,17,14
     LTEXT           "Hash Size (MB):",IDC_Hash,2,26,78,8
     EDITTEXT        IDC_HashSize,82,22,40,14,ES_AUTOHSCROLL
+    LTEXT           "Max nr of CPUs:",IDC_CPU,126,26,60,8
+    EDITTEXT        IDC_Cores,187,22,35,14,ES_AUTOHSCROLL
     LTEXT           "EGTB Path:",IDC_Path,2,44,78,8
     EDITTEXT        IDC_PathToEGTB,82,40,140,14,ES_AUTOHSCROLL
     PUSHBUTTON      "...",IDC_BrowseForEGTB,226,40,17,14
@@ -930,8 +932,6 @@ BEGIN
                     WS_TABSTOP,2,80,49,10
     EDITTEXT        IDC_BookFile,82,76,140,14,ES_AUTOHSCROLL
     PUSHBUTTON      "...",IDC_BrowseForBook,226,76,17,14
-    LTEXT           "Max nr of CPUs:",IDC_CPU,126,26,60,8
-    EDITTEXT        IDC_Cores,187,22,35,14,ES_AUTOHSCROLL
     CONTROL         "First has Own Book",IDC_OwnBook1,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,2,94,100,10
     CONTROL         "Second has Own Book",IDC_OwnBook2,"Button",BS_AUTOCHECKBOX | 
@@ -1474,14 +1474,14 @@ END
 NO_ALT ACCELERATORS MOVEABLE PURE 
 BEGIN
     VK_DELETE,      IDM_RetractMove,        VIRTKEY, NOINVERT
+    VK_INSERT,      IDM_MoveNow,            VIRTKEY, NOINVERT
+#ifndef JAWS
     VK_END,         IDM_TruncateGame,       VIRTKEY, NOINVERT
     VK_HOME,        IDM_Revert,             VIRTKEY, NOINVERT
-    VK_INSERT,      IDM_MoveNow,            VIRTKEY, NOINVERT
     VK_NEXT,        IDM_LoadNextGame,       VIRTKEY, NOINVERT
     VK_NEXT,        IDM_LoadNextPosition,   VIRTKEY, SHIFT, NOINVERT
     VK_PRIOR,       IDM_LoadPrevGame,       VIRTKEY, NOINVERT
     VK_PRIOR,       IDM_LoadPrevPosition,   VIRTKEY, SHIFT, NOINVERT
-#ifndef JAWS
     VK_LEFT,        IDM_Backward,           VIRTKEY, NOINVERT
     VK_RIGHT,       IDM_Forward,            VIRTKEY, NOINVERT
     VK_DOWN,        IDM_ToEnd,              VIRTKEY, NOINVERT