Changeset 933 for trunk

Timestamp:

Jan 19, 2008, 11:50:41 PM (18 years ago)

Author:

Gregg Young

Message:

Update Utilities menu add command line, system & bookself submenus; Stop Z order of directory container from being reversed on restart.

Location:

trunk/dll

Files:

• fm3dll2.h (modified) (1 diff)
• fm3res.rc (modified) (2 diffs)
• mainwnd.c (modified) (2 diffs)

trunk/dll/fm3dll2.h

@@ -431 +431 @@
 #define IDM_VIEWHELPS       2011
 #define IDM_REMAP           2012
+#define IDM_COMMANDLINESUBMENU  2013
+#define IDM_SYSTEMSUBMENU   2014
+#define IDM_BOOKSELFSUBMENU 2015
 
 #define IDM_CONFIGMENU      3000

trunk/dll/fm3res.rc

@@ -214 +214 @@
     MENUITEM "~Kill processes",   IDM_KILLPROC
     MENUITEM "I~nstant CMD file", IDM_INSTANT
-    MENUITEM "~View bookshelf",   IDM_VIEWINFS
-    MENUITEM "View ~helpfiles",   IDM_VIEWHELPS
+    SUBMENU  "~Bookshelf",        IDM_BOOKSELFSUBMENU
+    {
+      MENUITEM "~View bookshelf",   IDM_VIEWINFS
+      MENUITEM "View ~helpfiles",   IDM_VIEWHELPS
+    }
+    MENUITEM "",                  -1,               MIS_SEPARATOR
+    SUBMENU  "Command ~line",         IDM_COMMANDLINESUBMENU
+    {
+      MENUITEM "OS/2 command ~line\tF9",IDM_COMMANDLINE
+      MENUITEM "~DOS command line",  IDM_DOSCOMMANDLINE
+      MENUITEM "~Win-OS/2 full screen",IDM_WINFULLSCREEN
+    }
+    SUBMENU  "S~ystem",           IDM_SYSTEMSUBMENU
+    {
+      MENUITEM "System ~clock",     IDM_SYSTEMCLOCK
+      MENUITEM "System ~setup",     IDM_SYSTEMSETUP
 #ifdef NEVER
-    MENUITEM "System in~formation",IDM_SYSINFO
+      MENUITEM "System ~information",IDM_SYSINFO
 #endif
-    MENUITEM "",                  -1,               MIS_SEPARATOR
-    MENUITEM "OS/2 command ~line\tF9",IDM_COMMANDLINE
-    MENUITEM "~DOS command line",  IDM_DOSCOMMANDLINE
-    MENUITEM "~Win-OS/2 full screen",IDM_WINFULLSCREEN
-    MENUITEM "",                  -1,               MIS_SEPARATOR
-    MENUITEM "S~ystem clock",     IDM_SYSTEMCLOCK
-    MENUITEM "System setu~p",     IDM_SYSTEMSETUP
+    }
   }
   SUBMENU "~Config",              IDM_CONFIGMENU
@@ -252 +260 @@
          {
            MENUITEM "Edit ~associations...",IDM_EDITASSOC
-                MENUITEM "Edit ~commands...", IDM_EDITCOMMANDS
-                MENUITEM "Edit an archi~ver...",IDM_EDITANYARCHIVER
+           MENUITEM "Edit ~commands...", IDM_EDITCOMMANDS
+           MENUITEM "Edit an archi~ver...",IDM_EDITANYARCHIVER
          }
     SUBMENU "~Palette",                                                 -1

trunk/dll/mainwnd.c

@@ -3284 +3284 @@
             else
               WinSetWindowPos(hwndDir,
-                              HWND_TOP,
+                              HWND_BOTTOM,
                               0, 0, 0, 0, SWP_ZORDER | SWP_ACTIVATE);
           }
@@ -5495 +5495 @@
     WinSendMsg(hwnd, UM_ADDTOMENU, MPVOID, MPVOID);
     SetToggleChecks(hwndMenu);
+    SetConditionalCascade(hwndMenu, IDM_COMMANDLINESUBMENU, IDM_COMMANDLINE);
     SetConditionalCascade(hwndMenu, IDM_TOOLSUBMENU, IDM_TOOLBAR);
     SetConditionalCascade(hwndMenu, IDM_AUTOVIEWSUBMENU, IDM_AUTOVIEW);