Changeset 1711 for trunk/dll/notebook.c

Timestamp:

Feb 9, 2014, 11:22:11 PM (12 years ago)

Author:

Gregg Young

Message:

Fix separate parameters. Moved to general page renamed separate settings for apps. Ticket 497

File:

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

trunk/dll/notebook.c

@@ -169 +169 @@
 BOOL fRScanNoWrite;
 BOOL fSaveState;
-BOOL fSeparateParms;
 BOOL fShowDriveOnly;
 BOOL fShowEnv;
@@ -191 +190 @@
 BOOL fViewChild;
 BOOL fWarnReadOnly;
+BOOL fAppSeparateSettings;
 HINI fmprof;
 ULONG fwsAnimate;
@@ -1555 +1555 @@
     WinCheckButton(hwnd, CFGG_ALERTBEEPOFF, fAlertBeepOff);
     WinCheckButton(hwnd, CFGG_WARNREADONLY, fWarnReadOnly);
+    WinCheckButton(hwnd, CFGG_APPSEPARATESETTINGS, fAppSeparateSettings);
     {
       long th = fNoFinger ? 2 : (fNoDead ? 1 : 0);
@@ -1616 +1617 @@
     {
       long test;
+      BOOL dummy;
+
+      dummy = WinQueryButtonCheckstate(hwnd, CFGG_APPSEPARATESETTINGS);
+      if (dummy != fAppSeparateSettings) {
+        fAppSeparateSettings =  dummy;
+        PrfWriteProfileData(fmprof, realappname, "AppSeparateSettings",
+                        &fAppSeparateSettings, sizeof(BOOL));
+        WinSendMsg((HWND) WinQueryWindowULong(hwnd, QWL_USER),
+                   UM_UNDO, MPVOID, MPVOID);
+        if (fAppSeparateSettings)
+          strcpy(appname, realappname);
+        else
+          strcpy(appname, FM3Str);
+      }
 
       test = WinQueryButtonCheckstate(hwnd, CFGG_NODEAD);
@@ -1682 +1697 @@
     fWarnReadOnly = WinQueryButtonCheckstate(hwnd, CFGG_WARNREADONLY);
     PrfWriteProfileData(fmprof, appname, "WarnReadOnly",
-                        &fWarnReadOnly, sizeof(BOOL));
+                        &fWarnReadOnly, sizeof(BOOL));
     {
       WinSendDlgItemMsg(hwnd, CFGG_CMDLNLNGTH, SPBM_QUERYVALUE,
@@ -2032 +2047 @@
     WinCheckButton(hwnd, CFGM_USERLISTSWITCHES, fUserListSwitches);
     WinCheckButton(hwnd, CFGM_WSANIMATE, (fwsAnimate != 0));
-    WinCheckButton(hwnd, CFGM_SEPARATEPARMS, fSeparateParms);
     WinCheckButton(hwnd, CFGM_BLUELED, fBlueLED);
     WinCheckButton(hwnd, CFGM_SHOWTARGET, fShowTarget);
@@ -2201 +2215 @@
                   WM_UPDATEFRAME, MPFROMLONG(FCF_SIZEBORDER), MPVOID);
         SetTargetDir(hwnd, TRUE, NULL);
-      }
-      dummy = WinQueryButtonCheckstate(hwnd, CFGM_SEPARATEPARMS);
-      if (dummy != fSeparateParms) {
-        fSeparateParms = dummy;
-        PrfWriteProfileData(fmprof,
-                            appname,
-                            "SeparateParms",
-                            (PVOID) & fSeparateParms, sizeof(BOOL));
-        WinSendMsg((HWND) WinQueryWindowULong(hwnd, QWL_USER),
-                   UM_UNDO, MPVOID, MPVOID);
       }
     }