Changeset 1711

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

Location:

trunk/dll

Files:

• fm3dlg.h (modified) (3 diffs)
• fm3res.dlg (modified) (4 diffs)
• init.c (modified) (4 diffs)
• ipf/notebook.ipf (modified) (3 diffs)
• notebook.c (modified) (7 diffs)
• notebook.h (modified) (3 diffs)

trunk/dll/fm3dlg.h

@@ -46 +46 @@
   06 Jan 13 GKY Added optional confirmation dialogs for delete move and copy to compare dir Ticket 277
   06 Jan 13 GKY Added EA compare option to compare dir Ticket 80
+  09 Feb 14 GKY Fix separate parameters. Moved to general page renamed separate settings
+                for apps.
 
 ***********************************************************************/
@@ -680 +682 @@
 #define CFGG_ERRORBEEPOFF                                                               25219
 #define CFGG_WARNREADONLY                                                               25220
+#define CFGG_APPSEPARATESETTINGS                                                        25221
 
 #define CFGB_FRAME                                                                      25250
@@ -703 +706 @@
 #define CFGM_EXTERNALINIS                                                               25315
 #define CFGM_EXTERNALCOLLECTOR                                          25316
-#define CFGM_SEPARATEPARMS                                                              25317
-#define CFGM_BLUELED                                                                            25318
-#define CFGM_SHOWTARGET                                                                 25319
+#define CFGM_BLUELED                                                                            25317
+#define CFGM_SHOWTARGET                                                                 25318
 
 #define CFGV_FRAME                                                                              25330

trunk/dll/fm3res.dlg

@@ -58 +58 @@
   06 Jan 13 GKY Added optional confirmation dialogs for delete move and copy to compare dir Ticket 277
   06 Jan 13 GKY Added EA compare option to compare dir Ticket 80
+  09 Feb 14 GKY Fix separate parameters. Moved to general page renamed separate settings
+                for apps.
   
 ***********************************************************************/
@@ -1941 +1943 @@
         CONTROL         "Recent Dirs", CFGM_RECENTDIRS, 4, 68, 106, 10,
                         WC_BUTTON, BS_AUTO3STATE | WS_TABSTOP | WS_VISIBLE
-        AUTOCHECKBOX    "Separate parameters", CFGM_SEPARATEPARMS, 4, 56,
+        AUTOCHECKBOX    "Autotile windows", CFGM_AUTOTILE, 4, 56,
                         106, 10
         AUTOCHECKBOX    "Free Drive Tree", CFGM_FREETREE, 4, 44, 106, 10
         AUTOCHECKBOX    "Split Status line", CFGM_SPLITSTATUS, 4, 32, 106,
                         10
-        AUTOCHECKBOX    "Autotile windows", CFGM_AUTOTILE, 4, 20, 106, 10
         AUTOCHECKBOX    "Save dir window state", CFGM_SAVESTATE, 128, 128,
                         106, 10
@@ -2861 +2862 @@
             WS_SAVEBITS
     BEGIN
+        AUTOCHECKBOX    "~Warn if file is readonly", CFGG_WARNREADONLY, 4, 140, 106,
+                        10
         AUTOCHECKBOX    "Don't move ~mouse", CFGG_DONTMOVEMOUSE, 4, 128, 106,
                         10
@@ -2877 +2880 @@
         LTEXT           "Target directory:", -1, 4, 34, 102, 8
         ENTRYFIELD      "", CFGG_TARGETDIR, 6, 22, 246, 8, ES_MARGIN
-        AUTOCHECKBOX    "~Warn if file is readonly", CFGG_WARNREADONLY, 122, 140, 106,
-                        10
+        AUTOCHECKBOX    "~Separate settings for Apps (Must restart to take effect)", 
+                        CFGG_APPSEPARATESETTINGS, 122, 140, 180, 10
         AUTOCHECKBOX    "~Link drag sets icon", CFGG_LINKSETSICON, 122, 128, 106,
                         10

trunk/dll/init.c

@@ -113 +113 @@
   04 Aug 12 GKY Changes to allow copy and move over readonly files with a warning dialog; also added a warning dialog
                 for delete of readonly files
+  09 Feb 14 GKY Fix separate parameters. Moved to general page renamed separate settings
+                for apps.
 
 ***********************************************************************/
@@ -659 +661 @@
   CHAR *p;
   ULONG size;
-  BOOL fSeparateParmsApp;
 
   strcpy(dllfile, PCSZ_FM3RES);
@@ -949 +950 @@
   FindSwapperDat();
 
-  size = sizeof(BOOL);
-  PrfQueryProfileData(fmprof, FM3Str, "SeparateParms",
-                      &fSeparateParms, &size);
-  size = sizeof(BOOL);
-  PrfQueryProfileData(fmprof, appname, "SeparateParms",
-                      &fSeparateParmsApp, &size);
-  if (!fSeparateParms && !fSeparateParmsApp)
-    strcpy(appname, FM3Str);
-
   // start help
   memset(&hini, 0, sizeof(HELPINIT));
@@ -1258 +1250 @@
     * one or more miniapp but not to FM/2
     */
+  size = sizeof(BOOL);  
+  PrfQueryProfileData(fmprof, realappname, "AppSeparateSettings", &fAppSeparateSettings, &size);
+  if (!fAppSeparateSettings)
+    strcpy(appname, FM3Str);
+  else
+    strcpy(appname, realappname);
   size = sizeof(ULONG);
   PrfQueryProfileData(fmprof, appname, "MaxComLineStrg", &MaxComLineStrg, &size);

trunk/dll/ipf/notebook.ipf

@@ -22 +22 @@
 .* 04 Aug 12 GKY Changes to allow copy and move over readonly files with a warning dialog; also added a warning dialog
 .*               for delete of readonly files
+.* 09 Feb 14 GKY Fix separate parameters. Moved to general page renamed separate settings
+.*               for apps.
 .*
 .***********************************************************************
@@ -577 +579 @@
 :link reftype=hd res=91500.Walk Directories:elink. dialog.
 :p.
-The :hp6.Separate parameters:ehp6. toggle tells FM/2 whether to use
-separate parameters for many of the mini-apps (like FM/2 lite, VDIR and VTREE). 
-If you select it with FM/2 running it applies to all the mini-apps. However,
-if you select it with a mini-app running it will only effect that app. If
-checked, you'll have to set up the effected applications separately, but
-configurations can be different than that in the monolithic FM/2
-application itself. If you don't understand that, let's try this&colon.
-if you run the Visual Tree program a lot, you'll probably want to check
-this. Otherwise, you won't.
-:p.
 If you check the :hp6.Free Drive Tree:ehp6. toggle, FM/2 will allow you
 to move the Drive Tree Container. Otherwise it "pins" it in the upper
@@ -663 +655 @@
 is what FM/2 always did for delete but not for copy/move which failed with 
 an error message.
+:p.
+The :hp6.Separate settings for Apps:ehp6. toggle tells FM/2 whether to use
+separate parameters for many of the mini-apps (like FM/2 lite, VDIR and VTREE). 
+If you select it with FM/2 running it applies to all the mini-apps. However,
+if you select it with a mini-app running it will only effect that app. If
+checked, you'll have to set up the effected applications separately, but
+configurations can be different than that in the monolithic FM/2
+application itself. If you don't understand that, let's try this&colon.
+if you run the Visual Tree program a lot, you'll probably want to check
+this. Otherwise, you won't.
 :p.
 The :hp6.Verify disk writes:ehp6. toggle turns system-level write

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);
       }
     }

trunk/dll/notebook.h

@@ -18 +18 @@
   04 Aug 12 GKY Changes to allow copy and move over readonly files with a warning dialog; also added a warning dialog
                 for delete of readonly files
+  09 Feb 14 GKY Fix separate parameters. Moved to general page renamed separate settings
+                for apps.
 
 ***********************************************************************/
@@ -91 +93 @@
 extern BOOL fRScanNoWrite;
 extern BOOL fSaveState;
-extern BOOL fSeparateParms;
 extern BOOL fShowDriveOnly;
 extern BOOL fShowEnv;
@@ -113 +114 @@
 extern BOOL fViewChild;
 extern BOOL fWarnReadOnly;
+extern BOOL fAppSeparateSettings;
 extern HINI fmprof;
 extern ULONG fwsAnimate;