Changeset 1425 for trunk/dll/treecnr.c

Timestamp:

Jun 6, 2009, 10:39:47 PM (16 years ago)

Author:

Gregg Young

Message:

Changed status1 line for drives to show label/systype not shown in tree or both if nothing in tree; made changes to shorten string to better fit in the status window.

File:

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

trunk/dll/treecnr.c

@@ -743 +743 @@
       CHAR szFree[64];
       CNRINFO cnri;
+      CHAR FileSystem[CCHMAXPATH * 2];
+      CHAR szTmpLabel[CCHMAXPATH];
+      ULONG type;
 
       strcpy(s, GetPString(IDS_TREETEXT));
@@ -773 +776 @@
               else
                 *szFree = 0;
-              driveserial[toupper(*pci->pszFileName) - 'A'] = volser.serial;
-              sprintf(&s[strlen(s)],
-                      GetPString(IDS_TREESTATUSSTARTTEXT),
-                      toupper(*pci->pszFileName),
-                      volser.volumelabel, volser.serial, szFree);
+              driveserial[toupper(*pci->pszFileName) - 'A'] = volser.serial;
+              if (CheckDrive(toupper(*pci->pszFileName), FileSystem, &type) == -1 || fShowSysType)
+                strcpy(FileSystem, "");
+              if (fShowLabel)
+                strcpy(szTmpLabel, "");
+              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 (!fMoreButtons) {
                 if (*dcd->mask.szMask ||