Changeset 1352

Timestamp:

Dec 21, 2008, 12:44:11 AM (16 years ago)

Author:

Gregg Young

Message:

Added seek and scan to directory context menu (Ticket 167)

File:

• trunk/dll/treecnr.c (modified) (11 diffs)

trunk/dll/treecnr.c ¶

@@ -693 +693 @@
       while (list[numentries])
         numentries++;
-      if (numentries)
-        UpdateCnrList(dcd->hwndCnr, list, numentries, TRUE, dcd);
+      if (numentries) {
+        //DbgMsg(pszSrcFile, __LINE__, "UM_UPDATERECORD %s", *list);
+        UpdateCnrList(dcd->hwndCnr, list, numentries, TRUE, dcd);
+      }
     }
     return 0;
@@ -808 +810 @@
       Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
     else {
-      //PULONG pulPostCt;
-
       RemoveCnrItems(dcd->hwndCnr, NULL, 0, CMA_FREE | CMA_INVALIDATE | CMA_ERASE);
       WinSendMsg(dcd->hwndCnr,
@@ -816 +816 @@
                  CM_SCROLLWINDOW,
                  MPFROMSHORT(CMA_HORIZONTAL), MPFROMLONG(-1));
-      //if (!fInitialDriveScan) {
-        //DosWaitEventSem(DriveScanStart, 20000);
          while (StubbyScanCount != 0)
             DosSleep(50);
-        /*pulPostCt = xmallocz(sizeof(ULONG), pszSrcFile, __LINE__);
-        if (pulPostCt) {
-          DosResetEventSem(DriveScanStart, pulPostCt);
-          free(pulPostCt);
-        } */
-      //}
-      //else
-      //  fInitialDriveScan = FALSE;
       FillTreeCnr(dcd->hwndCnr, dcd->hwndParent);
       if (fOkayMinimize) {
@@ -1191 +1181 @@
 
       filename = mp1;
-      if (filename)
-        UpdateCnrRecord(hwnd, filename, TRUE, dcd);
+      if (filename) {
+        //DbgMsg(pszSrcFile, __LINE__, "UM_UPDATERECORD %s", filename);
+        UpdateCnrRecord(hwnd, filename, TRUE, dcd);
+      }
     }
     return 0;
@@ -1325 +1317 @@
         cnri.flWindowAttr &= (~(CA_MIXEDTARGETEMPH | CA_ORDEREDTARGETEMPH));
         cnri.flWindowAttr |= CV_FLOW;
-        dcd->flWindowAttr = cnri.flWindowAttr;
+        dcd->flWindowAttr = cnri.flWindowAttr;
         WinSendMsg(hwnd,
                    CM_SETCNRINFO,
                    MPFROMP(&cnri),
                    MPFROMLONG(CMA_FLWINDOWATTR | CMA_LINESPACING |
-                              CMA_CXTREEINDENT | CMA_PSORTRECORD));
+                              CMA_CXTREEINDENT | CMA_PSORTRECORD));
         if (xbeginthread(MakeObjWin,
                          327680,
@@ -1822 +1814 @@
               }
             }
-            else if (SHORT2FROMMP(mp1) == CN_EXPANDTREE) {
+            else if (SHORT2FROMMP(mp1) == CN_EXPANDTREE) {
               if (Flesh(hwnd, pci) && !dcd->suspendview && fTopDir)
                 PostMsg(hwnd, UM_TOPDIR, MPFROMP(pci), MPVOID);
@@ -1972 +1964 @@
               }
               if (!strcmp(FileSystem, CDFS) || !strcmp(FileSystem, ISOFS))
-                driveflags[x] |= (DRIVE_REMOVABLE |
-                                  DRIVE_NOTWRITEABLE | DRIVE_CDROM);
+                driveflags[x] |= (DRIVE_REMOVABLE | DRIVE_NOTWRITEABLE | DRIVE_CDROM);
               if(!strcmp(FileSystem,NTFS))
                 driveflags[x] |= DRIVE_NOTWRITEABLE;
@@ -1983 +1974 @@
                   strcmp(FileSystem, FAT32) &&
                   strcmp(FileSystem, NDFS32) &&
-                  strcmp(FileSystem, NTFS) &&
+                  strcmp(FileSystem, NTFS) &&
                   strcmp(FileSystem, HPFS386)) {
                 driveflags[x] |= DRIVE_NOLONGNAMES;
-              }
+              }
               SelectDriveIcon(pciP);
               WinSendMsg(hwnd,
@@ -2656 +2647 @@
 
       case IDM_COLLECT:
+      case IDM_GREP:
         if (!Collector) {
 
@@ -2690 +2682 @@
         else
           StartCollector(dcd->hwndParent, 4);
+        if (SHORT1FROMMP(mp1) == IDM_GREP)
+          PostMsg(Collector, WM_COMMAND,
+                  MPFROM2SHORT(IDM_GREP, 0), MPVOID);
+        else
         PostMsg(hwnd, WM_COMMAND, MPFROM2SHORT(IDM_COLLECTOR, 0), MPVOID);
         break;
@@ -3200 +3196 @@
                                      NULL,
                                      CCS_AUTOPOSITION | CCS_MINIICONS |
-                                     CCS_MINIRECORDCORE | WS_VISIBLE,
+                                     CCS_MINIRECORDCORE, //| WS_VISIBLE,
                                      0,
                                      0,