Changeset 1522

Timestamp:

May 10, 2010, 12:51:06 AM (15 years ago)

Author:

John Small

Message:

Ticket 434: Startup parameter suggestion improvements and bug fixes.

Location:

trunk/dll

Files:

• filldir.c (modified) (5 diffs)
• fm3res.rc (modified) (3 diffs)
• init.c (modified) (2 diffs)

trunk/dll/filldir.c

@@ -85 +85 @@
   15 Nov 09 GKY Optimize some check code
   17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
+  09 MAY 10 JBS Ticket 434 bug fixes, message box text improvements and parameter update improvements.
 
 ***********************************************************************/
@@ -1677 +1678 @@
   DosReleaseMutexSem(hmtFillingTreeCnr);
 
-  {
+  if (!fDontSuggestAgain) {
     BYTE info;
     BOOL includesyours = FALSE;
 
     // 10 Jan 08 SHL fixme to understand fFirstTime - looks obsolete to me - probably mean didonce?
-    if (!fDontSuggestAgain && (*szSuggest || ~driveflags[1] & DRIVE_IGNORE && fFirstTime)) {
+    if (*szSuggest || ~driveflags[1] & DRIVE_IGNORE && fFirstTime) {
       if (!DosDevConfig(&info, DEVINFO_FLOPPY) && info == 1) {
         if (!*szSuggest) {
@@ -1694 +1695 @@
     }
     if (*szSuggest) {
+      APIRET rc;
       for (iDrvNum = 2; iDrvNum < 26; iDrvNum++) {
         if (driveflags[iDrvNum] & DRIVE_IGNORE) {
@@ -1701 +1703 @@
       }
       strcat(szSuggest, " %*");
-      saymsg(MB_YESNOCANCEL | MB_ICONEXCLAMATION,
+      rc = saymsg(MB_YESNOCANCEL | MB_ICONEXCLAMATION,
              hwndParent ? hwndParent : hwndCnr,
              GetPString(IDS_SUGGESTTITLETEXT),
@@ -1707 +1709 @@
              (includesyours) ? GetPString(IDS_SUGGEST2TEXT) : NullStr,
              szSuggest);
-      if (MBID_YES) {
+      if (rc == MBID_YES) {
+        HOBJECT hFM2Object;
         char s[64];
         sprintf(s, "PARAMETERS=%s", szSuggest);
-        WinCreateObject((CHAR *) WPProgram, "FM/2", s, (CHAR *) FM3Folder, CO_UPDATEIFEXISTS);
-        WinCreateObject((CHAR *) WPProgram,
-                        "FM/2 Lite", s, (CHAR *) FM3Folder, CO_UPDATEIFEXISTS);
-        WinCreateObject((CHAR *) WPProgram,
-                        "Archive Viewer/2", s, (CHAR *) FM3Tools, CO_UPDATEIFEXISTS);
-        WinCreateObject((CHAR *) WPProgram,
-                        "Dir Sizes", s, (CHAR *) FM3Tools, CO_UPDATEIFEXISTS);
-        WinCreateObject((CHAR *) WPProgram,
-                        "Visual Tree", s, (CHAR *) FM3Tools, CO_UPDATEIFEXISTS);
-        WinCreateObject((CHAR *) WPProgram,
-                        "Visual Directory", s, (CHAR *) FM3Tools, CO_UPDATEIFEXISTS);
-        WinCreateObject((CHAR *) WPProgram,
-                        "Global File Viewer", s, (CHAR *) FM3Tools, CO_UPDATEIFEXISTS);
-        WinCreateObject((CHAR *) WPProgram, "Databar", s, (CHAR *) FM3Tools, CO_UPDATEIFEXISTS);
-      }
-      else if (MBID_CANCEL) {
+        hFM2Object = WinQueryObject("<FM/2>");
+        if (hFM2Object) {
+          rc = WinSetObjectData(hFM2Object, (PSZ)s);
+        }
+        hFM2Object = WinQueryObject("<FM/2 LITE>");
+        if (hFM2Object) {
+          rc = WinSetObjectData(hFM2Object, (PSZ)s);
+        }
+        hFM2Object = WinQueryObject("<FM/2_AV/2>");
+        if (hFM2Object) {
+          rc = WinSetObjectData(hFM2Object, (PSZ)s);
+        }
+        hFM2Object = WinQueryObject("<FM/2_DIRSIZE>");
+        if (hFM2Object) {
+          rc = WinSetObjectData(hFM2Object, (PSZ)s);
+        }
+        hFM2Object = WinQueryObject("<FM/2_VTREE>");
+        if (hFM2Object) {
+          rc = WinSetObjectData(hFM2Object, (PSZ)s);
+        }
+        hFM2Object = WinQueryObject("<FM/2_VDIR>");
+        if (hFM2Object) {
+          rc = WinSetObjectData(hFM2Object, (PSZ)s);
+        }
+        hFM2Object = WinQueryObject("<FM/2_SEEALL>");
+        if (hFM2Object) {
+          rc = WinSetObjectData(hFM2Object, (PSZ)s);
+        }
+        hFM2Object = WinQueryObject("<FM/2_DATABAR>");
+        if (hFM2Object) {
+          rc = WinSetObjectData(hFM2Object, (PSZ)s);
+        }
+      }
+      else if (rc == MBID_CANCEL) {
         fDontSuggestAgain = TRUE;
-        PrfWriteProfileData(fmprof, appname, "DontSuggestAgain", &fDontSuggestAgain, sizeof(BOOL));
+        PrfWriteProfileData(fmprof, FM3Str, "DontSuggestAgain", &fDontSuggestAgain, sizeof(BOOL));
       }
     } // if suggest
-  }
+  } // if !fDontSuggestAgain
   didonce = TRUE;
 } // FillTreeCnr

trunk/dll/fm3res.rc

@@ -42 +42 @@
                 and rescans drive in tree container depending on container focus, greyed out
                 inappropriate menu context choices
-  12 Sep 09 GKY Add FM3.INI User ini and system ini to submenu for view ini              
+  12 Sep 09 GKY Add FM3.INI User ini and system ini to submenu for view ini
   15 Sep 09 SHL Update for Thread notes text changes
   15 Sep 09 SHL Add rescan progress messages
@@ -54 +54 @@
                 submenu.
   27 Dec 09 GKY Strings for command.c changes
+  09 MAY 10 JBS Ticket 434: Message box text improvements.
 
 ***********************************************************************/
@@ -3345 +3346 @@
     IDS_DOSQAPPTYPEFAILEDTEXT2            "The program %s was not found on the PATH or is not an executible file type."
     IDS_DOSQAPPTYPEFAILEDTEXT3            "The drive specified in %s is loked or invalid."
-   
+
     // Add strings that need to be combined by GetPString here
     IDS_SUGGEST1TEXT1                     "Based on this scan of your drives, I would like to suggest the following parameters for your FM/2 program object (each letter following the '/' character is a drive that probably should be excluded from viewing by FM/2 (see README), and the '%%*' on the"
-    IDS_SUGGEST1TEXT2                     " end enables drag-and-drop to the program object%s):\r\r""%s""\r\rWould you like me to automatically place this in the parameters field of the FM/2 program objects (note: existing Parameters will be replaced)? Cancel = don't show this message again."
+    IDS_SUGGEST1TEXT2                     " end enables drag-and-drop to the program object%s):\r\r""%s""\r\rYes: Replace all relevant FM/2 object parameters with this string.\rNo: Parameters are left unchanged.\rCancel: Same as ""No"" plus don't show this message again.\r\r"
     IDS_ARCHIVERBB2TEXT1                  ";format for this archiver.bb2 file (each entry has 21 lines):\n;\n; 1st line:  ID of archiver (like ARC, LHARC, PKZIP, etc.; human consumption)\n; 2nd line:  normal extension for archives (like ZIP, ARC, LZH; note no period)\n; 3rd line:  offset into"
     IDS_ARCHIVERBB2TEXT2                  " file to signature\n; 4th line:  list command\n; 5th line:  extract command\n; 6th line:  extract w/ directories command\n; 7th line:  test archive command\n; 8th line:  add/create command\n; 9th line: add/create w/ paths command\n;10th line: add/create"

trunk/dll/init.c

@@ -96 +96 @@
                 one or more miniapp but not to FM/2
   17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
+  09 MAY 10 JBS Ticket 434: Make fDontSuggestAgain a "global" flag, not a per app flag
 
 ***********************************************************************/
@@ -1271 +1272 @@
     return 0; //already complained
   size = sizeof(BOOL);
-  PrfQueryProfileData(fmprof, appname, "DontSuggestAgain", &fDontSuggestAgain, &size);
+  PrfQueryProfileData(fmprof, FM3Str, "DontSuggestAgain", &fDontSuggestAgain, &size);
   size = sizeof(BOOL);
   PrfQueryProfileData(fmprof, appname, "ShowTarget", &fShowTarget, &size);