Skip to content

Commit

Permalink
Finishing touches.
Browse files Browse the repository at this point in the history
  • Loading branch information
martijnlaan committed Nov 15, 2024
1 parent 9685369 commit 6910a14
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 8 deletions.
9 changes: 8 additions & 1 deletion Files/Languages/Dutch.isl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
; *** Inno Setup version 6.1.0+ Dutch messages ***
; *** Inno Setup version 6.4.0+ Dutch messages ***
;
; This file is based on user-contributed translations by various authors
;
Expand Down Expand Up @@ -204,6 +204,13 @@ ErrorFileHash2=Ongeldige bestandshash: %1 verwacht, %2 gevonden
ErrorProgress=Ongeldige voortgang: %1 van %2
ErrorFileSize=Ongeldige bestandsgrootte: %1 verwacht, %2 gevonden
; *** TExtractionWizardPage wizard page and Extract7ZipArchive
ExtractionLabel=Bezig met het uitpakken van extra bestanden...
ButtonStopExtraction=&Stop uitpakken
StopExtraction=Weet u zeker dat u het uitpakken wilt stoppen?
ErrorExtractionAborted=uitpakken afgebroken
ErrorExtractionFailed=Uitpakken mislukt: %1
; *** "Preparing to Install" wizard page
WizardPreparing=Bezig met het voorbereiden van de installatie
PreparingDesc=Setup is bezig met het voorbereiden van de installatie van [name].
Expand Down
2 changes: 1 addition & 1 deletion Projects/Src/Compression.SevenZipDecoder.pas
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ procedure _ReportProgress(const FileName: PChar; const Progress, ProgressMax: UI
end;
end;

if not Abort and DownloadTemporaryFileOrSevenZipDecodeProcessMessages then
if not Abort and DownloadTemporaryFileOrExtract7ZipArchiveProcessMessages then
Application.ProcessMessages;

if Abort then
Expand Down
2 changes: 1 addition & 1 deletion Projects/Src/Setup.Install.pas
Original file line number Diff line number Diff line change
Expand Up @@ -3423,7 +3423,7 @@ procedure THTTPDataReceiver.OnReceiveData(const Sender: TObject; AContentLength:
end;
end;

if not Abort and DownloadTemporaryFileOrSevenZipDecodeProcessMessages then
if not Abort and DownloadTemporaryFileOrExtract7ZipArchiveProcessMessages then
Application.ProcessMessages;

if Abort then
Expand Down
2 changes: 1 addition & 1 deletion Projects/Src/Setup.MainFunc.pas
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ interface
DisableCodeConsts: Integer;
SetupExitCode: Integer;
CreatedIcon: Boolean;
RestartInitiatedByThisProcess, DownloadTemporaryFileOrSevenZipDecodeProcessMessages: Boolean;
RestartInitiatedByThisProcess, DownloadTemporaryFileOrExtract7ZipArchiveProcessMessages: Boolean;
TaskbarButtonHidden: Boolean;
InstallModeRootKey: HKEY;

Expand Down
4 changes: 2 additions & 2 deletions Projects/Src/Setup.ScriptDlg.pas
Original file line number Diff line number Diff line change
Expand Up @@ -1071,7 +1071,7 @@ function TDownloadWizardPage.Download: Int64;

Result := 0;
for var F in FFiles do begin
{ Don't need to set DownloadTemporaryFileProcessMessages before downloading since we already process messages ourselves. }
{ Don't need to set DownloadTemporaryFileOrExtract7ZipArchiveProcessMessages before downloading since we already process messages ourselves. }
SetDownloadCredentials(F.UserName, F.Password);
Result := Result + DownloadTemporaryFile(F.Url, F.BaseName, F.RequiredSHA256OfFile, InternalOnDownloadProgress);
end;
Expand Down Expand Up @@ -1184,7 +1184,7 @@ procedure TExtractionWizardPage.Extract;
FAbortedByUser := False;

for var A in FArchives do begin
{ Don't need to set DownloadTemporaryFileOrSevenZipDecodeProcessMessages before extraction since we already process messages ourselves. }
{ Don't need to set DownloadTemporaryFileOrExtract7ZipArchiveProcessMessages before extraction since we already process messages ourselves. }
Extract7ZipArchive(A.FileName, A.DestDir, A.FullPaths, InternalOnExtractionProgress);
end;
end;
Expand Down
4 changes: 2 additions & 2 deletions Projects/Src/Setup.WizardForm.pas
Original file line number Diff line number Diff line change
Expand Up @@ -1871,12 +1871,12 @@ function TWizardForm.PrepareToInstall(const WizardComponents, WizardTasks: TStri
end;
WizardForm.Update;
try
DownloadTemporaryFileOrSevenZipDecodeProcessMessages := True;
DownloadTemporaryFileOrExtract7ZipArchiveProcessMessages := True;
CodeNeedsRestart := False;
Result := CodeRunner.RunStringFunctions('PrepareToInstall', [@CodeNeedsRestart], bcNonEmpty, True, '');
PrepareToInstallNeedsRestart := (Result <> '') and CodeNeedsRestart;
finally
DownloadTemporaryFileOrSevenZipDecodeProcessMessages := False;
DownloadTemporaryFileOrExtract7ZipArchiveProcessMessages := False;
UpdateCurPageButtonState;
end;
Application.BringToFront;
Expand Down

0 comments on commit 6910a14

Please sign in to comment.