X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.rc;h=ca8624f8098baf307f846f4c5ab83e2081d0ef72;hb=582aeb45129ac85b911614bee1b9cdf8ff0636b5;hp=bb8cd3f1d71171418436423577399e4496e9c155;hpb=686be7b1d12f8c2b3ad58430c1c79093a7652065;p=xboard.git

diff --git a/winboard/winboard.rc b/winboard/winboard.rc
index bb8cd3f..ca8624f 100644
--- a/winboard/winboard.rc
+++ b/winboard/winboard.rc
@@ -212,8 +212,6 @@ BEGIN
     PUSHBUTTON      "K&night",PB_Knight,139,23,40,14,NOT WS_TABSTOP
     PUSHBUTTON      "&King",PB_King,4,4,40,14,NOT WS_TABSTOP
     PUSHBUTTON      "&Cancel",IDCANCEL,139,4,40,14,WS_GROUP
-    LTEXT           "      YES",IDC_Yes,6,25,36,10
-    LTEXT           "       NO",IDC_No,141,25,36,10
     LTEXT           "C&entaur",IDC_Centaur,12,6,25,10
 END
 
@@ -712,7 +710,9 @@ BEGIN
                     50,10
     CONTROL         "&Shatranj",OPT_VariantShatranj,"Button",BS_AUTORADIOBUTTON,134,
                     84,50,10
-    CONTROL         "&xiangqi",OPT_VariantXiangqi,"Button",BS_AUTORADIOBUTTON,134,94,50,
+    CONTROL         "Seira&wan",OPT_VariantSChess,"Button",BS_AUTORADIOBUTTON,134,94,50,
+                    10
+    CONTROL         "&xiangqi",OPT_VariantXiangqi,"Button",BS_AUTORADIOBUTTON,134,104,50,
                     10
     GROUPBOX        "Variant",GPB_Variant,4,4,185,115
     LTEXT           "Board size:",GPB_Board,10,135,40,8
@@ -1099,59 +1099,87 @@ WINBOARD MENU DISCARDABLE
 BEGIN
     POPUP "&File"
     BEGIN
-        MENUITEM "New &Game\tCtrl-N",           IDM_NewGame
-        MENUITEM "New Shuffle Game...",         IDM_NewGameFRC
-        MENUITEM "New Variant...\tAlt+Shift+V",  IDM_NewVariant
+        MENUITEM "&New Game\tCtrl-N",           IDM_NewGame
+        MENUITEM "New Sh&uffle Game...",        IDM_NewGameFRC
+        MENUITEM "New &Variant...\tAlt+Shift+V",IDM_NewVariant
         MENUITEM SEPARATOR
         MENUITEM "&Load Game...\tCtrl-O",       IDM_LoadGame
-        MENUITEM "Load &Next Game\tAlt+PgDn",   IDM_LoadNextGame
-        MENUITEM "Load &Previous Game\tAlt+PgUp", IDM_LoadPrevGame
-        MENUITEM "&Reload Same Game",           IDM_ReloadGame
+        MENUITEM "L&oad Position...\tCtrl+Shift+O", IDM_LoadPosition
+//        MENUITEM "Load &Next Game\tAlt+PgDn",   IDM_LoadNextGame
+//        MENUITEM "Load &Previous Game\tAlt+PgUp", IDM_LoadPrevGame
+//        MENUITEM "&Reload Same Game",           IDM_ReloadGame
+//        MENUITEM "Load N&ext Position\tAlt+Shift+PgDn", IDM_LoadNextPosition
+//        MENUITEM "Load Pre&vious Position\tAlt+Shift+PgUp", 
+//                                                IDM_LoadPrevPosition
+//        MENUITEM "Reload Sa&me Position",       IDM_ReloadPosition
+        MENUITEM SEPARATOR
         MENUITEM "&Save Game...\tCtrl-S",       IDM_SaveGame
+        MENUITEM "S&ave Position...\tCtrl+Shift+S",IDM_SavePosition
         MENUITEM SEPARATOR
-        MENUITEM "&Copy Game To Clipboard\tCtrl+C", IDM_CopyGame
-        MENUITEM "Paste Game &From Clipboard\tCtrl+V", IDM_PasteGame
+        MENUITEM "Save as &Diagram...",         IDM_SaveDiagram
         MENUITEM SEPARATOR
+        MENUITEM "&Quit",                       IDM_Exit
+    END
+    POPUP "&Edit"
+    BEGIN
+        MENUITEM "&Copy Game To Clipboard\tCtrl+C", IDM_CopyGame
+        MENUITEM "C&opy Position To Clipboard\tCtrl+Shift+C", 
+                                                IDM_CopyPosition
         MENUITEM "Copy Game List to Clipboard", IDM_CopyGameListToClipboard
         MENUITEM SEPARATOR
-        MENUITEM "L&oad Position...\tCtrl+Shift+O", IDM_LoadPosition
-        MENUITEM "Load N&ext Position\tAlt+Shift+PgDn", IDM_LoadNextPosition
-        MENUITEM "Load Pre&vious Position\tAlt+Shift+PgUp", 
-                                                IDM_LoadPrevPosition
-        MENUITEM "Reload Sa&me Position",       IDM_ReloadPosition
-        MENUITEM "S&ave Position...\tCtrl+Shift+S",IDM_SavePosition
-        MENUITEM "Save &Diagram...",            IDM_SaveDiagram
-        MENUITEM SEPARATOR
-        MENUITEM "Cop&y Position To Clipboard\tCtrl+Shift+C", 
-                                                IDM_CopyPosition
-        MENUITEM "Pas&te Position From Clipboard\tCtrl+Shift+V", 
+        MENUITEM "&Paste Game From Clipboard\tCtrl+V", IDM_PasteGame
+        MENUITEM "P&aste Position From Clipboard\tCtrl+Shift+V", 
                                                 IDM_PasteAny
         MENUITEM SEPARATOR
-        MENUITEM "E&xit",                       IDM_Exit
+        MENUITEM "&Edit Game\tCtrl+E",          IDM_EditGame
+        MENUITEM "E&dit Position\tCtrl+Shift+E",IDM_EditPosition
+        MENUITEM SEPARATOR
+        MENUITEM "Edit Ta&gs...",               IDM_EditTags
+        MENUITEM "Edit &Comment...",            IDM_EditComment
+        MENUITEM "Enter &Username...",          IDM_TypeInName
+        MENUITEM SEPARATOR
+        MENUITEM "&Revert\tHome",               IDM_Revert
+        MENUITEM "&Annotate",                   IDM_Annotate
+        MENUITEM "&Truncate Game\tEnd",         IDM_TruncateGame
+        MENUITEM SEPARATOR
+        MENUITEM "&Backward\tAlt+Left",         IDM_Backward
+        MENUITEM "&Forward\tAlt+Right",         IDM_Forward
+        MENUITEM "Back to &Start\tAlt+Home",    IDM_ToStart
+        MENUITEM "For&ward to End\tAlt+End",    IDM_ToEnd
+    END
+    POPUP "&View"
+    BEGIN
+        MENUITEM "Flip &View\tF2",              IDM_FlipView
+        MENUITEM "&Swap Clocks",                IDM_FlipClock
+        MENUITEM SEPARATOR
+        MENUITEM "Engine &Output\tAlt+Shift+O", IDM_ShowEngineOutput
+        MENUITEM "Move &History\tAlt+Shift+H",  IDM_ShowMoveHistory
+        MENUITEM "Evaluation &Graph\tAlt+Shift+E",IDM_ShowEvalGraph
+        MENUITEM "Game &List\tAlt+Shift+G",     IDM_ShowGameList
+        MENUITEM "Open &New Chat Window",       IDM_NewChat
+        MENUITEM "Type In &Move...\tAlt+I",     IDM_TypeInMove
+        MENUITEM SEPARATOR
+        MENUITEM "&Tags",                       IDM_Tags
+        MENUITEM "&Comments",                   IDM_Comment
+        MENUITEM SEPARATOR
+        MENUITEM "&Game List Tags...",          IDM_GameListOptions
+        MENUITEM "&Board...",                   IDM_BoardOptions
+        MENUITEM "&Fonts...",                   IDM_Fonts
     END
     POPUP "&Mode"
     BEGIN
         MENUITEM "Machine &White\tCtrl+W",      IDM_MachineWhite
         MENUITEM "Machine &Black\tCtrl+B",      IDM_MachineBlack
-        MENUITEM "Two &Machines\tCtrl+T",       IDM_TwoMachines
-        MENUITEM "Machine Both",                IDM_MachineBoth
-        MENUITEM "Machine Matc&h",              IDM_Match
+        MENUITEM "&Two Machines\tCtrl+T",       IDM_TwoMachines
+//        MENUITEM "Machine Both",                IDM_MachineBoth
         MENUITEM "&Analysis Mode\tCtrl+A",      IDM_AnalysisMode
         MENUITEM "Analyze &File\tCtrl+F",       IDM_AnalyzeFile
-        MENUITEM "&ICS Client",                 IDM_IcsClient
-        MENUITEM "Edit &Game\tCtrl+E",          IDM_EditGame
-        MENUITEM "&Edit Position\tShift+Ctrl+E",IDM_EditPosition
+        MENUITEM "&Edit Game\tCtrl+E",          IDM_EditGame
+        MENUITEM "E&dit Position\tCtrl+Shift+E",IDM_EditPosition
         MENUITEM "Trai&ning",                   IDM_Training, GRAYED
+        MENUITEM "&ICS Client",                 IDM_IcsClient
         MENUITEM SEPARATOR
-        MENUITEM "Show Engine &Output\tAlt+Shift+O",  IDM_ShowEngineOutput
-        MENUITEM "Show Evaluation Graph\tAlt+Shift+E",IDM_ShowEvalGraph
-        MENUITEM "Show Game &List\tAlt+Shift+G",      IDM_ShowGameList
-        MENUITEM "Show Move History\tAlt+Shift+H",    IDM_ShowMoveHistory
-        MENUITEM "Open Chat Window",            IDM_NewChat
-        MENUITEM SEPARATOR
-        MENUITEM "Edit &Tags...",               IDM_EditTags
-        MENUITEM "Edit &Comment...",            IDM_EditComment
-        MENUITEM "Enter &Username...",          IDM_TypeInName
+        MENUITEM "&Machine Match",              IDM_Match
         MENUITEM "&Pause\tPause",               IDM_Pause
     END
     POPUP "&Action"
@@ -1174,42 +1202,37 @@ BEGIN
         MENUITEM "Adjudicate to &Black",        IDM_UserAdjudication_Black
         MENUITEM "Adjudicate &Draw",            IDM_UserAdjudication_Draw
     END
-    POPUP "&Step"
+    POPUP "E&ngine"
     BEGIN
-        MENUITEM "T&ype In Move...\tAlt+I",     IDM_TypeInMove
+        MENUITEM "Install 1st...",              IDM_EditProgs1
+        MENUITEM "Install 2nd...",              IDM_EditProgs2
         MENUITEM SEPARATOR
-        MENUITEM "&Backward\tAlt+Left",         IDM_Backward
-        MENUITEM "&Forward\tAlt+Right",         IDM_Forward
-        MENUITEM "Back to &Start\tAlt+Home",    IDM_ToStart
-        MENUITEM "Forward to &End\tAlt+End",    IDM_ToEnd
-        MENUITEM "Re&vert",                     IDM_Revert
-        MENUITEM "&Annotate",                   IDM_Annotate
-        MENUITEM "&Truncate Game",              IDM_TruncateGame
+        MENUITEM "Engine #&1 Settings...",       IDM_Engine1Options
+        MENUITEM "Engine #&2 Settings...",       IDM_Engine2Options
+        MENUITEM SEPARATOR
+        MENUITEM "&Hint...",                    IDM_Hint
+        MENUITEM "&Book...",                    IDM_Book
         MENUITEM SEPARATOR
         MENUITEM "&Move Now\tCtrl+M",           IDM_MoveNow
         MENUITEM "&Retract Move\tCtrl+X",       IDM_RetractMove
     END
     POPUP "&Options"
     BEGIN
-        MENUITEM "Flip &View\tF2",              IDM_FlipView
-        MENUITEM "Swap &Clocks",                IDM_FlipClock
         MENUITEM "&Mute all Sounds",            IDM_MuteSounds
         MENUITEM SEPARATOR
         MENUITEM "&General...",                 IDM_GeneralOptions
-        MENUITEM "&Board...",                   IDM_BoardOptions
-        MENUITEM "Adjudications...\tAlt+Shift+J",IDM_EnginePlayOptions
-        MENUITEM "Common Engine...\tAlt+Shift+U",IDM_OptionsUCI
-        MENUITEM "Engine #1 Settings...",       IDM_Engine1Options
-        MENUITEM "Engine #2 Settings...",       IDM_Engine2Options
-        MENUITEM "&ICS...",                     IDM_IcsOptions, GRAYED
-        MENUITEM "&Fonts...",                   IDM_Fonts
-        MENUITEM "Soun&ds...",                  IDM_Sounds
-        MENUITEM "Game List...",                IDM_GameListOptions
+        MENUITEM "&Time Control...\tAlt+Shift+T",IDM_TimeControl
+        MENUITEM "Common &Engine...\tAlt+Shift+U",IDM_OptionsUCI
+        MENUITEM "Ad&judications...\tAlt+Shift+J",IDM_EnginePlayOptions
         MENUITEM SEPARATOR
-        MENUITEM "Comm&unications...",          IDM_CommPort
         MENUITEM "&Load Game...\tAlt+Shift+L",  IDM_LoadOptions
         MENUITEM "&Save Game...\tAlt+Shift+S",  IDM_SaveOptions
-        MENUITEM "&Time Control...\tAlt+Shift+T",IDM_TimeControl
+        MENUITEM "G&ame List...",               IDM_GameListOptions
+        MENUITEM SEPARATOR
+        MENUITEM "Soun&ds...",                  IDM_Sounds
+        MENUITEM "&ICS...",                     IDM_IcsOptions, GRAYED
+        MENUITEM "Add ICS...",                  IDM_EditServers
+        MENUITEM "Comm&unications...",          IDM_CommPort
         MENUITEM SEPARATOR
         MENUITEM "Save Settings &Now",          IDM_SaveSettings
         MENUITEM "Save Settings on E&xit",      IDM_SaveSettingsOnExit
@@ -1220,9 +1243,6 @@ BEGIN
         MENUITEM "Help &Index",                 IDM_HELPSEARCH
         MENUITEM "How to &Use Help",            IDM_HELPHELP
         MENUITEM SEPARATOR
-        MENUITEM "&Hint...",                    IDM_Hint
-        MENUITEM "&Book...",                    IDM_Book
-        MENUITEM SEPARATOR
         MENUITEM "&About WinBoard",             IDM_ABOUT
     END
 END