Changeset 1777 for trunk/dll/mainwnd2.c

Timestamp:

Jun 13, 2014, 3:51:31 AM (11 years ago)

Author:

Steven Levine

Message:

Rework FM/2 Config menu. Add confirm delete toggle. (Steven)
Rework FM/2 Lite Config menu. Add drag&drop dialog toggle and confirm delete toggles. (Steven)
Correct View, Sort and Filter button initialization. (Steven)

File:

• trunk/dll/mainwnd2.c (modified) (10 diffs)

trunk/dll/mainwnd2.c

@@ -28 +28 @@
   10 Dec 08 SHL Integrate exception handler support
   03 Jan 09 GKY Check for system that is protectonly to gray out Dos/Win command lines and prevent
-                Dos/Win programs from being inserted into the execute dialog with message why.
+                Dos/Win programs from being inserted into the execute dialog with message why.
   21 Jun 09 GKY Added drive letter to bitmap buttons in drive bar; Eliminate static drive
-                letter windows; Use button ID to identify drive letter for processing.
+                letter windows; Use button ID to identify drive letter for processing.
   22 Jul 09 GKY Code changes to use semaphores to serialize drive scanning
   12 Sep 09 GKY Add FM3.INI User ini and system ini to submenu for view ini
   13 Dec 09 GKY Fixed separate paramenters. Please note that appname should be used in
-                profile calls for user settings that work and are setable in more than one
-                miniapp; FM3Str should be used for setting only relavent to FM/2 or that
-                aren't user settable; realappname should be used for setting applicable to
-                one or more miniapp but not to FM/2
+                profile calls for user settings that work and are setable in more than one
+                miniapp; FM3Str should be used for setting only relavent to FM/2 or that
+                aren't user settable; realappname should be used for setting applicable to
+                one or more miniapp but not to FM/2
   17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
   11 Apr 10 GKY Fix drive tree rescan failure and program hang caused by event sem
-                never being posted
+                never being posted
   12 Aug 12 GKY Allow for selection of include subdirectories or a list file on initial startup of compare dirs
 
@@ -76 +76 @@
                                         // SetSysMenu
 #include "mainwnd.h"                    // CloseChildren, MainWMCommand, MakeMainObjWin, ResizeDrives
-                                // TopWindow
+                                        // TopWindow
 #include "common.h"                     // CommonCreateMainChildren, CommonMainWndProc
 #include "notify.h"                     // HideNote
@@ -459 +459 @@
   case IDM_AUTOVIEWFILE:
   case IDM_AUTOVIEW:
+  case IDM_CONFIRMDELETE:               // 2014-05-17 SHL
+  case IDM_TOGGLEDRAGDIALOG:            // 2014-05-15 SHL
 //    case IDM_SYSINFO:
   case IDM_HIDENOTEWND:
@@ -555 +557 @@
             strcpy(cmp->leftdir, wa.szCurrentPath1);
             strcpy(cmp->rightdir, wa.szCurrentPath2);
-            cmp->listfile = wa.listfile;
-            cmp->includesubdirs = wa.includesubdirs;
+            cmp->listfile = wa.listfile;
+            cmp->includesubdirs = wa.includesubdirs;
             cmp->hwndParent = hwnd;
             cmp->dcd.hwndParent = hwnd;
@@ -783 +785 @@
 {
   PERSON1DATA *pd;
+  TID tid;
+  SWP swp;
+  PFNWP oldproc;
+  HWND hwndMenu;
+  DIRCNRDATA *dcd;
+  HWND hwndC;
+  ULONG which;
+  ULONG size;
 
   switch (msg) {
   case WM_CREATE:
-    {
-      TID tid;
-
-      WinQueryWindowProcess(hwnd, &mypid, &tid);
-    }
+    WinQueryWindowProcess(hwnd, &mypid, &tid);
     hwndMain = hwnd;
+
     WinSetWindowUShort(hwnd, QWL_USER + 8, 0);
     WinSetWindowUShort(hwnd, QWL_USER + 10, 0);
@@ -815 +822 @@
       WinSetWindowPtr(hwnd, QWL_USER + 4, (PVOID) pd);
     }
-    {
-      SWP swp;
-      PFNWP oldproc;
-
-      // create frame children (not client children, frame children)
-      DosSleep(1);
-      WinQueryWindowPos(WinQueryWindow(hwnd, QW_PARENT), &swp);
-      oldproc = WinSubclassWindow(WinQueryWindow(hwnd, QW_PARENT),
-                                  (PFNWP) MainFrameWndProc2);
-      if (oldproc)
-        WinSetWindowPtr(WinQueryWindow(hwnd, QW_PARENT), QWL_USER, (PVOID) oldproc);
-      CommonCreateMainChildren(hwnd, &swp);
-
-      {
-        HWND hwndMenu;
-
-        hwndMenu = WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT), FID_MENU);
-        WinSetWindowULong(hwnd, QWL_USER, hwndMenu);
-        CfgMenuInit(hwndMenu, FALSE);   // 14 Feb 08 SHL
-        SetConditionalCascade(hwndMenu, IDM_COMMANDLINESUBMENU, IDM_COMMANDLINE);
-        if (fProtectOnly) {
-          WinEnableMenuItem(hwndMenu, IDM_DOSCOMMANDLINE, FALSE);
-          WinEnableMenuItem(hwndMenu, IDM_WINFULLSCREEN, FALSE);
-        }
-        SetConditionalCascade(hwndMenu, IDM_COMMANDSMENU, IDM_DOITYOURSELF);
-        SetConditionalCascade(hwndMenu, IDM_TOOLSUBMENU, IDM_TOOLBAR);
-      }
-    }
+
+    // create frame children (not client children, frame children)
+    DosSleep(1);
+    WinQueryWindowPos(WinQueryWindow(hwnd, QW_PARENT), &swp);
+    oldproc = WinSubclassWindow(WinQueryWindow(hwnd, QW_PARENT),
+                                (PFNWP) MainFrameWndProc2);
+    if (oldproc)
+      WinSetWindowPtr(WinQueryWindow(hwnd, QW_PARENT), QWL_USER, (PVOID) oldproc);
+
+    CommonCreateMainChildren(hwnd, &swp);
+
+    hwndMenu = WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT), FID_MENU);
+    WinSetWindowULong(hwnd, QWL_USER, hwndMenu);
+
+    // 2014-05-15 SHL FIXME to be sure needed
+    // WinCheckMenuItem(hwndMenu, IDM_TOGGLEDRAGDIALOG, fDragndropDlg); // 2014-05-15 SHL
+
+    CfgMenuInit(hwndMenu, FALSE);       // 14 Feb 08 SHL
+    SetConditionalCascade(hwndMenu, IDM_COMMANDLINESUBMENU, IDM_COMMANDLINE);
+
+    if (fProtectOnly) {
+      WinEnableMenuItem(hwndMenu, IDM_DOSCOMMANDLINE, FALSE);
+      WinEnableMenuItem(hwndMenu, IDM_WINFULLSCREEN, FALSE);
+    }
+
+    SetConditionalCascade(hwndMenu, IDM_COMMANDSMENU, IDM_DOITYOURSELF);
+    SetConditionalCascade(hwndMenu, IDM_TOOLSUBMENU, IDM_TOOLBAR);
+
     WinSetWindowText(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
                                      FID_TITLEBAR), "FM/2 Lite");
+
     FixSwitchList(WinQueryWindow(hwnd, QW_PARENT), NULL);
     SetSysMenu(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT), FID_SYSMENU));
@@ -852 +860 @@
     pd = WinQueryWindowPtr(hwnd, QWL_USER + 4);
     if (pd) {
-
       CHAR s[CCHMAXPATH];
-      ULONG size;
-      DIRCNRDATA *dcd;
-      HWND hwndC;
       BOOL dummy = TRUE;
 
       size = sizeof(BOOL);
       PrfQueryProfileData(fmprof, realappname, "FM/4 TreeUp",
-                          (PVOID) &dummy, &size);
+                          (PVOID) &dummy, &size);
       if (dummy) {
         size = sizeof(ULONG);
         hwndTree = StartTreeCnr(hwnd, 3);
-        PrfQueryProfileData(fmprof, realappname, "FM/4 TreeWidth",
-                            (PVOID) &TreeWidth, &size);
+        PrfQueryProfileData(fmprof, realappname, "FM/4 TreeWidth",
+                            (PVOID) &TreeWidth, &size);
         TreeWidth = max(TreeWidth, 80);
       }
       size = sizeof(BOOL);
       if (PrfQueryProfileData(fmprof, appname, "Toolbar", &dummy, &size) &&
-          size && !dummy)
+          size && !dummy)
         WinSendMsg(hwnd, WM_COMMAND, MPFROM2SHORT(IDM_TOOLBAR, 0), MPVOID);
 
@@ -971 +975 @@
       }
     }
+    // 2014-06-11 SHL Initialize view, sort and filter button text
+    if (pd->hwndDir1) {
+      hwndC = WinWindowFromID(pd->hwndDir1, FID_CLIENT);
+      if (hwndC) {
+        dcd = WinQueryWindowPtr(WinWindowFromID(hwndC, DIR_CNR), QWL_USER);
+        if (dcd && dcd->hwndCnr)
+          PostMsg(dcd->hwndCnr, UM_SETUP2, MPVOID, MPVOID);
+      }
+    }
+    if (pd->hwndDir2) {
+      hwndC = WinWindowFromID(pd->hwndDir2, FID_CLIENT);
+      if (hwndC) {
+        dcd = WinQueryWindowPtr(WinWindowFromID(hwndC, DIR_CNR), QWL_USER);
+        if (dcd && dcd->hwndCnr)
+          PostMsg(dcd->hwndCnr, UM_SETUP2, MPVOID, MPVOID);
+      }
+    }
+
+    which = 0;
+    size = sizeof(ULONG);
+    if (PrfQueryProfileData(fmprof,
+                            realappname,
+                            "FM/4 Max",
+                            (PVOID)&which,
+                            &size) &&
+        size == sizeof(ULONG) &&
+        which)
     {
-      ULONG which = 0, size = sizeof(ULONG);
-
-      if (PrfQueryProfileData(fmprof, realappname, "FM/4 Max",
-                              (PVOID) & which,
-                              &size) && size == sizeof(ULONG) && which) {
-        PostMsg(hwnd,
-                UM_MAXIMIZE,
-                MPFROMLONG(((which == 1) ?
-                            pd->hwndDir1 : pd->hwndDir2)), MPVOID);
-      }
+      PostMsg(hwnd,
+              UM_MAXIMIZE,
+              MPFROMLONG(((which == 1) ?
+                          pd->hwndDir1 : pd->hwndDir2)), MPVOID);
     }
     PostMsg(hwnd, UM_SIZE, MPVOID, MPVOID);
@@ -1239 +1264 @@
       break;
     case IDM_CONFIGMENU:
+      // 2014-05-17 SHL FIXME to use SetToggleChecks maybe
       WinCheckMenuItem((HWND) mp2, IDM_TOOLSUBMENU, fToolbar);
       WinCheckMenuItem((HWND) mp2, IDM_AUTOVIEW, fAutoView);
+      WinCheckMenuItem((HWND) mp2, IDM_CONFIRMDELETE, fConfirmDelete);  // 2014-05-17 SHL
+      WinCheckMenuItem((HWND) mp2, IDM_TOGGLEDRAGDIALOG, fDragndropDlg);        // 2014-05-15 SHL
       break;
     case IDM_TOOLSUBMENU:
+      // 2014-05-17 SHL FIXME to use SetToggleChecks maybe
       WinCheckMenuItem((HWND) mp2, IDM_TOOLBAR, fToolbar);
       WinCheckMenuItem((HWND) mp2, IDM_TEXTTOOLS, fTextTools);
@@ -1248 +1277 @@
       break;
     case IDM_WINDOWSMENU:
+      // 2014-05-17 SHL FIXME to use SetToggleChecks maybe
       WinCheckMenuItem((HWND) mp2, IDM_VTREE, (hwndTree != (HWND) 0));
       WinCheckMenuItem((HWND) mp2, IDM_TILEBACKWARDS, fTileBackwards);