Changeset 1431

Timestamp:

Jun 13, 2009, 7:03:02 PM (16 years ago)

Author:

Gregg Young

Message:

Changed 3 way button to radio buttons and added rescan on change to add systype/label to tree enhancement.

Location:

trunk/dll

Files:

• fm3dlg.h (modified) (1 diff)
• fm3res.dlg (modified) (1 diff)
• init.c (modified) (1 diff)
• ipf/notebook.ipf (modified) (1 diff)
• notebook.c (modified) (5 diffs)
• notebook.h (modified) (1 diff)
• treecnr.c (modified) (3 diffs)

trunk/dll/fm3dlg.h

@@ -616 +616 @@
 #define CFGT_SHOWENV                                                                    25059
 #define CFGT_ENVVARLIST                                                                 25060
-#define CFGT_SYSTYPELABEL                                                               25061
+#define CFGT_SYSTYPE                                                                    25061
+#define CFGT_LABEL                                                                      25062
+#define CFGT_DRIVEONLY                                                                  25063
 
 #define CFGC_FRAME                                                                              25100

trunk/dll/fm3res.dlg

@@ -1971 +1971 @@
         AUTOCHECKBOX    "Show ~env. vars in Tree", CFGT_SHOWENV, 4, 32, 110,
                         10
-        CONTROL         "Show file system type \"x\" or drive label \"=\" in tree(~3-state)", 
-                        CFGT_SYSTYPELABEL, 122, 128, 196, 10, 
-                        WC_BUTTON, BS_AUTO3STATE | WS_TABSTOP | WS_VISIBLE                
+        GROUPBOX        "Show in tree beside drive letter", -1, 140, 99, 126, 45, NOT WS_GROUP                
+        AUTORADIOBUTTON "Drive letter only", CFGT_DRIVEONLY, 152, 128, 106, 10, WS_GROUP
+        AUTORADIOBUTTON "File system type", CFGT_SYSTYPE, 152, 116, 106, 10
+        AUTORADIOBUTTON "Drive label", CFGT_LABEL, 152, 104, 106, 10                
         ENTRYFIELD      "", CFGT_ENVVARLIST, 120, 32, 196, 8, ES_MARGIN | ES_AUTOSCROLL
         PUSHBUTTON      "~Help", IDM_HELP, 8, 4, 40, 14, BS_NOPOINTERFOCUS |

trunk/dll/init.c

@@ -1312 +1312 @@
                         pszTreeEnvVarList, MaxComLineStrg);
   size = sizeof(BOOL);
+  PrfQueryProfileData(fmprof, FM3Str, "ShowDriveOnly", &fShowDriveOnly, &size);
+  size = sizeof(BOOL);
   PrfQueryProfileData(fmprof, FM3Str, "ShowSysType", &fShowSysType, &size);
   size = sizeof(BOOL);

trunk/dll/ipf/notebook.ipf

@@ -364 +364 @@
 Note that the pseudo-variable LIBPATH is also supported.
 :p.
-:hp6.Show file system type or drive label in tree (3-state button):ehp6. This
-setting allows you to list either the file system type or the drive label 
-following the drive letter in the tree container. The status line at the bottom 
+:hp6.Show in tree beside drive letter (radiobuttons):ehp6. This
+setting allows you to list either the file system type, the drive label or nothing 
+beside the drive letter in the tree container. The status line at the bottom 
 left lists the information you choose not to list in the tree in addition
 to the drive's serial number and the amount of free space. When split status line
 is selected on the :link reftype=hd res=97000."Monolithic":elink. notebook page, 
-the total number of drives only appears when an empty removable drive is selected. 
-The total number of drives preceeds the drive description for all drives if 
-the status lines aren't split.
+the total number of drives is moved to the end of the line and maybe truncated
+depending on window size and screen resolution.The total number of drives 
+preceeds the drive description for all drives if the status lines aren't split.
 
 :h3 res=99990 name=PANEL_TREESORTPAGE.Tree sort/views page

trunk/dll/notebook.c

@@ -155 +155 @@
 BOOL fSaveState;
 BOOL fSeparateParms;
+BOOL fShowDriveOnly;
 BOOL fShowEnv;
 BOOL fShowLabel;
@@ -1346 +1347 @@
   BOOL fShowEnvChanged = FALSE;
   BOOL fTreeEnvVarListChanged = FALSE;
+  BOOL fShowSysTypeLabelChanged = FALSE;
 
   switch (msg) {
@@ -1365 +1367 @@
     WinCheckButton(hwnd, CFGT_SHOWENV, fShowEnv);
     WinSetDlgItemText(hwnd, CFGT_ENVVARLIST, pszTreeEnvVarList);
-    {
-      long th = fShowLabel ? 2 : (fShowSysType ? 1 : 0);
-      WinCheckButton(hwnd, CFGT_SYSTYPELABEL, th);
-    }
+    WinCheckButton(hwnd, CFGT_DRIVEONLY, fShowDriveOnly);
+    WinCheckButton(hwnd, CFGT_SYSTYPE, fShowSysType);
+    WinCheckButton(hwnd, CFGT_LABEL, fShowLabel);
     return 0;
 
@@ -1419 +1420 @@
   case WM_CLOSE:
     {
-      long test;
-  
-      test = WinQueryButtonCheckstate(hwnd, CFGT_SYSTYPELABEL);
-      fShowSysType = (test == 1);
-      fShowLabel = (test == 2);
+
+      if ((fShowSysType != WinQueryButtonCheckstate(hwnd, CFGT_SYSTYPE)) ||
+          (fShowLabel = WinQueryButtonCheckstate(hwnd, CFGT_LABEL)))
+        fShowSysTypeLabelChanged = TRUE;
+      fShowSysType = WinQueryButtonCheckstate(hwnd, CFGT_SYSTYPE);
+      fShowLabel = WinQueryButtonCheckstate(hwnd, CFGT_LABEL);
+      fShowDriveOnly = WinQueryButtonCheckstate(hwnd, CFGT_DRIVEONLY);
+      PrfWriteProfileData(fmprof, FM3Str, "ShowDriveOnly", &fShowDriveOnly, sizeof(BOOL));
       PrfWriteProfileData(fmprof, FM3Str, "ShowSysType", &fShowSysType, sizeof(BOOL));
       PrfWriteProfileData(fmprof,       FM3Str, "ShowLabel", &fShowLabel, sizeof(BOOL));
@@ -1466 +1470 @@
           free(pszTemp);
         }
-        if (hwndTree && (fShowEnvChanged || (fShowEnv && fTreeEnvVarListChanged)))
-        {
+        if (hwndTree && (fShowEnvChanged || (fShowEnv && fTreeEnvVarListChanged) ||
+                        fShowSysTypeLabelChanged)) {
           PCNRITEM pci = WinSendMsg(WinWindowFromID
                   (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR), CM_QUERYRECORDEMPHASIS,

trunk/dll/notebook.h

@@ -90 +90 @@
 extern BOOL fSaveState;
 extern BOOL fSeparateParms;
+extern BOOL fShowDriveOnly;
 extern BOOL fShowEnv;
 extern BOOL fShowLabel;

trunk/dll/treecnr.c

@@ -785 +785 @@
                 *szFree = 0;
               driveserial[toupper(*pci->pszFileName) - 'A'] = volser.serial;
-              if (CheckDrive(toupper(*pci->pszFileName), FileSystem, &type) == -1 || fShowSysType)
+              if (CheckDrive(toupper(*pci->pszFileName), FileSystem, &type) == -1 ||
+                  fShowSysType)
                 strcpy(FileSystem, "");
               if (fShowLabel)
@@ -791 +792 @@
               else
                 strcpy(szTmpLabel, volser.volumelabel);
-              if (fSplitStatus)
+              if (fSplitStatus) {
+                CHAR temp[CCHMAXPATH] = " [";
+
+                strcat(temp, s);
+                strcat(temp, "]");
                 sprintf(s,
                         GetPString(fShowSysType ? IDS_TREESTATUSSTART1TEXT : fShowLabel
@@ -797 +802 @@
                         toupper(*pci->pszFileName), FileSystem,
                         szTmpLabel, volser.serial, szFree);
+                strcat(s, temp);
+              }
               else {
                 strcat(s, " [");