Changeset 1789


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/dll/filldir.c

    r1780 r1789  
    106106                missing break and comments explaining the code structure.
    107107  28 Jun 14 GKY Fix errors identified with CPPCheck
     108  30 Aug 14 GKY Use saymsg2 for Suggest dialog
    108109
    109110***********************************************************************/
     
    17411742      }
    17421743      strcat(szSuggest, " %*");
    1743       rc = saymsg(MB_YESNOCANCEL | MB_ICONEXCLAMATION,
    1744                   hwndParent ? hwndParent : hwndCnr,
    1745                   GetPString(IDS_SUGGESTTITLETEXT),
    1746                   GetPString(IDS_SUGGEST1TEXT),
    1747                   (includesyours) ? GetPString(IDS_SUGGEST2TEXT) : NullStr,
    1748                   szSuggest);
    1749       if (rc == MBID_YES) {
     1744      rc = saymsg2(NULL, 3, HWND_DESKTOP,
     1745              GetPString(IDS_SUGGESTTITLETEXT),
     1746              GetPString(IDS_SUGGEST1TEXT),
     1747              (includesyours) ? GetPString(IDS_SUGGEST2TEXT) : NullStr,
     1748              szSuggest);
     1749      if (rc == SM2_YES || rc == SM2_DONTASK) {
    17501750        HOBJECT hFM2Object;
    17511751        char s[64];
     
    17841784        }
    17851785      }
    1786       else if (rc == MBID_CANCEL) {
     1786     if (rc == SM2_NO || rc == SM2_DONTASK) {
    17871787        fDontSuggestAgain = TRUE;
    1788         PrfWriteProfileData(fmprof, FM3Str, "DontSuggestAgain", &fDontSuggestAgain, sizeof(BOOL));
     1788        PrfWriteProfileData(fmprof, FM3Str, "DontSuggestAgain",
     1789                            &fDontSuggestAgain, sizeof(BOOL));
    17891790      }
    17901791    } // if suggest
  • trunk/dll/fm3res.rc

    r1777 r1789  
    7575                Use the test archive string from the first working archive description.
    7676                Enhance the error message. Ticket 502
    77 
     77  30 Aug 14 GKY Use saymsg2 for Suggest dialog
     78 
    7879***********************************************************************/
    7980
     
    24802481    IDS_NUMDRIVESTEXT                     " %lu Drives"
    24812482    IDS_FREETEXT                          "free"
    2482     IDS_ATTRTEXT                          "<Attr>"
     2483    IDS_ATTRTEXT                          "[@]"
    24832484    IDS_SWAPFILETEXT                      "Swapfile:"
    24842485    IDS_DTTEXT                            "DT:"
     
    34103411
    34113412    // Add strings that need to be combined by GetPString here
    3412     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"
    3413     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"
     3413    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"
     3414    IDS_SUGGEST1TEXT2                     " end enables drag-and-drop to the program object%s:\r\r""%s""\r\r"
    34143415    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"
    34153416    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

    r1780 r1789  
    22552255  s = xmalloc(CCHMAXPATH * 2, pszSrcFile, __LINE__);
    22562256  if (s) {
    2257     sprintf(s, "F:%s%s",
     2257    sprintf(s, "F:%s%s%s",
    22582258            mask->szMask,
    22592259            (!archive && (mask->attrFile != ALLATTRS ||
Note: See TracChangeset for help on using the changeset viewer.