Changeset 1789

Timestamp:

Aug 31, 2014, 12:16:22 AM (11 years ago)

Author:

Gregg Young

Message:

Use saymsg2 for Suggest dialog Ticket [538] Add an @ to the end of the filters window label to indicate an attribute filter is set.

Location:

trunk/dll

Files:

• filldir.c (modified) (3 diffs)
• fm3res.rc (modified) (3 diffs)
• misc.c (modified) (1 diff)

trunk/dll/filldir.c

@@ -106 +106 @@
                 missing break and comments explaining the code structure.
   28 Jun 14 GKY Fix errors identified with CPPCheck
+  30 Aug 14 GKY Use saymsg2 for Suggest dialog
 
 ***********************************************************************/
@@ -1741 +1742 @@
       }
       strcat(szSuggest, " %*");
-      rc = saymsg(MB_YESNOCANCEL | MB_ICONEXCLAMATION,
-                  hwndParent ? hwndParent : hwndCnr,
-                  GetPString(IDS_SUGGESTTITLETEXT),
-                  GetPString(IDS_SUGGEST1TEXT),
-                  (includesyours) ? GetPString(IDS_SUGGEST2TEXT) : NullStr,
-                  szSuggest);
-      if (rc == MBID_YES) {
+      rc = saymsg2(NULL, 3, HWND_DESKTOP,
+              GetPString(IDS_SUGGESTTITLETEXT),
+              GetPString(IDS_SUGGEST1TEXT),
+              (includesyours) ? GetPString(IDS_SUGGEST2TEXT) : NullStr,
+              szSuggest);
+      if (rc == SM2_YES || rc == SM2_DONTASK) {
         HOBJECT hFM2Object;
         char s[64];
@@ -1784 +1784 @@
         }
       }
-      else if (rc == MBID_CANCEL) {
+     if (rc == SM2_NO || rc == SM2_DONTASK) {
         fDontSuggestAgain = TRUE;
-        PrfWriteProfileData(fmprof, FM3Str, "DontSuggestAgain", &fDontSuggestAgain, sizeof(BOOL));
+        PrfWriteProfileData(fmprof, FM3Str, "DontSuggestAgain",
+                            &fDontSuggestAgain, sizeof(BOOL));
       }
     } // if suggest

trunk/dll/fm3res.rc

@@ -75 +75 @@
                 Use the test archive string from the first working archive description.
                 Enhance the error message. Ticket 502
-
+  30 Aug 14 GKY Use saymsg2 for Suggest dialog
+  
 ***********************************************************************/
 
@@ -2480 +2481 @@
     IDS_NUMDRIVESTEXT                     " %lu Drives"
     IDS_FREETEXT                          "free"
-    IDS_ATTRTEXT                          "<Attr>"
+    IDS_ATTRTEXT                          "[@]"
     IDS_SWAPFILETEXT                      "Swapfile:"
     IDS_DTTEXT                            "DT:"
@@ -3410 +3411 @@
 
     // 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\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_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\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/misc.c

@@ -2255 +2255 @@
   s = xmalloc(CCHMAXPATH * 2, pszSrcFile, __LINE__);
   if (s) {
-    sprintf(s, "F:%s%s",
+    sprintf(s, "F:%s%s%s",
             mask->szMask,
             (!archive && (mask->attrFile != ALLATTRS ||