cleaned up an old #ifdef in zippy

[xboard.git] / winboard / winboard.rc

diff --git a/winboard/winboard.rc b/winboard/winboard.rc
index bb0927d..08c7b91 100644 (file)
--- a/winboard/winboard.rc
+++ b/winboard/winboard.rc
@@ -393,25 +393,26 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Sounds"\r
 FONT 8, "MS Sans Serif"\r
 BEGIN\r
-    DEFPUSHBUTTON   "OK",IDOK,132,86,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,188,86,50,14\r
-    LTEXT           "Event:",IDC_STATIC,4,7,26,9\r
+    LTEXT           "&Event:",IDC_STATIC,4,7,26,9\r
     COMBOBOX        CBO_Sounds,30,4,208,110,CBS_DROPDOWNLIST | WS_VSCROLL | \r
                     WS_TABSTOP\r
-    CONTROL         "No sound",OPT_NoSound,"Button",BS_AUTORADIOBUTTON | \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
+    CONTROL         "&Default beep",OPT_DefaultBeep,"Button",\r
                     BS_AUTORADIOBUTTON | WS_TABSTOP,12,36,57,10\r
-    CONTROL         "Built-in sound:",OPT_BuiltInSound,"Button",\r
+    CONTROL         "&Built-in sound:",OPT_BuiltInSound,"Button",\r
                     BS_AUTORADIOBUTTON | WS_TABSTOP,12,51,60,10\r
-    COMBOBOX        OPT_BuiltInSoundName,76,48,103,109,CBS_DROPDOWNLIST | \r
-                    CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
-    PUSHBUTTON      "Play",OPT_PlaySound,188,47,50,14\r
-    CONTROL         "WAV file:",OPT_WavFile,"Button",BS_AUTORADIOBUTTON | \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
+                    CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_GROUP\r
     EDITTEXT        OPT_WavFileName,76,65,103,12,ES_AUTOHSCROLL\r
-    PUSHBUTTON      "Browse...",OPT_BrowseSound,188,64,50,14\r
+    PUSHBUTTON      "B&rowse...",OPT_BrowseSound,188,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
 END\r
 \r
 DLG_GeneralOptions DIALOG DISCARDABLE  0, 0, 250, 183\r
@@ -756,21 +757,21 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,122,28,50,14\r
 END\r
 \r
-DLG_GameListOptions DIALOG DISCARDABLE  0, 0, 206, 140\r
+DLG_GameListOptions DIALOG DISCARDABLE  0, 0, 206, 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,102,LBS_USETABSTOPS | \r
+    LISTBOX         IDC_GameListTags,2,12,158,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,82,38,14\r
-    PUSHBUTTON      "Factory",IDC_GLT_Default,164,100,38,14\r
-    DEFPUSHBUTTON   "OK",IDOK,96,122,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,152,122,50,14\r
-    LTEXT           "Restore to:",IDC_GLT_RestoreTo,164,70,36,8\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
 END\r
 \r
 DLG_MoveHistory DIALOGEX 0, 0, 225, 130\r
@@ -1157,6 +1158,7 @@ BEGIN
     BEGIN\r
         MENUITEM "Flip &View\tF2",              IDM_FlipView\r
         MENUITEM "Swap &Clocks",                IDM_FlipClock\r
+        MENUITEM "&Mute all Sounds",            IDM_MuteSounds\r
         MENUITEM SEPARATOR\r
         MENUITEM "&General...",                 IDM_GeneralOptions\r
         MENUITEM "&Board...",                   IDM_BoardOptions\r
@@ -1423,6 +1425,12 @@ BEGIN
     VK_NEXT,        IDM_LoadNextPosition,   VIRTKEY, SHIFT, NOINVERT\r
     VK_PRIOR,       IDM_LoadPrevGame,       VIRTKEY, NOINVERT\r
     VK_PRIOR,       IDM_LoadPrevPosition,   VIRTKEY, SHIFT, NOINVERT\r
+#ifndef JAWS\r
+    VK_LEFT,        IDM_Backward,           VIRTKEY, NOINVERT\r
+    VK_RIGHT,       IDM_Forward,            VIRTKEY, NOINVERT\r
+    VK_DOWN,        IDM_ToEnd,              VIRTKEY, NOINVERT\r
+    VK_UP,          IDM_ToStart,            VIRTKEY, NOINVERT\r
+#endif\r
 END\r
 \r
 NO_ICS ACCELERATORS DISCARDABLE \r
@@ -2089,8 +2097,8 @@ WIN                     WAVE    DISCARDABLE     "sounds/win.wav"
 // Version\r
 //\r
 1 VERSIONINFO\r
-FILEVERSION 4,4,0,0\r
-PRODUCTVERSION 4,4,0,0\r
+FILEVERSION PACKAGE_FILEVERSION\r
+PRODUCTVERSION PACKAGE_FILEVERSION\r
 FILETYPE VFT_APP\r
 {\r
   BLOCK "StringFileInfo"\r