Changeset 1789
Legend:
- Unmodified
- Added
- Removed
-
trunk/dll/filldir.c
r1780 r1789 106 106 missing break and comments explaining the code structure. 107 107 28 Jun 14 GKY Fix errors identified with CPPCheck 108 30 Aug 14 GKY Use saymsg2 for Suggest dialog 108 109 109 110 ***********************************************************************/ … … 1741 1742 } 1742 1743 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) { 1750 1750 HOBJECT hFM2Object; 1751 1751 char s[64]; … … 1784 1784 } 1785 1785 } 1786 else if (rc == MBID_CANCEL) {1786 if (rc == SM2_NO || rc == SM2_DONTASK) { 1787 1787 fDontSuggestAgain = TRUE; 1788 PrfWriteProfileData(fmprof, FM3Str, "DontSuggestAgain", &fDontSuggestAgain, sizeof(BOOL)); 1788 PrfWriteProfileData(fmprof, FM3Str, "DontSuggestAgain", 1789 &fDontSuggestAgain, sizeof(BOOL)); 1789 1790 } 1790 1791 } // if suggest -
trunk/dll/fm3res.rc
r1777 r1789 75 75 Use the test archive string from the first working archive description. 76 76 Enhance the error message. Ticket 502 77 77 30 Aug 14 GKY Use saymsg2 for Suggest dialog 78 78 79 ***********************************************************************/ 79 80 … … 2480 2481 IDS_NUMDRIVESTEXT " %lu Drives" 2481 2482 IDS_FREETEXT "free" 2482 IDS_ATTRTEXT " <Attr>"2483 IDS_ATTRTEXT "[@]" 2483 2484 IDS_SWAPFILETEXT "Swapfile:" 2484 2485 IDS_DTTEXT "DT:" … … 3410 3411 3411 3412 // 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" 3414 3415 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" 3415 3416 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 2255 2255 s = xmalloc(CCHMAXPATH * 2, pszSrcFile, __LINE__); 2256 2256 if (s) { 2257 sprintf(s, "F:%s%s ",2257 sprintf(s, "F:%s%s%s", 2258 2258 mask->szMask, 2259 2259 (!archive && (mask->attrFile != ALLATTRS ||
Note:
See TracChangeset
for help on using the changeset viewer.