Changeset 917 for trunk/dll/mainwnd.c

Timestamp:

Jan 11, 2008, 10:41:56 PM (18 years ago)

Author:

Steven Levine

Message:

Correct/enhance settings notebook navigation, ticket #188 (Steven)
Reopen settings notebook to last selected page unless overridden, ticket #188 (Steven)
More Compare Directory overflow tweaks (Steven)

File:

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

trunk/dll/mainwnd.c

@@ -1959 +1959 @@
           strcat(li->targetpath, " %a");
           ExecOnList(hwndMain,
-                     li->targetpath, PROMPT | WINDOWED, NULL, li->list, NULL,
-                     pszSrcFile, __LINE__);
+                     li->targetpath, PROMPT | WINDOWED, NULL, li->list, NULL,
+                     pszSrcFile, __LINE__);
           FreeList(li->list);
           li->list = NULL;
@@ -2180 +2180 @@
 
       SetPresParams(hwnd,
-                    &RGBGREY,
-                    &RGBBLACK, &RGBGREY, GetPString(IDS_8HELVBOLDTEXT));
+                    &RGBGREY,
+                    &RGBBLACK, &RGBGREY, GetPString(IDS_8HELVBOLDTEXT));
       return mr;
     }
@@ -4234 +4234 @@
           CHAR szPath2[CCHMAXPATH];
           runemf2(SEPARATE,
-                  HWND_DESKTOP, pszSrcFile, __LINE__,
-                  NULL, NULL,
+                  HWND_DESKTOP, pszSrcFile, __LINE__,
+                  NULL, NULL,
                   "%s %s %s",
                   dircompare,
@@ -4425 +4425 @@
 
   case IDM_NOTEBOOK:
+  case IDM_DIRCNRSETTINGS:
+  case IDM_COLLECTORSETTINGS:
+  case IDM_TREECNRSETTINGS:
+  case IDM_ARCHIVERSETTINGS:
+  case IDM_VIEWERSETTINGS:
+  case IDM_COMPARESETTINGS:
+  case IDM_QUICKSETTINGS:
     WinDlgBox(HWND_DESKTOP,
-              hwnd, CfgDlgProc, FM3ModHandle, CFG_FRAME, MPVOID);
+              hwnd, CfgDlgProc, FM3ModHandle, CFG_FRAME, MPFROMLONG(mp1));
     break;
 
@@ -4639 +4646 @@
       }
       runemf2(type, hwnd, pszSrcFile, __LINE__,
-              path, NULL, "%s", env);
+              path, NULL, "%s", env);
     }
     break;
@@ -5388 +5395 @@
       PostMsg(hwndTree, UM_MAXIMIZE, MPVOID, MPVOID);
     fRunning = TRUE;
+    if (fWantFirstTimeInit) {
+      fWantFirstTimeInit = FALSE;
+      PostMsg(hwnd, WM_COMMAND, MPFROMLONG(IDM_QUICKSETTINGS), MPVOID);
+    }
     return 0;
   }
@@ -5593 +5604 @@
       ulSearchCount = 1;
       if (!DosFindFirst("*.TLS", &hDir, FILE_READONLY | FILE_ARCHIVED,
-                        &findbuf, sizeof(FILEFINDBUF3),
-                        &ulSearchCount, FIL_STANDARD)) {
+                        &findbuf, sizeof(FILEFINDBUF3),
+                        &ulSearchCount, FIL_STANDARD)) {
         do {
           priority_bumped();