diff --git a/tools/install/win/lazarus.def.isl b/tools/install/win/lazarus.def.isl index e20a39f044..d06f257d39 100644 --- a/tools/install/win/lazarus.def.isl +++ b/tools/install/win/lazarus.def.isl @@ -29,3 +29,5 @@ OldInOtherFolder1=Another installation of %1 was found at %2. Please use the but OldInOtherFolder2=Note: Using multiple copies of Lazarus is not supported by this installer. OldInOtherFolder3=Using several installations of Lazarus can lead to conflicts in files shared by all of the installations, such as the IDE configuration. OldInOtherFolder4=If you wish to use more than one installation, then you must do additional setup after this installation finished. Please see the Lazarus web page for this, and how to use --primary-config-path + +DuringInstall=Some Info from our FAQ: http://wiki.lazarus.freepascal.org/Lazarus_Faq%0:s%0:s What is Lazarus?%0:sLazarus is a cross-platform IDE for Pascal. Its aim is write once, compile anywhere.%0:s%0:s How to reduce the exe file size?%0:sThe default binaries are very big because they include debug information. For release builds you can switch this off in the Project settings.%0:s%0:s Licensing:%0:s- The LCL is licensed LGPL with linking exception. This allows you to create apps with any license you want, including comercial.%0:s- The IDE is licensed GPL. If you distribute a modified IDE you must follow the GPL.%0:s- Other packages and components have various licenses. See the readme of each package. \ No newline at end of file diff --git a/tools/install/win/lazarus.iss b/tools/install/win/lazarus.iss index 06071503a7..faeb5b5d83 100644 --- a/tools/install/win/lazarus.iss +++ b/tools/install/win/lazarus.iss @@ -325,6 +325,28 @@ begin end; end; +procedure CurPageChanged(CurPageID: Integer); +var + m: TMemo; +begin + if CurPageID = wpInstalling then + begin + WizardForm.ProgressGauge.Parent.Handle; + m:= TMemo.Create(WizardForm); + m.Parent:=WizardForm.ProgressGauge.Parent; + m.Top := WizardForm.ProgressGauge.Top + WizardForm.ProgressGauge.Height + 10; + m.Left := WizardForm.ProgressGauge.Left; + m.Width := WizardForm.ProgressGauge.Width ; + m.Height := WizardForm.ProgressGauge.Parent.Height - WizardForm.ProgressGauge.Height - WizardForm.ProgressGauge.Top - 15; + m.ReadOnly := True; + m.WordWrap := True; + m.ScrollBars := ssVertical; + + m.Text := Format(CustomMessage('DuringInstall'), [#13#10]); + + end; +end; + function NextButtonClick(CurPage: Integer): Boolean; var s, folder: String; @@ -332,7 +354,7 @@ var begin // by default go to next page Result := true; - + // if curpage is wpSelectDir check is filesystem if CurPage = wpSelectDir then begin @@ -539,6 +561,7 @@ procedure InitializeWizard(); var s, s2 : String; begin + try s := CustomMessage('AskUninstallTitle1'); s2 := CustomMessage('AskUninstallTitle2');