Reorganize WinBoard menus

New main menus Edit, View and Engine are added; the step menu
disappears. The menu items are redistributed over the new menus.
Sometimes duplicates are created. No adaptation of short-cut characters
as made yet (as this affects translation).

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 525fa41..36f7ca6 100644 (file)
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -334,7 +334,7 @@ static char languageBuf[50000], *foreign[1000], *english[1000], *languageFile[MS
 static int lastChecked;\r
 static char oldLanguage[MSG_SIZ], *menuText[10][30];\r
 extern int tinyLayout;\r
-extern char * menuBarText[][8];\r
+extern char * menuBarText[][10];\r
 \r
 void\r
 LoadLanguageFile(char *name)\r
@@ -549,10 +549,10 @@ MyButtonDesc buttonDesc[N_BUTTONS] =
 };\r
 \r
 int tinyLayout = 0, smallLayout = 0;\r
-#define MENU_BAR_ITEMS 7\r
+#define MENU_BAR_ITEMS 9\r
 char *menuBarText[2][MENU_BAR_ITEMS+1] = {\r
-  { N_("&File"), N_("&Mode"), N_("&Action"), N_("&Step"), N_("&Options"), N_("&Help"), NULL },\r
-  { N_("&F"), N_("&M"), N_("&A"), N_("&S"), N_("&O"), N_("&H"), NULL },\r
+  { N_("&File"), N_("&Edit"), N_("&View"), N_("&Mode"), N_("&Action"), N_("E&ngine"), N_("&Options"), N_("&Help"), NULL },\r
+  { N_("&F"), N_("&E"), N_("&V"), N_("&M"), N_("&A"), N_("&N"), N_("&O"), N_("&H"), NULL },\r
 };\r
 \r
 \r

diff --git a/winboard/winboard.h b/winboard/winboard.h
index c183bee..932ae66 100644 (file)
--- a/winboard/winboard.h
+++ b/winboard/winboard.h
@@ -147,10 +147,10 @@ void SaveSettings(char* name);
 \r
 /* Positions of some menu items.  Origin is zero and separator lines count. */\r
 /* It's gross that these are needed. */\r
-#define ACTION_POS 2    /* Posn of "Action" on menu bar */\r
-#define OPTIONS_POS 4   /* Posn of "Options" on menu bar */\r
-#define ICS_POS 10      /* Posn of "ICS " on Options menu */\r
-#define SOUNDS_POS 12    /* Posn of "Sounds" on Options menu */\r
+#define ACTION_POS 4    /* Posn of "Action" on menu bar */\r
+#define OPTIONS_POS 6   /* Posn of "Options" on menu bar */\r
+#define ICS_POS 12      /* Posn of "ICS " on Options menu */\r
+#define SOUNDS_POS 11    /* Posn of "Sounds" on Options menu */\r
 /* end grossness */\r
 \r
 extern MyFont *font[NUM_SIZES][NUM_FONTS];\r

diff --git a/winboard/winboard.rc b/winboard/winboard.rc
index 25658ba..e61de73 100644 (file)
--- a/winboard/winboard.rc
+++ b/winboard/winboard.rc
@@ -1106,54 +1106,82 @@ BEGIN
         MENUITEM "New Variant...\tAlt+Shift+V",  IDM_NewVariant\r
         MENUITEM SEPARATOR\r
         MENUITEM "&Load Game...\tCtrl-O",       IDM_LoadGame\r
-        MENUITEM "Load &Next Game\tAlt+PgDn",   IDM_LoadNextGame\r
-        MENUITEM "Load &Previous Game\tAlt+PgUp", IDM_LoadPrevGame\r
-        MENUITEM "&Reload Same Game",           IDM_ReloadGame\r
-        MENUITEM "&Save Game...\tCtrl-S",       IDM_SaveGame\r
-        MENUITEM SEPARATOR\r
-        MENUITEM "&Copy Game To Clipboard\tCtrl+C", IDM_CopyGame\r
-        MENUITEM "Paste Game &From Clipboard\tCtrl+V", IDM_PasteGame\r
-        MENUITEM SEPARATOR\r
-        MENUITEM "Copy Game List to Clipboard", IDM_CopyGameListToClipboard\r
-        MENUITEM SEPARATOR\r
         MENUITEM "L&oad Position...\tCtrl+Shift+O", IDM_LoadPosition\r
-        MENUITEM "Load N&ext Position\tAlt+Shift+PgDn", IDM_LoadNextPosition\r
-        MENUITEM "Load Pre&vious Position\tAlt+Shift+PgUp", \r
-                                                IDM_LoadPrevPosition\r
-        MENUITEM "Reload Sa&me Position",       IDM_ReloadPosition\r
+//        MENUITEM "Load &Next Game\tAlt+PgDn",   IDM_LoadNextGame\r
+//        MENUITEM "Load &Previous Game\tAlt+PgUp", IDM_LoadPrevGame\r
+//        MENUITEM "&Reload Same Game",           IDM_ReloadGame\r
+//        MENUITEM "Load N&ext Position\tAlt+Shift+PgDn", IDM_LoadNextPosition\r
+//        MENUITEM "Load Pre&vious Position\tAlt+Shift+PgUp", \r
+//                                                IDM_LoadPrevPosition\r
+//        MENUITEM "Reload Sa&me Position",       IDM_ReloadPosition\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "&Save Game...\tCtrl-S",       IDM_SaveGame\r
         MENUITEM "S&ave Position...\tCtrl+Shift+S",IDM_SavePosition\r
-        MENUITEM "Save &Diagram...",            IDM_SaveDiagram\r
         MENUITEM SEPARATOR\r
+        MENUITEM "Save as &Diagram...",         IDM_SaveDiagram\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "E&xit",                       IDM_Exit\r
+    END\r
+    POPUP "&Edit"\r
+    BEGIN\r
+        MENUITEM "&Copy Game To Clipboard\tCtrl+C", IDM_CopyGame\r
         MENUITEM "Cop&y Position To Clipboard\tCtrl+Shift+C", \r
                                                 IDM_CopyPosition\r
+        MENUITEM "Copy Game List to Clipboard", IDM_CopyGameListToClipboard\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "Paste Game &From Clipboard\tCtrl+V", IDM_PasteGame\r
         MENUITEM "Pas&te Position From Clipboard\tCtrl+Shift+V", \r
                                                 IDM_PasteAny\r
         MENUITEM SEPARATOR\r
-        MENUITEM "E&xit",                       IDM_Exit\r
+        MENUITEM "Edit &Game\tCtrl+E",          IDM_EditGame\r
+        MENUITEM "&Edit Position\tShift+Ctrl+E",IDM_EditPosition\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "Edit &Tags...",               IDM_EditTags\r
+        MENUITEM "Edit &Comment...",            IDM_EditComment\r
+        MENUITEM "Enter &Username...",          IDM_TypeInName\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "Re&vert",                     IDM_Revert\r
+        MENUITEM "&Annotate",                   IDM_Annotate\r
+        MENUITEM "&Truncate Game",              IDM_TruncateGame\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "&Backward\tAlt+Left",         IDM_Backward\r
+        MENUITEM "&Forward\tAlt+Right",         IDM_Forward\r
+        MENUITEM "Back to &Start\tAlt+Home",    IDM_ToStart\r
+        MENUITEM "Forward to &End\tAlt+End",    IDM_ToEnd\r
+    END\r
+    POPUP "&View"\r
+    BEGIN\r
+        MENUITEM "Flip &View\tF2",              IDM_FlipView\r
+        MENUITEM "Swap &Clocks",                IDM_FlipClock\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "Show Engine &Output\tAlt+Shift+O",  IDM_ShowEngineOutput\r
+        MENUITEM "Show Move History\tAlt+Shift+H",    IDM_ShowMoveHistory\r
+        MENUITEM "Show Evaluation Graph\tAlt+Shift+E",IDM_ShowEvalGraph\r
+        MENUITEM "Show Game &List\tAlt+Shift+G",      IDM_ShowGameList\r
+        MENUITEM "Open New Chat Window",        IDM_NewChat\r
+        MENUITEM "T&ype In Move...\tAlt+I",     IDM_TypeInMove\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "Show &Tags...",               IDM_EditTags\r
+        MENUITEM "Show &Comments...",           IDM_EditComment\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "Game List...",                IDM_GameListOptions\r
+        MENUITEM "&Board...",                   IDM_BoardOptions\r
+        MENUITEM "&Fonts...",                   IDM_Fonts\r
     END\r
     POPUP "&Mode"\r
     BEGIN\r
         MENUITEM "Machine &White\tCtrl+W",      IDM_MachineWhite\r
         MENUITEM "Machine &Black\tCtrl+B",      IDM_MachineBlack\r
         MENUITEM "Two &Machines\tCtrl+T",       IDM_TwoMachines\r
-        MENUITEM "Machine Both",                IDM_MachineBoth\r
-        MENUITEM "Machine Matc&h",              IDM_Match\r
+//        MENUITEM "Machine Both",                IDM_MachineBoth\r
         MENUITEM "&Analysis Mode\tCtrl+A",      IDM_AnalysisMode\r
-        MENUITEM "Analyze &File\tCtrl+F",       IDM_AnalyzeFile\r
-        MENUITEM "&ICS Client",                 IDM_IcsClient\r
+//        MENUITEM "Analyze &File\tCtrl+F",       IDM_AnalyzeFile\r
         MENUITEM "Edit &Game\tCtrl+E",          IDM_EditGame\r
         MENUITEM "&Edit Position\tShift+Ctrl+E",IDM_EditPosition\r
         MENUITEM "Trai&ning",                   IDM_Training, GRAYED\r
+        MENUITEM "&ICS Client",                 IDM_IcsClient\r
         MENUITEM SEPARATOR\r
-        MENUITEM "Show Engine &Output\tAlt+Shift+O",  IDM_ShowEngineOutput\r
-        MENUITEM "Show Evaluation Graph\tAlt+Shift+E",IDM_ShowEvalGraph\r
-        MENUITEM "Show Game &List\tAlt+Shift+G",      IDM_ShowGameList\r
-        MENUITEM "Show Move History\tAlt+Shift+H",    IDM_ShowMoveHistory\r
-        MENUITEM "Open Chat Window",            IDM_NewChat\r
-        MENUITEM SEPARATOR\r
-        MENUITEM "Edit &Tags...",               IDM_EditTags\r
-        MENUITEM "Edit &Comment...",            IDM_EditComment\r
-        MENUITEM "Enter &Username...",          IDM_TypeInName\r
+        MENUITEM "Machine Matc&h",              IDM_Match\r
         MENUITEM "&Pause\tPause",               IDM_Pause\r
     END\r
     POPUP "&Action"\r
@@ -1176,42 +1204,34 @@ BEGIN
         MENUITEM "Adjudicate to &Black",        IDM_UserAdjudication_Black\r
         MENUITEM "Adjudicate &Draw",            IDM_UserAdjudication_Draw\r
     END\r
-    POPUP "&Step"\r
+    POPUP "E&ngine"\r
     BEGIN\r
-        MENUITEM "T&ype In Move...\tAlt+I",     IDM_TypeInMove\r
         MENUITEM SEPARATOR\r
-        MENUITEM "&Backward\tAlt+Left",         IDM_Backward\r
-        MENUITEM "&Forward\tAlt+Right",         IDM_Forward\r
-        MENUITEM "Back to &Start\tAlt+Home",    IDM_ToStart\r
-        MENUITEM "Forward to &End\tAlt+End",    IDM_ToEnd\r
-        MENUITEM "Re&vert",                     IDM_Revert\r
-        MENUITEM "&Annotate",                   IDM_Annotate\r
-        MENUITEM "&Truncate Game",              IDM_TruncateGame\r
+        MENUITEM "Engine #1 Settings...",       IDM_Engine1Options\r
+        MENUITEM "Engine #2 Settings...",       IDM_Engine2Options\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "&Hint...",                    IDM_Hint\r
+        MENUITEM "&Book...",                    IDM_Book\r
         MENUITEM SEPARATOR\r
         MENUITEM "&Move Now\tCtrl+M",           IDM_MoveNow\r
         MENUITEM "&Retract Move\tCtrl+X",       IDM_RetractMove\r
     END\r
     POPUP "&Options"\r
     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
-        MENUITEM "Adjudications...\tAlt+Shift+J",IDM_EnginePlayOptions\r
+        MENUITEM "&Time Control...\tAlt+Shift+T",IDM_TimeControl\r
         MENUITEM "Common Engine...\tAlt+Shift+U",IDM_OptionsUCI\r
-        MENUITEM "Engine #1 Settings...",       IDM_Engine1Options\r
-        MENUITEM "Engine #2 Settings...",       IDM_Engine2Options\r
-        MENUITEM "&ICS...",                     IDM_IcsOptions, GRAYED\r
-        MENUITEM "&Fonts...",                   IDM_Fonts\r
-        MENUITEM "Soun&ds...",                  IDM_Sounds\r
-        MENUITEM "Game List...",                IDM_GameListOptions\r
+        MENUITEM "Adjudications...\tAlt+Shift+J",IDM_EnginePlayOptions\r
         MENUITEM SEPARATOR\r
-        MENUITEM "Comm&unications...",          IDM_CommPort\r
         MENUITEM "&Load Game...\tAlt+Shift+L",  IDM_LoadOptions\r
         MENUITEM "&Save Game...\tAlt+Shift+S",  IDM_SaveOptions\r
-        MENUITEM "&Time Control...\tAlt+Shift+T",IDM_TimeControl\r
+        MENUITEM "Game List...",                IDM_GameListOptions\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "Soun&ds...",                  IDM_Sounds\r
+        MENUITEM "&ICS...",                     IDM_IcsOptions, GRAYED\r
+        MENUITEM "Comm&unications...",          IDM_CommPort\r
         MENUITEM SEPARATOR\r
         MENUITEM "Save Settings &Now",          IDM_SaveSettings\r
         MENUITEM "Save Settings on E&xit",      IDM_SaveSettingsOnExit\r
@@ -1222,9 +1242,6 @@ BEGIN
         MENUITEM "Help &Index",                 IDM_HELPSEARCH\r
         MENUITEM "How to &Use Help",            IDM_HELPHELP\r
         MENUITEM SEPARATOR\r
-        MENUITEM "&Hint...",                    IDM_Hint\r
-        MENUITEM "&Book...",                    IDM_Book\r
-        MENUITEM SEPARATOR\r
         MENUITEM "&About WinBoard",             IDM_ABOUT\r
     END\r
 END\r