Changeset 1428 for trunk/dll/treecnr.c

Timestamp:

Jun 8, 2009, 1:09:55 AM (16 years ago)

Author:

Gregg Young

Message:

Improvement to status line 1 for selected drives (number of drives is shown at the beginning of the line if split status line is not selected); Comments for recent changes.

File:

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

trunk/dll/treecnr.c

@@ -66 +66 @@
   12 Mar 09 SHL Use common SearchContainer
   14 Mar 09 GKY Prevent execution of UM_SHOWME while drive scan is occuring
-
+  06 Jun 09 GKY Add option to show file system type or drive label in tree
+  06 Jun 09 GKY Status line to show file sys/label not shown in tree; shortened to fit split status
+  07 Jun 09 GKY Fixed double names in tree container when collapsed tree is accessed
+                before recursive scan
 ***********************************************************************/
 
@@ -788 +791 @@
               else
                 strcpy(szTmpLabel, volser.volumelabel);
-
-              sprintf(s,
-                      GetPString(fShowSysType ? IDS_TREESTATUSSTART1TEXT : fShowLabel
-                                 ? IDS_TREESTATUSSTART2TEXT : IDS_TREESTATUSSTARTTEXT),
-                      toupper(*pci->pszFileName), FileSystem,
-                      szTmpLabel, volser.serial, szFree);
+              if (fSplitStatus)
+                sprintf(s,
+                        GetPString(fShowSysType ? IDS_TREESTATUSSTART1TEXT : fShowLabel
+                                   ? IDS_TREESTATUSSTART2TEXT : IDS_TREESTATUSSTARTTEXT),
+                        toupper(*pci->pszFileName), FileSystem,
+                        szTmpLabel, volser.serial, szFree);
+              else {
+                strcat(s, " [");
+                sprintf(&s[strlen(s)],
+                        GetPString(fShowSysType ? IDS_TREESTATUSSTART1TEXT : fShowLabel
+                                   ? IDS_TREESTATUSSTART2TEXT : IDS_TREESTATUSSTARTTEXT),
+                        toupper(*pci->pszFileName), FileSystem,
+                        szTmpLabel, volser.serial, szFree);
+                strcat(s, "]");
+              }
               if (!fMoreButtons) {
                 if (*dcd->mask.szMask ||