1berry/Inno-Setup-issrc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make remaining optional messages (introduced by 6.0.3) non optional now that other new non optional messages were added.

Browse Source
This commit is contained in:
Martijn Laan 2020-07-24 21:36:29 +02:00
parent 14bca069b6
commit b113d84594
4 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Projects/Compile.pas
View File

@ -7372,7 +7372,7 @@ procedure TSetupCompiler.ReadMessagesFromScript;
function IsOptional(const MessageID: TSetupMessageID): Boolean;
begin
Result := MessageID in [msgComponentsDiskSpaceGBLabel, msgDiskSpaceGBLabel, msgPrepareToInstallNeedsRestart];
Result := False; { Currently there are no optional messages }
end;
var

9
Projects/Main.pas
View File

@ -4282,13 +4282,10 @@ begin
RestartSystem := WizardForm.YesRadio.Checked;
imSilent:
begin
if FromPreparingPage then begin
S := ExpandSetupMessage(msgPrepareToInstallNeedsRestart);
if S = '' then
S := ExpandSetupMessage(msgFinishedRestartMessage);
if FromPreparingPage then
S := WizardForm.PrepareToInstallFailureMessage + SNewLine +
SNewLine + SNewLine + S
end else
SNewLine + SNewLine + ExpandSetupMessage(msgPrepareToInstallNeedsRestart)
else
S := ExpandSetupMessage(msgFinishedRestartMessage);
RestartSystem :=
LoggedMsgBox(S, '', mbConfirmation, MB_YESNO, True, IDYES) = IDYES;

12
Projects/Wizard.pas
View File

@ -405,7 +405,7 @@ end;
function ExpandMBOrGBSetupMessage(const MBID, GBID: TSetupMessageID;
const Space: Integer64): String;
begin
if (SetupMessages[GBID] <> '') and (Comp(Space) > 1048471142) then begin
if Comp(Space) > 1048471142 then begin
{ Don't allow it to display 1000.0 MB or more. Takes the 'always round up' into account:
1048471142 bytes = 999.8999996185303 MB = '999.9 MB',
1048471143 bytes = 999.9000005722046 MB = '1,000.0 MB'. }
@ -1872,7 +1872,6 @@ function TWizardForm.PrepareToInstall(const WizardComponents, WizardTasks: TStri
var
CodeNeedsRestart: Boolean;
Y: Integer;
S: String;
begin
Result := '';
PrepareToInstallNeedsRestart := False;
@ -1906,13 +1905,10 @@ begin
Application.BringToFront;
end;
if Result <> '' then begin
if PrepareToInstallNeedsRestart then begin
S := ExpandSetupMessage(msgPrepareToInstallNeedsRestart);
if S = '' then
S := ExpandSetupMessage(msgFinishedRestartLabel);
if PrepareToInstallNeedsRestart then
PreparingLabel.Caption := Result +
SNewLine + SNewLine + SNewLine + S + SNewLine
end else
SNewLine + SNewLine + SNewLine + ExpandSetupMessage(msgPrepareToInstallNeedsRestart) + SNewLine
else
PreparingLabel.Caption := Result +
SNewLine + SNewLine + SNewLine + SetupMessages[msgCannotContinue];
AdjustLabelHeight(PreparingLabel);

4
whatsnew.htm
View File

@ -108,6 +108,10 @@ For conditions of distribution and use, see <a href="https://jrsoftware.org/file
<li>FileExistsSelectAction, FileExists2, FileExistsOverwriteExisting, FileExistsKeepExisting, FileExistsOverwriteOrKeepAll.</li>
</ul>
</li>
<li><b>Previously optional messages which must now always be set:</b>
<ul>
<li>ComponentsDiskSpaceGBLabel, DiskSpaceGBLabel, PrepareToInstallNeedsRestart.</li>
</ul>
<li><b>Removed messages:</b>
<ul>
<li>ExistingFileNewer, FileExists.</li>