Browse Source

Add new RetryCancelCancel message to improve AskRetryDownloadArchivesToExtract's and RenameUninstallExe's task dialogs. This is the final new message. 😅

Martijn Laan 2 months ago
parent
commit
27e7d3aef9

+ 1 - 0
Files/Default.isl

@@ -280,6 +280,7 @@ AbortRetryIgnoreIgnore=&Ignore the error and continue
 AbortRetryIgnoreCancel=Cancel installation
 AbortRetryIgnoreCancel=Cancel installation
 RetryCancelSelectAction=Select action
 RetryCancelSelectAction=Select action
 RetryCancelRetry=&Try again
 RetryCancelRetry=&Try again
+RetryCancelCancel=Cancel
 
 
 ; *** Installation status messages
 ; *** Installation status messages
 StatusClosingApplications=Closing applications...
 StatusClosingApplications=Closing applications...

+ 1 - 0
Files/Languages/Dutch.isl

@@ -258,6 +258,7 @@ AbortRetryIgnoreIgnore=&Negeer de fout en ga door
 AbortRetryIgnoreCancel=Breek installatie af
 AbortRetryIgnoreCancel=Breek installatie af
 RetryCancelSelectAction=Selecteer actie
 RetryCancelSelectAction=Selecteer actie
 RetryCancelRetry=&Probeer opnieuw
 RetryCancelRetry=&Probeer opnieuw
+RetryCancelCancel=Annuleren
 
 
 ; *** Installation status messages
 ; *** Installation status messages
 StatusClosingApplications=Programma's afsluiten...
 StatusClosingApplications=Programma's afsluiten...

+ 2 - 1
Projects/Src/Setup.Install.pas

@@ -3250,7 +3250,8 @@ var
         ['MoveFileEx', IntToStr(LastError), Win32ErrorString(LastError)]));
         ['MoveFileEx', IntToStr(LastError), Win32ErrorString(LastError)]));
       const Text = UninstallExeFilename + SNewLine2 + LastOperation + SNewLine + Failed;
       const Text = UninstallExeFilename + SNewLine2 + LastOperation + SNewLine + Failed;
       case LoggedTaskDialogMsgBox('',  SetupMessages[msgRetryCancelSelectAction], Text, '',
       case LoggedTaskDialogMsgBox('',  SetupMessages[msgRetryCancelSelectAction], Text, '',
-         mbError, MB_RETRYCANCEL, [SetupMessages[msgRetryCancelRetry]], 0, True, IDCANCEL) of
+         mbError, MB_RETRYCANCEL, [SetupMessages[msgRetryCancelRetry], SetupMessages[msgRetryCancelCancel]],
+         0, True, IDCANCEL) of
         IDRETRY: ;
         IDRETRY: ;
         IDCANCEL: Abort;
         IDCANCEL: Abort;
       else
       else

+ 2 - 1
Projects/Src/Setup.WizardForm.pas

@@ -1849,7 +1849,8 @@ function TWizardForm.PrepareToInstall(const WizardComponents, WizardTasks: TStri
     const LastOperation = SetupMessages[msgErrorDownloading];
     const LastOperation = SetupMessages[msgErrorDownloading];
     const Text = LastBaseNameOrUrl + SNewLine2 + LastOperation + SNewLine + Failed;
     const Text = LastBaseNameOrUrl + SNewLine2 + LastOperation + SNewLine + Failed;
     Result := LoggedTaskDialogMsgBox('',  SetupMessages[msgRetryCancelSelectAction], Text, '',
     Result := LoggedTaskDialogMsgBox('',  SetupMessages[msgRetryCancelSelectAction], Text, '',
-      mbError, MB_RETRYCANCEL, [SetupMessages[msgRetryCancelRetry]], 0, True, IDCANCEL);
+      mbError, MB_RETRYCANCEL, [SetupMessages[msgRetryCancelRetry], SetupMessages[msgRetryCancelCancel]],
+      0, True, IDCANCEL);
     if (Result <> IDRETRY) and (Result <> IDCANCEL) then begin
     if (Result <> IDRETRY) and (Result <> IDCANCEL) then begin
       Log('LoggedTaskDialogMsgBox returned an unexpected value. Assuming Cancel.');
       Log('LoggedTaskDialogMsgBox returned an unexpected value. Assuming Cancel.');
       Result := IDCANCEL;
       Result := IDCANCEL;

+ 1 - 0
Projects/Src/Shared.SetupMessageIDs.pas

@@ -196,6 +196,7 @@ type
     msgReadyMemoTasks,
     msgReadyMemoTasks,
     msgReadyMemoType,
     msgReadyMemoType,
     msgReadyMemoUserInfo,
     msgReadyMemoUserInfo,
+    msgRetryCancelCancel,
     msgRetryCancelRetry,
     msgRetryCancelRetry,
     msgRetryCancelSelectAction,
     msgRetryCancelSelectAction,
     msgRunEntryExec,
     msgRunEntryExec,

+ 1 - 1
whatsnew.htm

@@ -231,7 +231,7 @@ Source: "https://jrsoftware.org/download.php/iscrypt.dll?dontcount=1"; DestName:
   <ul>
   <ul>
     <li>DownloadingLabel2, ExtractingLabel.</li>
     <li>DownloadingLabel2, ExtractingLabel.</li>
     <li>ArchiveIncorrectPassword, ArchiveIsCorrupted, ArchiveUnsupportedFormat.</li>
     <li>ArchiveIncorrectPassword, ArchiveIsCorrupted, ArchiveUnsupportedFormat.</li>
-    <li>RetryCancelSelectAction, RetryCancelRetry.</li>
+    <li>RetryCancelSelectAction, RetryCancelRetry, RetryCancelCancel.</li>
     <li>StatusDownloadFiles.</li>
     <li>StatusDownloadFiles.</li>
     <li>SourceVerificationFailed, VerificationSignatureDoesntExist, VerificationSignatureInvalid, VerificationKeyNotFound, VerificationFileNameIncorrect, VerificationFileTagIncorrect, VerificationFileSizeIncorrect, VerificationFileHashIncorrect.</li>
     <li>SourceVerificationFailed, VerificationSignatureDoesntExist, VerificationSignatureInvalid, VerificationKeyNotFound, VerificationFileNameIncorrect, VerificationFileTagIncorrect, VerificationFileSizeIncorrect, VerificationFileHashIncorrect.</li>
     <li>ErrorDownloading, ErrorExtracting.</li>
     <li>ErrorDownloading, ErrorExtracting.</li>