Changeset 953 for trunk/dll/mainwnd.c

Timestamp:

Feb 16, 2008, 3:15:16 AM (18 years ago)

Author:

Steven Levine

Message:

Rework code and resources to support settings menu conditional cascade
Optimize last settings menu save/restore

File:

• trunk/dll/mainwnd.c (modified) (5 diffs)

trunk/dll/mainwnd.c

@@ -50 +50 @@
   19 Jan 08 GKY Rework Utilities menu
   05 Feb 08 SHL Restore no-prescan drives if restoring named state
+  14 Feb 08 SHL Rework to support settings menu conditional cascade
 
 ***********************************************************************/
@@ -73 +74 @@
 #include "errutil.h"                    // Dos_Error...
 #include "strutil.h"                    // GetPString
+#include "notebook.h"                   // CfgDlgProc CfgMenuInit
 #include "fm3dll.h"
 
@@ -4690 +4692 @@
   case IDM_NOTEBOOK:
   case IDM_DIRCNRSETTINGS:
-  case IDM_COLLECTORSETTINGS:
-  case IDM_TREECNRSETTINGS:
+  case IDM_DIRVIEWSETTINGS:
+  case IDM_DIRSORTSETTINGS:
+  case IDM_COLLECTORVIEWSETTINGS:
+  case IDM_COLLECTORSORTSETTINGS:
   case IDM_ARCHIVERSETTINGS:
+  case IDM_TREECNRVIEWSETTINGS:
+  case IDM_TREECNRSORTSETTINGS:
   case IDM_VIEWERSETTINGS:
+  case IDM_VIEWERSETTINGS2:
   case IDM_COMPARESETTINGS:
+  case IDM_MONOLITHICSETTINGS:
+  case IDM_GENERALSETTINGS:
+  case IDM_SCANSETTINGS:
+  case IDM_BUBBLESSETTINGS:
   case IDM_QUICKSETTINGS:
     WinDlgBox(HWND_DESKTOP,
@@ -4981 +4992 @@
   case IDM_HIDEMENU:
     {
-      HWND hwndMenu;
-
-      hwndMenu = WinQueryWindowULong(hwnd, QWL_USER);
-      MenuInvisible = (MenuInvisible) ? FALSE : TRUE;
+      HWND hwndMenu = WinQueryWindowULong(hwnd, QWL_USER);
+      MenuInvisible = MenuInvisible ? FALSE : TRUE;
       if (MenuInvisible) {
         WinSetParent(hwndMenu, HWND_OBJECT, FALSE);
@@ -5519 +5528 @@
     WinSendMsg(hwnd, UM_ADDTOMENU, MPVOID, MPVOID);
     SetToggleChecks(hwndMenu);
+    CfgMenuInit(hwndMenu, FALSE);       // 14 Feb 08 SHL
     SetConditionalCascade(hwndMenu, IDM_COMMANDLINESUBMENU, IDM_COMMANDLINE);
     SetConditionalCascade(hwndMenu, IDM_TOOLSUBMENU, IDM_TOOLBAR);