Changeset 930 for trunk/dll/dircnrs.c

Timestamp:

Jan 19, 2008, 2:54:06 PM (18 years ago)

Author:

John Small

Message:

Some code "cleanup" for ticket 150.

File:

• trunk/dll/dircnrs.c (modified) (7 diffs)

trunk/dll/dircnrs.c

@@ -33 +33 @@
   22 Nov 07 GKY Use CopyPresParams to fix presparam inconsistencies in menus
   10 Jan 08 SHL Sync with CfgDlgProc mods
+  xx Jan 08 JBS Ticket 150: fix/improve save and restore of dir cnr state at FM/2 close/reopen
 
 ***********************************************************************/
@@ -1423 +1424 @@
 
         CNRINFO cnri;
-// JBS     static int i = 0;
-//             FILE * f = fopen("e:\\dev\\netlabs\\fm2\\trunk\\jbsdebug.log", "a");
-//             fprintf(f, "UM_SETUP Dir: %s; Count: %d Details: %d %d %d %d\n", dcd->directory, ++i, (int)dcd->detailscrdate, (int)dcd->detailscrtime, (int)dcd->detailsladate, (int)dcd->detailsladate);
-//             fclose(f);
 
         RestorePresParams(hwnd, "DirCnr");
-// JBS  LoadDetailsSwitches("DirCnr", dcd);
         memset(&cnri, 0, sizeof(CNRINFO));
         cnri.cb = sizeof(CNRINFO);
@@ -1486 +1482 @@
                               CMA_CXTREEINDENT | CMA_PSORTRECORD));
         SetCnrCols(hwnd, FALSE);
-// JBS  AdjustCnrColsForPref(hwnd, NULL, dcd, FALSE);
         if (_beginthread(MakeObjWin, NULL, 245760, (PVOID) dcd) == -1) {
           Runtime_Error(pszSrcFile, __LINE__,
@@ -2040 +2035 @@
 
       case IDM_RESORT:
-//            WinSendMsg(hwnd,
-//                       CM_SORTRECORD,
-//                       MPFROMP(SortDirCnr),
-//                       MPFROMLONG((fSyncUpdates) ? sortFlags : dcd->sortFlags));
+//          WinSendMsg(hwnd,
+//                     CM_SORTRECORD,
+//                     MPFROMP(SortDirCnr),
+//                     MPFROMLONG((fSyncUpdates) ? sortFlags : dcd->sortFlags));
         WinSendMsg(hwnd,
                    CM_SORTRECORD,
@@ -2162 +2157 @@
                               dcd->hwndLastMenu,
                               SHORT1FROMMP(mp1),
-// JBS                        dcd->directory, "DirCnr", dcd, FALSE);
                               dcd->directory, NULL, dcd, FALSE);
         break;
@@ -2594 +2588 @@
         if (pci->attrFile & FILE_DIRECTORY) {
           menuHwnd = CheckMenu(hwndMainMenu, &DirMenu, DIR_POPUP);
-//            WinEnableMenuItem(DirMenu,IDM_TREE,TRUE);
+//          WinEnableMenuItem(DirMenu,IDM_TREE,TRUE);
         }
         else
@@ -3429 +3423 @@
         dcd->hwndRestore = hwndRestore;
         dcd->dontclose = ((flags & 1) != 0);
-        dcd->detailslongname = detailslongname;
-        dcd->detailssubject = detailssubject;
-        dcd->detailsea = detailsea;
-        dcd->detailssize = detailssize;
-        dcd->detailsicon = detailsicon;
-        dcd->detailsattr = detailsattr;
-        dcd->detailscrdate = detailscrdate;
-        dcd->detailscrtime = detailscrtime;
-        dcd->detailslwdate = detailslwdate;
-        dcd->detailslwtime = detailslwtime;
-        dcd->detailsladate = detailsladate;
-        dcd->detailslatime = detailslatime;
+        dcd->detailslongname = detailslongname;
+        dcd->detailssubject = detailssubject;
+        dcd->detailsea = detailsea;
+        dcd->detailssize = detailssize;
+        dcd->detailsicon = detailsicon;
+        dcd->detailsattr = detailsattr;
+        dcd->detailscrdate = detailscrdate;
+        dcd->detailscrtime = detailscrtime;
+        dcd->detailslwdate = detailslwdate;
+        dcd->detailslwtime = detailslwtime;
+        dcd->detailsladate = detailsladate;
+        dcd->detailslatime = detailslatime;
         strcpy(dcd->directory, directory);
         add_udir(FALSE, directory);