Changeset 1425 for trunk/dll

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.

Location:

trunk/dll

Files:

• fm3res.rc (modified) (1 diff)
• fm3str.h (modified) (1 diff)
• treecnr.c (modified) (2 diffs)

trunk/dll/fm3res.rc

@@ -3227 +3227 @@
     IDS_ASSOCFILETEXT                     "; FM/2 associations file -- 5 lines: mask, cmd line, sig, offset, flags\n;  For OS/2 associations only, uncomment following 5 lines:\n;*\n;<>\n;\n;0\n;0\n"
     IDS_TOOLFILETEXT                      "; Fixed: Ticket 267\n;\n; This file contains definitions for an FM/2 toolbar.\n;\n; To edit this file manually, see ""Manual edit of toolbar files""\n; in the FM/2 help file.\n;\n;\n"
-    IDS_TREESTATUSSTARTTEXT               " [%c:  \"%s\"  SN: %08lx%s]"
+    IDS_TREESTATUSSTARTTEXT               "%c:[%s] \"%s\" SN: %08lx%s"
+    IDS_TREESTATUSSTART1TEXT              "%c:%s \"%s\" SN: %08lx%s"
+    IDS_TREESTATUSSTART2TEXT              "%c:[%s] %s SN: %08lx%s"
     IDS_GREPFILETEXT                      "; FM/2 seek and scan mask file, one mask set per line\n"
     IDS_CMINSERTERRTEXT                   "Record insert failed"

trunk/dll/fm3str.h

@@ -948 +948 @@
 #define IDS_TOOLFILETEXT                                      959
 #define IDS_TREESTATUSSTARTTEXT                               960
-#define IDS_GREPFILETEXT                                      961
-#define IDS_CMINSERTERRTEXT                                   963
-#define IDS_CMALLOCRECERRTEXT                                 964
+#define IDS_TREESTATUSSTART1TEXT                              961
+#define IDS_TREESTATUSSTART2TEXT                              962
+#define IDS_GREPFILETEXT                                      963
+#define IDS_CMINSERTERRTEXT                                   964
+#define IDS_CMALLOCRECERRTEXT                                 965
 #define IDS_NOWINDOWTEXT                                      968
 #define IDS_2SYSTEMVIOTEXT                                    969

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 ||