Changeset 1424 for trunk/dll/notebook.c

Timestamp:

Jun 6, 2009, 9:16:12 PM (16 years ago)

Author:

Gregg Young

Message:

Show either file system type or drive label beside dirve letter in tree. (tickets 47 & 339)

File:

• trunk/dll/notebook.c (modified) (3 diffs)

trunk/dll/notebook.c

@@ -155 +155 @@
 BOOL fSeparateParms;
 BOOL fShowEnv;
+BOOL fShowLabel;
+BOOL fShowSysType;
 BOOL fShowTarget;
 BOOL fStartMaximized;
@@ -1362 +1364 @@
     WinCheckButton(hwnd, CFGT_SHOWENV, fShowEnv);
     WinSetDlgItemText(hwnd, CFGT_ENVVARLIST, pszTreeEnvVarList);
+    {
+      long th = fShowLabel ? 2 : (fShowSysType ? 1 : 0);
+      WinCheckButton(hwnd, CFGT_SYSTYPELABEL, th);
+    }
     return 0;
 
@@ -1411 +1417 @@
 
   case WM_CLOSE:
-    fVTreeOpensWPS = WinQueryButtonCheckstate(hwnd, CFGT_VTREEOPENSWPS);
-    PrfWriteProfileData(fmprof, FM3Str, "VTreeOpensWPS", &fVTreeOpensWPS,
-                        sizeof(BOOL));
-    fCollapseFirst = WinQueryButtonCheckstate(hwnd, CFGT_COLLAPSEFIRST);
-    PrfWriteProfileData(fmprof, appname, "CollapseFirst", &fCollapseFirst,
-                        sizeof(BOOL));
-    fSwitchTreeOnFocus = WinQueryButtonCheckstate(hwnd,
-                                                  CFGT_SWITCHTREEONFOCUS);
-    PrfWriteProfileData(fmprof, appname, "SwitchTreeOnFocus",
-                        &fSwitchTreeOnFocus, sizeof(BOOL));
-    fSwitchTreeExpand = WinQueryButtonCheckstate(hwnd, CFGT_SWITCHTREEEXPAND);
-    PrfWriteProfileData(fmprof, appname, "SwitchTreeExpand",
-                        &fSwitchTreeExpand, sizeof(BOOL));
-    fSwitchTree = WinQueryButtonCheckstate(hwnd, CFGT_SWITCHTREE);
-    PrfWriteProfileData(fmprof, appname, "SwitchTree", &fSwitchTree,
-                        sizeof(BOOL));
-    fFollowTree = WinQueryButtonCheckstate(hwnd, CFGT_FOLLOWTREE);
-    PrfWriteProfileData(fmprof, appname, "FollowTree", &fFollowTree,
-                        sizeof(BOOL));
-    fTopDir = WinQueryButtonCheckstate(hwnd, CFGT_TOPDIR);
-    PrfWriteProfileData(fmprof, appname, "TopDir", (PVOID) & fTopDir,
-                        sizeof(BOOL));
-    fDCOpens = WinQueryButtonCheckstate(hwnd, CFGT_DCOPENS);
-    PrfWriteProfileData(fmprof, FM3Str, "DoubleClickOpens", &fDCOpens,
-                        sizeof(BOOL));
-    fShowEnvChanged = (fShowEnv != WinQueryButtonCheckstate(hwnd, CFGT_SHOWENV));
-    fShowEnv = WinQueryButtonCheckstate(hwnd, CFGT_SHOWENV);
-    PrfWriteProfileData(fmprof, appname, "ShowEnv", &fShowEnv, sizeof(BOOL));
     {
-      char * pszTemp = xmalloc(WinQueryDlgItemTextLength(hwnd, CFGT_ENVVARLIST) + 1, pszSrcFile, __LINE__);
-      if (pszTemp) {
-        WinQueryDlgItemText(hwnd, CFGT_ENVVARLIST, MaxComLineStrg, pszTemp);
-        strupr(pszTemp);
-        if (strcmp(pszTemp, pszTreeEnvVarList)) {
-          fTreeEnvVarListChanged = TRUE;
-          strcpy(pszTreeEnvVarList, pszTemp);
-          PrfWriteProfileString(fmprof, appname, "TreeEnvVarList", pszTreeEnvVarList);
-        }
-        free(pszTemp);
-      }
-      if (hwndTree && (fShowEnvChanged || (fShowEnv && fTreeEnvVarListChanged)))
+      long test;
+  
+      test = WinQueryButtonCheckstate(hwnd, CFGT_SYSTYPELABEL);
+      fShowSysType = (test == 1);
+      fShowLabel = (test == 2);
+      PrfWriteProfileData(fmprof, FM3Str, "ShowSysType", &fShowSysType, sizeof(BOOL));
+      PrfWriteProfileData(fmprof,       FM3Str, "ShowLabel", &fShowLabel, sizeof(BOOL));
+      fVTreeOpensWPS = WinQueryButtonCheckstate(hwnd, CFGT_VTREEOPENSWPS);
+      PrfWriteProfileData(fmprof, FM3Str, "VTreeOpensWPS", &fVTreeOpensWPS,
+                          sizeof(BOOL));
+      fCollapseFirst = WinQueryButtonCheckstate(hwnd, CFGT_COLLAPSEFIRST);
+      PrfWriteProfileData(fmprof, appname, "CollapseFirst", &fCollapseFirst,
+                          sizeof(BOOL));
+      fSwitchTreeOnFocus = WinQueryButtonCheckstate(hwnd,
+                                                    CFGT_SWITCHTREEONFOCUS);
+      PrfWriteProfileData(fmprof, appname, "SwitchTreeOnFocus",
+                          &fSwitchTreeOnFocus, sizeof(BOOL));
+      fSwitchTreeExpand = WinQueryButtonCheckstate(hwnd, CFGT_SWITCHTREEEXPAND);
+      PrfWriteProfileData(fmprof, appname, "SwitchTreeExpand",
+                          &fSwitchTreeExpand, sizeof(BOOL));
+      fSwitchTree = WinQueryButtonCheckstate(hwnd, CFGT_SWITCHTREE);
+      PrfWriteProfileData(fmprof, appname, "SwitchTree", &fSwitchTree,
+                          sizeof(BOOL));
+      fFollowTree = WinQueryButtonCheckstate(hwnd, CFGT_FOLLOWTREE);
+      PrfWriteProfileData(fmprof, appname, "FollowTree", &fFollowTree,
+                          sizeof(BOOL));
+      fTopDir = WinQueryButtonCheckstate(hwnd, CFGT_TOPDIR);
+      PrfWriteProfileData(fmprof, appname, "TopDir", (PVOID) & fTopDir,
+                          sizeof(BOOL));
+      fDCOpens = WinQueryButtonCheckstate(hwnd, CFGT_DCOPENS);
+      PrfWriteProfileData(fmprof, FM3Str, "DoubleClickOpens", &fDCOpens,
+                          sizeof(BOOL));
+      fShowEnvChanged = (fShowEnv != WinQueryButtonCheckstate(hwnd, CFGT_SHOWENV));
+      fShowEnv = WinQueryButtonCheckstate(hwnd, CFGT_SHOWENV);
+      PrfWriteProfileData(fmprof, appname, "ShowEnv", &fShowEnv, sizeof(BOOL));
       {
-        PCNRITEM pci = WinSendMsg(WinWindowFromID
-                (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR), CM_QUERYRECORDEMPHASIS,
-                                  MPFROMLONG(CMA_FIRST),
-                                  MPFROMSHORT(CRA_SELECTED));
-        PostMsg(WinWindowFromID
-                (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR), WM_COMMAND,
-                MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
-        pszTemp = xstrdup(pci->pszFileName, pszSrcFile, __LINE__);
-        if (pszTemp) {
-          if (!PostMsg(hwndTree, UM_SHOWME, MPFROMP(pszTemp), MPVOID))
-            free(pszTemp);
-          /* pszTemp is freed in the UM_SHOWME code */
-        }
-      }
-    }
-    break;
+        char * pszTemp = xmalloc(WinQueryDlgItemTextLength(hwnd, CFGT_ENVVARLIST) + 1, pszSrcFile, __LINE__);
+        if (pszTemp) {
+          WinQueryDlgItemText(hwnd, CFGT_ENVVARLIST, MaxComLineStrg, pszTemp);
+          strupr(pszTemp);
+          if (strcmp(pszTemp, pszTreeEnvVarList)) {
+            fTreeEnvVarListChanged = TRUE;
+            strcpy(pszTreeEnvVarList, pszTemp);
+            PrfWriteProfileString(fmprof, appname, "TreeEnvVarList", pszTreeEnvVarList);
+          }
+          free(pszTemp);
+        }
+        if (hwndTree && (fShowEnvChanged || (fShowEnv && fTreeEnvVarListChanged)))
+        {
+          PCNRITEM pci = WinSendMsg(WinWindowFromID
+                  (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR), CM_QUERYRECORDEMPHASIS,
+                                    MPFROMLONG(CMA_FIRST),
+                                    MPFROMSHORT(CRA_SELECTED));
+          PostMsg(WinWindowFromID
+                  (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR), WM_COMMAND,
+                  MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
+          pszTemp = xstrdup(pci->pszFileName, pszSrcFile, __LINE__);
+          if (pszTemp) {
+            if (!PostMsg(hwndTree, UM_SHOWME, MPFROMP(pszTemp), MPVOID))
+              free(pszTemp);
+            /* pszTemp is freed in the UM_SHOWME code */
+          }
+        }
+      }
+      break;
+    }
   }
   return WinDefDlgProc(hwnd, msg, mp1, mp2);