Changeset 1365 for trunk/dll/notebook.c

Timestamp:

Jan 1, 2009, 8:00:28 PM (17 years ago)

Author:

Gregg Young

Message:

Add option to rescan drive tree on media eject Ticket 48; Remove error message when priovious notebook page isn't defined (fixes issue with new installs) Ticket 329

File:

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

trunk/dll/notebook.c

@@ -105 +105 @@
 BOOL fDragndropDlg;
 BOOL fDrivebarHelp;
+BOOL fEjectCDScan;
+BOOL fEjectFlpyScan;
+BOOL fEjectRemovableScan;
 BOOL fExternalArcboxes;
 BOOL fExternalCollector;
@@ -475 +478 @@
     WinCheckButton(hwnd, CFGS_FORCELOWER, fForceLower);
     WinCheckButton(hwnd, CFGS_FORCEUPPER, fForceUpper);
+    WinCheckButton(hwnd, CFGS_REMOTEBUG, fRemoteBug);
     WinCheckButton(hwnd, CFGS_NOREMOVABLESCAN, fNoRemovableScan);
     WinCheckButton(hwnd, CFGS_RSCANLOCAL, fRScanLocal);
@@ -481 +485 @@
     WinCheckButton(hwnd, CFGS_RSCANSLOW, fRScanSlow);
     WinCheckButton(hwnd, CFGS_RSCANNOWRITE, fRScanNoWrite);
-    WinCheckButton(hwnd, CFGS_REMOTEBUG, fRemoteBug);
+    WinCheckButton(hwnd, CFGS_EJECTREMOVABLESCAN, fEjectRemovableScan);
+    WinCheckButton(hwnd, CFGS_EJECTCDSCAN, fEjectCDScan);
+    WinCheckButton(hwnd, CFGS_EJECTFLPYSCAN, fEjectFlpyScan);
     WinSendDlgItemMsg(hwnd, CFGS_FILESTOGET, SPBM_SETCURRENTVALUE,
                       MPFROMLONG(FilesToGet), MPVOID);
@@ -556 +562 @@
                         sizeof(BOOL));
     fNoRemovableScan = WinQueryButtonCheckstate(hwnd, CFGS_NOREMOVABLESCAN);
-    PrfWriteProfileData(fmprof, FM3Str, "NoRemovableScan", &fNoRemovableScan,
+    PrfWriteProfileData(fmprof, appname, "NoRemovableScan", &fNoRemovableScan,
+                        sizeof(BOOL));
+    fEjectRemovableScan = WinQueryButtonCheckstate(hwnd, CFGS_EJECTREMOVABLESCAN);
+    PrfWriteProfileData(fmprof, appname, "EjectRemovableScan", &fEjectRemovableScan,
+                        sizeof(BOOL));
+    fEjectCDScan = WinQueryButtonCheckstate(hwnd, CFGS_EJECTCDSCAN);
+    PrfWriteProfileData(fmprof, appname, "EjectCDScan", &fEjectCDScan,
+                        sizeof(BOOL));
+    fEjectFlpyScan = WinQueryButtonCheckstate(hwnd, CFGS_EJECTFLPYSCAN);
+    PrfWriteProfileData(fmprof, appname, "EjectFlpyScan", &fEjectFlpyScan,
                         sizeof(BOOL));
     fNoIconsFiles = WinQueryButtonCheckstate(hwnd, CFGS_NOICONSFILES);
@@ -3676 +3691 @@
           else {
             mp2 = WinSendMsg(mi.hwndSubMenu, MM_QUERYDEFAULTITEMID, MPVOID, MPVOID);
-            if (!mp2)
-              Runtime_Error(pszSrcFile, __LINE__, "MM_QUERYDEFAULTITEMID");
+            //if (!mp2)
+            //  mp2 = MPFROMLONG(IDM_QUICKSETTINGS);
+              //Runtime_Error(pszSrcFile, __LINE__, "MM_QUERYDEFAULTITEMID");
           }
         }