Changeset 1434 for trunk/dll/treecnr.c

Timestamp:

Jun 23, 2009, 12:52:05 AM (16 years ago)

Author:

Gregg Young

Message:

Update show label or FS in tree to initialize as driveonly and fixed typo which caused rescan to fail after the value was changed. Renamed some variables.

File:

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

trunk/dll/treecnr.c

@@ -274 +274 @@
         if (!stricmp(dirname, pciP->pszFileName))
           break;                        // Found it
-        if (~pciP->rc.flRecordAttr & CRA_EXPANDED)
-          WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciP), MPVOID);
+        if (~pciP->rc.flRecordAttr & CRA_EXPANDED) {
+          if (!(driveflags[toupper(*pciP->pszFileName) - 'A'] & DRIVE_RSCANNED)) {
+            WinSendMsg(hwndCnr, UM_RESCAN, MPFROMP(pciP), MPVOID);
+            WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciP), MPVOID);
+          }
+          else
+            WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciP), MPVOID);
+        }
         strcpy(szDir, dirname);
         if (p - szDir >= strlen(szDir))
@@ -330 +336 @@
                           MPFROM2SHORT(CMA_PARENT, CMA_ITEMORDER));
         if (pciP && (INT) pciP != -1) {
-          if (!(pciP->rc.flRecordAttr & CRA_EXPANDED))
-            WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciP), MPVOID);
+          if (!(pciP->rc.flRecordAttr & CRA_EXPANDED)) {
+            if (!(driveflags[toupper(*pciP->pszFileName) - 'A'] & DRIVE_RSCANNED)) {
+              WinSendMsg(hwndCnr, UM_RESCAN, MPFROMP(pciP), MPVOID);
+              WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciP), MPVOID);
+            }
+            else
+              WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciP), MPVOID);
+          }
           pciToSelect = pciP;
         }
@@ -363 +375 @@
   }
   WinEnableWindowUpdate(hwndCnr, TRUE);
-  // DosSleep(1);                       // Let GUI update
+  //DosSleep(1);                        // Let GUI update
 }
 
@@ -786 +798 @@
               driveserial[toupper(*pci->pszFileName) - 'A'] = volser.serial;
               if (CheckDrive(toupper(*pci->pszFileName), FileSystem, &type) == -1 ||
-                  fShowSysType)
+                  fShowFSTypeInTree)
                 strcpy(FileSystem, "");
-              if (fShowLabel)
+              if (fShowDriveLabelInTree)
                 strcpy(szTmpLabel, "");
               else
@@ -798 +810 @@
                 strcat(temp, "]");
                 sprintf(s,
-                        GetPString(fShowSysType ? IDS_TREESTATUSSTART1TEXT : fShowLabel
+                        GetPString(fShowFSTypeInTree ? IDS_TREESTATUSSTART1TEXT :
+                                   fShowDriveLabelInTree
                                    ? IDS_TREESTATUSSTART2TEXT : IDS_TREESTATUSSTARTTEXT),
                         toupper(*pci->pszFileName), FileSystem,
@@ -807 +820 @@
                 strcat(s, " [");
                 sprintf(&s[strlen(s)],
-                        GetPString(fShowSysType ? IDS_TREESTATUSSTART1TEXT : fShowLabel
+                        GetPString(fShowFSTypeInTree ? IDS_TREESTATUSSTART1TEXT :
+                                   fShowDriveLabelInTree
                                    ? IDS_TREESTATUSSTART2TEXT : IDS_TREESTATUSSTARTTEXT),
                         toupper(*pci->pszFileName), FileSystem,