Changeset 869 for branches/ticket_150/dll/dircnrs.c

Timestamp:

Nov 13, 2007, 12:25:28 AM (18 years ago)

Author:

John Small

Message:

A "first draft" of code to address ticket 150.

File:

• branches/ticket_150/dll/dircnrs.c (modified) (5 diffs)

branches/ticket_150/dll/dircnrs.c

@@ -1419 +1419 @@
 
         CNRINFO cnri;
+//         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");
-        LoadDetailsSwitches("DirCnr", dcd);
+//      LoadDetailsSwitches("DirCnr", dcd);
         memset(&cnri, 0, sizeof(CNRINFO));
         cnri.cb = sizeof(CNRINFO);
@@ -1478 +1482 @@
                               CMA_CXTREEINDENT | CMA_PSORTRECORD));
         SetCnrCols(hwnd, FALSE);
-        AdjustCnrColsForPref(hwnd, NULL, dcd, FALSE);
+//      AdjustCnrColsForPref(hwnd, NULL, dcd, FALSE);
         if (_beginthread(MakeObjWin, NULL, 245760, (PVOID) dcd) == -1) {
           Runtime_Error(pszSrcFile, __LINE__,
@@ -1495 +1499 @@
       SayView(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
                               DIR_VIEW), dcd->flWindowAttr);
+    }
+    else {
+      PostMsg(hwnd, WM_CLOSE, MPVOID, MPVOID);
+      return 0;
+    }
+    return 0;
+
+  case UM_SETUP2:
+    if (dcd)
+    {
+      AdjustCnrColsForPref(hwnd, NULL, dcd, FALSE);
     }
     else {
@@ -2135 +2150 @@
                               dcd->hwndLastMenu,
                               SHORT1FROMMP(mp1),
-                              dcd->directory, "DirCnr", dcd, FALSE);
+//                            dcd->directory, "DirCnr", dcd, FALSE);
+                              dcd->directory, NULL, dcd, FALSE);
         break;
 
@@ -3394 +3410 @@
         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;
         strcpy(dcd->directory, directory);
         add_udir(FALSE, directory);