Changeset 1434 for trunk/dll/notebook.c

Timestamp:

Jun 23, 2009, 12:52:05 AM (16 years ago)

Author:

Gregg Young

Message:

Update show label or FS in tree to initialize as driveonly and fixed typo which caused rescan to fail after the value was changed. Renamed some variables.

File:

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

trunk/dll/notebook.c

@@ -157 +157 @@
 BOOL fShowDriveOnly;
 BOOL fShowEnv;
-BOOL fShowLabel;
-BOOL fShowSysType;
+BOOL fShowDriveLabelInTree;
+BOOL fShowFSTypeInTree;
 BOOL fShowTarget;
 BOOL fStartMaximized;
@@ -1368 +1368 @@
     WinSetDlgItemText(hwnd, CFGT_ENVVARLIST, pszTreeEnvVarList);
     WinCheckButton(hwnd, CFGT_DRIVEONLY, fShowDriveOnly);
-    WinCheckButton(hwnd, CFGT_SYSTYPE, fShowSysType);
-    WinCheckButton(hwnd, CFGT_LABEL, fShowLabel);
+    WinCheckButton(hwnd, CFGT_SYSTYPE, fShowFSTypeInTree);
+    WinCheckButton(hwnd, CFGT_LABEL, fShowDriveLabelInTree);
     return 0;
 
@@ -1421 +1421 @@
     {
 
-      if ((fShowSysType != WinQueryButtonCheckstate(hwnd, CFGT_SYSTYPE)) ||
-          (fShowLabel = WinQueryButtonCheckstate(hwnd, CFGT_LABEL)))
+      if ((fShowFSTypeInTree != WinQueryButtonCheckstate(hwnd, CFGT_SYSTYPE)) ||
+          (fShowDriveLabelInTree != WinQueryButtonCheckstate(hwnd, CFGT_LABEL)))
         fShowSysTypeLabelChanged = TRUE;
-      fShowSysType = WinQueryButtonCheckstate(hwnd, CFGT_SYSTYPE);
-      fShowLabel = WinQueryButtonCheckstate(hwnd, CFGT_LABEL);
+      fShowFSTypeInTree = WinQueryButtonCheckstate(hwnd, CFGT_SYSTYPE);
+      fShowDriveLabelInTree = 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));
+      PrfWriteProfileData(fmprof, FM3Str, "ShowFSTypeInTree",
+                          &fShowFSTypeInTree, sizeof(BOOL));
+      PrfWriteProfileData(fmprof,       FM3Str, "ShowDriveLabelInTree",
+                          &fShowDriveLabelInTree, sizeof(BOOL));
       fVTreeOpensWPS = WinQueryButtonCheckstate(hwnd, CFGT_VTREEOPENSWPS);
       PrfWriteProfileData(fmprof, FM3Str, "VTreeOpensWPS", &fVTreeOpensWPS,
@@ -1459 +1461 @@
       PrfWriteProfileData(fmprof, appname, "ShowEnv", &fShowEnv, sizeof(BOOL));
       {
-        char * pszTemp = xmalloc(WinQueryDlgItemTextLength(hwnd, CFGT_ENVVARLIST) + 1, pszSrcFile, __LINE__);
+        char * pszTemp = xmalloc(WinQueryDlgItemTextLength(hwnd, CFGT_ENVVARLIST) + 1,
+                                 pszSrcFile, __LINE__);
         if (pszTemp) {
           WinQueryDlgItemText(hwnd, CFGT_ENVVARLIST, MaxComLineStrg, pszTemp);
@@ -1473 +1476 @@
                         fShowSysTypeLabelChanged)) {
           PCNRITEM pci = WinSendMsg(WinWindowFromID
-                  (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR), CM_QUERYRECORDEMPHASIS,
+                                    (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);
+          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 */
+            // pszTemp is freed in the UM_SHOWME code
           }
         }