Changeset 971 for trunk/dll

Timestamp:

Feb 23, 2008, 1:56:38 AM (18 years ago)

Author:

John Small

Message:

Ticket 230: Fix/improve code related to various state or presparam values
stored in the INI file.

Location:

trunk/dll

Files:

• dircnrs.c (modified) (2 diffs)
• mainwnd.c (modified) (5 diffs)
• notebook.c (modified) (6 diffs)

trunk/dll/dircnrs.c

@@ -1231 +1231 @@
     return 0;
 
-  case WM_PRESPARAMCHANGED:
-    PresParamChanged(hwnd, "DirCnr", mp1, mp2);
-    break;
+//   case WM_PRESPARAMCHANGED:
+//     PresParamChanged(hwnd, "DirCnr", mp1, mp2);
+//     break;
 
   case UM_UPDATERECORDLIST:
@@ -1427 +1427 @@
         CNRINFO cnri;
 
-        RestorePresParams(hwnd, "DirCnr");
+//      RestorePresParams(hwnd, "DirCnr");
         memset(&cnri, 0, sizeof(CNRINFO));
         cnri.cb = sizeof(CNRINFO);

trunk/dll/mainwnd.c

@@ -53 +53 @@
   15 Feb 08 SHL Rework ResizeChildren to honor fNoTreeGap and resize drive tree better
   19 Feb 08 JBS Stop deleting "State at last FM/2 Close" from INI file so it be accessed from States combo box.
+  22 Feb 08 JBS Ticket 230: Fix/improve various code related to state or presparam values in the INI file.
 
 ***********************************************************************/
@@ -3213 +3214 @@
               PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
           }
-          sprintf(szKey, "%sDirCnr.%lu", szPrefix, x);
-          RestorePresParams(hwndClient, szKey);
-          SavePresParams(hwndClient, "DirCnr");
+//        sprintf(szKey, "%sDirCnr.%lu", szPrefix, x);
+//        RestorePresParams(hwndClient, szKey);
+//        SavePresParams(hwndClient, "DirCnr");
           hwndDir = (HWND) WinSendMsg(hwndClient,
                                       UM_SETDIR,
@@ -3223 +3224 @@
             if (hwndC) {
               HWND hwndCnr = WinWindowFromID(hwndC, DIR_CNR);
+              sprintf(szKey, "%sDirCnr.%lu", szPrefix, x);
+              RestorePresParams(hwndCnr, szKey);
               dcd = WinQueryWindowPtr(hwndCnr, QWL_USER);
               if (dcd) {
@@ -4640 +4643 @@
               sprintf(s, "%s.DirCnr.%lu.DetailsAttr", szStateName, x);
               PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
+              sprintf(s, "%s.DirCnr.%lu.DetailsIcon", szStateName, x);
+              PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
               sprintf(s, "%s.DirCnr.%lu.DetailsLWDate", szStateName, x);
               PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
@@ -4651 +4656 @@
               PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
               sprintf(s, "%s.DirCnr.%lu.DetailsCRTime", szStateName, x);
+              PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
+              sprintf(s, "%s.DirCnr.%lu.Backgroundcolor", szStateName, x);
+              PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
+              sprintf(s, "%s.DirCnr.%lu.Fontnamesize", szStateName, x);
               PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
             }

trunk/dll/notebook.c

@@ -1397 +1397 @@
           // Save state and restore to refresh windows with new settings
           if (SaveDirCnrState(hwndMain, GetPString(IDS_FM2TEMPTEXT)) > 0) {
-            PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(2));
-            PostMsg(hwndMain, UM_RESTORE, MPVOID, MPVOID);
+            PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(2));
+//          PostMsg(hwndMain, UM_RESTORE, MPVOID, MPVOID);
+            PostMsg(MainObjectHwnd, UM_RESTORE, GetPString(IDS_FM2TEMPTEXT), MPVOID);
           }
         }
@@ -1821 +1822 @@
         PrfWriteProfileData(fmprof,
                             appname, "SubjectDisplayWidth",
-                            &SubjectDisplayWidth, sizeof(ULONG));
-        PrfWriteProfileData(fmprof,
-                            appname, "DirCnr.SubjectDisplayWidth",
                             &SubjectDisplayWidth, sizeof(ULONG));
     }
@@ -2366 +2364 @@
                             "CollectorflWindowAttr",
                             &flWindowAttr, sizeof(ULONG));
-        PrfWriteProfileData(fmprof, appname, "DirCnr.Fontnamesize", NULL, 0);
         PrfWriteProfileData(fmprof,
                             appname, "Collector.Fontnamesize", NULL, 0);
@@ -2421 +2418 @@
                             "CollectorflWindowAttr",
                             &flWindowAttr, sizeof(ULONG));
-        PrfWriteProfileData(fmprof,
-                            appname,
-                            "DirCnr.Fontnamesize",
-                            GetPString(IDS_8HELVTEXT),
-                            strlen(GetPString(IDS_8HELVTEXT)) + 1);
         PrfWriteProfileData(fmprof,
                             appname,
@@ -2484 +2476 @@
         PrfWriteProfileData(fmprof, appname, "CollectorflWindowAttr",
                             &flWindowAttr, sizeof(ULONG));
-        PrfWriteProfileData(fmprof, appname, "DirCnr.Fontnamesize",
-                            GetPString(IDS_8HELVTEXT),
-                            strlen(GetPString(IDS_8HELVTEXT)) + 1);
         PrfWriteProfileData(fmprof, appname, "Collector.Fontnamesize",
                             GetPString(IDS_8HELVTEXT),
@@ -2950 +2939 @@
       if (SaveDirCnrState(hwndMain, GetPString(IDS_FM2TEMPTEXT)) > 0) {
         // Tell window procedure to close container windows
-        PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(2));
+        PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(2));
         // Restore saved state
-        PostMsg(hwndMain, UM_RESTORE, MPVOID, MPVOID);
+//      PostMsg(hwndMain, UM_RESTORE, MPVOID, MPVOID);
+        PostMsg(MainObjectHwnd, UM_RESTORE, GetPString(IDS_FM2TEMPTEXT), MPVOID);
       }
     }