From e1d3dfb697579177d085cbe14f09cac7b1e057ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Albert=20Gr=C3=A4f?= <aggraef@gmail.com> Date: Thu, 3 Sep 2020 16:02:02 +0200 Subject: [PATCH] Inno setup: minor cosmetic text changes to the message boxes (both 32 and 64 bit installers). --- packages/win32_inno/pd-inno-light.iss.in | 4 ++-- packages/win32_inno/pd-inno.iss.in | 4 ++-- packages/win64_inno/pd-inno-light.iss.in | 4 ++-- packages/win64_inno/pd-inno.iss.in | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/win32_inno/pd-inno-light.iss.in b/packages/win32_inno/pd-inno-light.iss.in index b31855b53..526af9332 100644 --- a/packages/win32_inno/pd-inno-light.iss.in +++ b/packages/win32_inno/pd-inno-light.iss.in @@ -779,11 +779,11 @@ begin if(FileExists(ExpandConstant('{app}\unins000.exe')) AND FileExists(ExpandConstant('{app}\bin\pd.exe'))) then begin if MsgBox('Found a previous Version of Pure Data at ' + ExpandConstant('{app} ') + #13#13 'Do you want to uninstall it first? (recommended)', mbConfirmation, MB_YESNO) = idYes then begin if not Exec(ExpandConstant('{app}\unins000.exe'), '', '', SW_SHOWNORMAL, ewWaitUntilTerminated, ResultCode) then - MsgBox('NextButtonClick:' #13#13 'The uninstall file could not be executed. ' + SysErrorMessage(ResultCode) + '.', mbError, MB_OK); + MsgBox('Error:' #13#13 'The uninstall file could not be executed. ' + SysErrorMessage(ResultCode) + '.', mbError, MB_OK); end; end; BringToFrontAndRestore(); - MsgBox('NextButtonClick:' #13#13 'The normal installation will now start.', mbInformation, MB_OK); + MsgBox('Note:' #13#13 'The installation will now start.', mbInformation, MB_OK); end; end; diff --git a/packages/win32_inno/pd-inno.iss.in b/packages/win32_inno/pd-inno.iss.in index 420111fca..615b1daa3 100755 --- a/packages/win32_inno/pd-inno.iss.in +++ b/packages/win32_inno/pd-inno.iss.in @@ -779,11 +779,11 @@ begin if(FileExists(ExpandConstant('{app}\unins000.exe')) AND FileExists(ExpandConstant('{app}\bin\pd.exe'))) then begin if MsgBox('Found a previous Version of Pure Data at ' + ExpandConstant('{app} ') + #13#13 'Do you want to uninstall it first? (recommended)', mbConfirmation, MB_YESNO) = idYes then begin if not Exec(ExpandConstant('{app}\unins000.exe'), '', '', SW_SHOWNORMAL, ewWaitUntilTerminated, ResultCode) then - MsgBox('NextButtonClick:' #13#13 'The uninstall file could not be executed. ' + SysErrorMessage(ResultCode) + '.', mbError, MB_OK); + MsgBox('Error:' #13#13 'The uninstall file could not be executed. ' + SysErrorMessage(ResultCode) + '.', mbError, MB_OK); end; end; BringToFrontAndRestore(); - MsgBox('NextButtonClick:' #13#13 'The normal installation will now start.', mbInformation, MB_OK); + MsgBox('Note:' #13#13 'The installation will now start.', mbInformation, MB_OK); end; end; diff --git a/packages/win64_inno/pd-inno-light.iss.in b/packages/win64_inno/pd-inno-light.iss.in index ffcafc00b..f6325fc79 100644 --- a/packages/win64_inno/pd-inno-light.iss.in +++ b/packages/win64_inno/pd-inno-light.iss.in @@ -779,11 +779,11 @@ begin if(FileExists(ExpandConstant('{app}\unins000.exe')) AND FileExists(ExpandConstant('{app}\bin\pd.exe'))) then begin if MsgBox('Found a previous Version of Pure Data at ' + ExpandConstant('{app} ') + #13#13 'Do you want to uninstall it first? (recommended)', mbConfirmation, MB_YESNO) = idYes then begin if not Exec(ExpandConstant('{app}\unins000.exe'), '', '', SW_SHOWNORMAL, ewWaitUntilTerminated, ResultCode) then - MsgBox('NextButtonClick:' #13#13 'The uninstall file could not be executed. ' + SysErrorMessage(ResultCode) + '.', mbError, MB_OK); + MsgBox('Error:' #13#13 'The uninstall file could not be executed. ' + SysErrorMessage(ResultCode) + '.', mbError, MB_OK); end; end; BringToFrontAndRestore(); - MsgBox('NextButtonClick:' #13#13 'The normal installation will now start.', mbInformation, MB_OK); + MsgBox('Note:' #13#13 'The installation will now start.', mbInformation, MB_OK); end; end; diff --git a/packages/win64_inno/pd-inno.iss.in b/packages/win64_inno/pd-inno.iss.in index 8655f100e..a5fbaf0d3 100644 --- a/packages/win64_inno/pd-inno.iss.in +++ b/packages/win64_inno/pd-inno.iss.in @@ -779,11 +779,11 @@ begin if(FileExists(ExpandConstant('{app}\unins000.exe')) AND FileExists(ExpandConstant('{app}\bin\pd.exe'))) then begin if MsgBox('Found a previous Version of Pure Data at ' + ExpandConstant('{app} ') + #13#13 'Do you want to uninstall it first? (recommended)', mbConfirmation, MB_YESNO) = idYes then begin if not Exec(ExpandConstant('{app}\unins000.exe'), '', '', SW_SHOWNORMAL, ewWaitUntilTerminated, ResultCode) then - MsgBox('NextButtonClick:' #13#13 'The uninstall file could not be executed. ' + SysErrorMessage(ResultCode) + '.', mbError, MB_OK); + MsgBox('Error:' #13#13 'The uninstall file could not be executed. ' + SysErrorMessage(ResultCode) + '.', mbError, MB_OK); end; end; BringToFrontAndRestore(); - MsgBox('NextButtonClick:' #13#13 'The normal installation will now start.', mbInformation, MB_OK); + MsgBox('Note:' #13#13 'The installation will now start.', mbInformation, MB_OK); end; end; -- GitLab