Changeset 1444 for trunk/dll/common.c

Timestamp:

Jul 23, 2009, 1:24:23 AM (16 years ago)

Author:

Gregg Young

Message:

Rework of drivebar to rescan all drives and refresh media buttons and menu items grey out inappropriate menu items. Streamline Tree scan code and use semaphores to serialize access. Add NOEASUPPORT and LOCALHD driveflag; .LONGNAME usage fixes; (Tickets 377-386)

File:

• trunk/dll/common.c (modified) (3 diffs)

trunk/dll/common.c

@@ -26 +26 @@
   07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
   08 Mar 09 GKY Additional strings move to PCSZs in init.c
+  22 Jul 09 GKY Drivebar enhancements add refresh removable, rescan all drives, drive button
+                loads drive root directory in directory container or expands drive tree
+                and rescans drive in tree container depending on container focus, greyed out
+                inappropriate menu context choices
+
 
 ***********************************************************************/
@@ -260 +265 @@
                   hwnd,
                   SetDrvProc,
-                  FM3ModHandle, DVS_FRAME, MPFROMP(dv)) && hwndTree)
-      PostMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_UPDATE, 0), MPVOID);
+                  FM3ModHandle, DVS_FRAME, MPFROMP(dv)) && hwndTree)
+      if (!PostMsg(hwndTree, UM_SHOWME, MPFROMP(dv), MPVOID))
+        PostMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_UPDATE, 0), MPVOID);
     break;
   case IDM_SIZES:
@@ -377 +383 @@
           (fEjectFlpyScan ? TRUE : parm[1] > 1) &&
           (fEjectCDScan ? TRUE : !(driveflags[parm[1]] & DRIVE_CDROM)) &&
-          (fEjectRemovableScan ? TRUE : (parm[1] < 2 || driveflags[parm[1]] & DRIVE_CDROM)))
-        PostMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
+          (fEjectRemovableScan ? TRUE : (parm[1] < 2 || driveflags[parm[1]] & DRIVE_CDROM))) {
+        BOOL toggleTree = FALSE;
+  
+        if (!hwndTree) {
+          WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
+          toggleTree = TRUE;
+        }
+        WinSendMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
+        if (toggleTree)
+          WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
+      }
+    }
+    break;
+
+  case IDM_RESCAN:
+    {
+      BOOL toggleTree = FALSE;
+
+      if (!hwndTree) {
+        WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
+        toggleTree = TRUE;
+      }
+      WinSendMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
+      if (toggleTree)
+        WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
+    }
+    break;
+
+  case IDM_REFRESHREMOVABLES:
+    {
+      BOOL toggleTree = FALSE;
+
+      if (!hwndTree) {
+        WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
+        toggleTree = TRUE;
+      }
+      WinSendMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_REFRESHREMOVABLES, 0), MPVOID);
+      if (toggleTree)
+        WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
     }
     break;