Various
[pithos-ms-client] / trunk / Pithos.Installer / PithosPlus.~is
index c714551..c5d7fab 100644 (file)
@@ -42,20 +42,24 @@ AppSupportPhone=+30 210 0000000
 AppReadmeFile=My Readme
 UninstallDisplayIcon={app}\PithosPlus.exe
 WizardImageFile=Images\ppWZDImage.bmp
-WizardSmallImageFile=Images\ppWZDSmall.bmp
+WizardSmallImageFile=Images\pithos_logo-square-icon-35.bmp
+WizardImageBackColor=$FFFFFF
 VersionInfoVersion={#MyAppVersion}
 MinVersion=0,5.01sp3
 ArchitecturesInstallIn64BitMode=x64
 AppMutex=PITHOSMUTEX
-OutputDir={tmp}
+OutputDir=Output\
 SetupLogging=true
 UninstallLogMode=append
 VersionInfoCompany=GRNET
 VersionInfoDescription=Pithos Plus
 VersionInfoCopyright=(c) 2011-2012 GRNET
-VersionInfoProductName=Pitho Plus
+VersionInfoProductName=Pithos Plus
 VersionInfoProductVersion=1
 AppModifyPath="{app}\UninsHs.exe" /m0=AppId
+CloseApplicationsFilter="*.*"
+CloseApplications=true
+RestartApplications=true
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
@@ -75,46 +79,43 @@ Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescrip
 [Files]
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 ; Executable
-Source: "..\Pithos.Client.WPF\bin\Debug\PithosPlus.exe"; DestDir: "{app}"; Flags: restartreplace ignoreversion; Components: RequiredFiles; Tasks: desktopicon; Languages: english french german spanish greek
+Source: "..\Pithos.Client.WPF\bin\Debug\PithosPlus.exe"; DestDir: "{app}"; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek
 Source: "..\Pithos.Client.WPF\bin\Debug\PithosPlus.exe.config"; DestDir: "{app}"; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek
-; Appearance
-Source: "Skin\ISSkin.dll"; DestDir: {app}; Flags: dontcopy
-Source: "Skin\GRNETWhite.cjstyles"; DestDir: {tmp}; Flags: dontcopy
 ; Repair/Modify
 Source: "Tools\UninsHs.exe"; DestDir: "{app}"; Flags: restartreplace
-; Running Processes
-Source: "Tools\IssProc.dll"; DestDir: {tmp}; Flags: dontcopy
+
 ; DLL
-Source: "..\Pithos.ShellExtensions\bin\x86\Debug\Pithos.ShellExtensions.dll"; DestDir: "{app}"; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek; Check: not Is64BitInstallMode
-Source: "..\Pithos.ShellExtensions\bin\x64\Debug\Pithos.ShellExtensions.dll"; DestDir: "{app}"; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek; Check: Is64BitInstallMode
-Source: "..\Pithos.Client.WPF\bin\Debug\AppLimit.NetSparkle.Net40.dll"; DestDir: "{app}"; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek
-Source: "..\Pithos.Client.WPF\bin\Debug\AsyncCtpLibrary.dll"; DestDir: "{app}"; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek
-Source: "..\Pithos.Client.WPF\bin\Debug\Caliburn.Micro.dll"; DestDir: "{app}"; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek
-Source: "..\Pithos.Client.WPF\bin\Debug\Castle.ActiveRecord.dll"; DestDir: "{app}"; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek
-Source: "..\Pithos.Client.WPF\bin\Debug\Castle.Components.Validator.dll"; DestDir: "{app}"; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek
-Source: "..\Pithos.Client.WPF\bin\Debug\Castle.Core.dll"; DestDir: "{app}"; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek
+Source: "..\Pithos.ShellExtensions\bin\x86\Debug\Pithos.ShellExtensions.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek; Check: not Is64BitInstallMode
+Source: "..\Pithos.ShellExtensions\bin\x64\Debug\Pithos.ShellExtensions.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek; Check: Is64BitInstallMode
+Source: "..\Pithos.Client.WPF\bin\Debug\AppLimit.NetSparkle.Net40.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek
+Source: "..\Pithos.Client.WPF\bin\Debug\AsyncCtpLibrary.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek
+Source: "..\Pithos.Client.WPF\bin\Debug\Caliburn.Micro.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek
+Source: "..\Pithos.Client.WPF\bin\Debug\Castle.ActiveRecord.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek
+Source: "..\Pithos.Client.WPF\bin\Debug\Castle.Components.Validator.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek
+Source: "..\Pithos.Client.WPF\bin\Debug\Castle.Core.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek
 Source: "..\Pithos.Client.WPF\bin\Debug\Hardcodet.Wpf.TaskbarNotification.dll"; DestDir: "{app}"; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek
-Source: "..\Pithos.Client.WPF\bin\Debug\Iesi.Collections.dll"; DestDir: "{app}"; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek
-Source: "..\Pithos.Client.WPF\bin\Debug\log4net.dll"; DestDir: "{app}"; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek
-Source: "..\Pithos.Client.WPF\bin\Debug\Newtonsoft.Json.dll"; DestDir: "{app}"; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek
-Source: "..\Pithos.Client.WPF\bin\Debug\NHibernate.ByteCode.Castle.dll"; DestDir: "{app}"; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek
-Source: "..\Pithos.Client.WPF\bin\Debug\NHibernate.dll"; DestDir: "{app}"; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek
-Source: "..\Pithos.Client.WPF\bin\Debug\NHibernate.Search.dll"; DestDir: "{app}"; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek
-Source: "..\Pithos.Client.WPF\bin\Debug\ParallelExtensionsExtras.dll"; DestDir: "{app}"; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek
-Source: "..\Pithos.Client.WPF\bin\Debug\Pithos.Core.dll"; DestDir: "{app}"; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek
-Source: "..\Pithos.Client.WPF\bin\Debug\Pithos.Interfaces.dll"; DestDir: "{app}"; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek
-Source: "..\Pithos.Client.WPF\bin\Debug\Pithos.Network.dll"; DestDir: "{app}"; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek
-Source: "..\Pithos.Client.WPF\bin\Debug\System.Data.SQLite.dll"; DestDir: "{app}"; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek
-Source: "..\Pithos.Client.WPF\bin\Debug\System.Threading.Tasks.Dataflow.dll"; DestDir: "{app}"; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek
-Source: "..\Pithos.Client.WPF\bin\Debug\System.Windows.Interactivity.dll"; DestDir: "{app}"; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek
-Source: "..\Pithos.Client.WPF\bin\Debug\WPFToolkit.Extended.dll"; DestDir: "{app}"; Flags: restartreplace ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek
+Source: "..\Pithos.Client.WPF\bin\Debug\Iesi.Collections.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek
+Source: "..\Pithos.Client.WPF\bin\Debug\log4net.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek
+Source: "..\Pithos.Client.WPF\bin\Debug\Newtonsoft.Json.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek
+Source: "..\Pithos.Client.WPF\bin\Debug\NHibernate.ByteCode.Castle.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek
+Source: "..\Pithos.Client.WPF\bin\Debug\NHibernate.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek
+Source: "..\Pithos.Client.WPF\bin\Debug\ParallelExtensionsExtras.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek
+Source: "..\Pithos.Client.WPF\bin\Debug\Pithos.Core.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek
+Source: "..\Pithos.Client.WPF\bin\Debug\Pithos.Interfaces.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek
+Source: "..\Pithos.Client.WPF\bin\Debug\Pithos.Network.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek
+Source: "..\Pithos.Client.WPF\bin\Debug\System.Data.SQLite.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek
+Source: "..\Pithos.Client.WPF\bin\Debug\System.Threading.Tasks.Dataflow.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek
+Source: "..\Pithos.Client.WPF\bin\Debug\System.Windows.Interactivity.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek
+Source: "..\Pithos.Client.WPF\bin\Debug\WPFToolkit.Extended.dll"; DestDir: "{app}"; Flags: ignoreversion restartreplace; Components: RequiredFiles; Languages: english french german spanish greek
 ; Tortoise
 Source: "TortoiseOverlays\License.txt"; DestDir: "{cf}/\TortoiseOverlays"; Flags: ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek
 Source: "TortoiseOverlays\x86\TortoiseOverlays.dll"; DestDir: "{cf}/\TortoiseOverlays"; Flags: restartreplace; Components: RequiredFiles; Languages: english french german spanish greek; Check: not Is64BitInstallMode
 Source: "TortoiseOverlays\x64\TortoiseOverlays.dll"; DestDir: "{cf}/\TortoiseOverlays"; Flags: restartreplace; Components: RequiredFiles; Languages: english french german spanish greek; Check: Is64BitInstallMode
 Source: "TortoiseOverlays\icons\XPStyle\*"; DestDir: "{cf}/\TortoiseOverlays/icons/\XPStyle"; Flags: ignoreversion; Components: RequiredFiles; Languages: english french german spanish greek
+; Manual
+Source: "..\Pithos.Manual\Pithos+.chm"; DestDir: "{app}"; Flags: ignoreversion; Components: Documentation; Languages: english french german spanish greek
 ;Redistributables
-Source: "Redistributables\*"; DestDir: "{tmp}"; Flags: ignoreversion deleteafterinstall
+Source: "Redistributables\dotNetFx40_Client_setup.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall
 Source: "Redistributables\x86\msvcp100.dll"; DestDir: "{sys}"; Components: RequiredFiles; Languages: english french german spanish greek; Check: not Is64BitInstallMode
 Source: "Redistributables\x86\msvcr100.dll"; DestDir: "{sys}"; Components: RequiredFiles; Languages: english french german spanish greek; Check: not Is64BitInstallMode
 Source: "Redistributables\x64\msvcp100.dll"; DestDir: "{syswow64}"; Components: RequiredFiles; Languages: english french german spanish greek; Check: Is64BitInstallMode
@@ -125,6 +126,7 @@ Source: "Images\account.bmp"; Flags: dontcopy
 
 [Icons]
 Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{group}\{#MyAppName} Manual"; Filename: "{app}\Pithos+.chm"
 Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}"
 Name: "{group}\{cm:ProgramOnTheWeb,GRNET}"; Filename: "{#MyURL}"
 ;Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
@@ -305,46 +307,53 @@ const
   XMLUpdate = 'MYLatest.xml';
   
 var 
-dotNET40Missing: Boolean;
-       IsUpdate: Boolean;
-      UsagePage: TOutputMsgWizardPage;
-      Wz1, Wz2 : TOutputMsgWizardPage;
-         ChkBox: TCheckBox;
-        LicenseID: Integer;      
-
-// IssFindModule called on in/uninstall
-function IssFindModule(hWnd: Integer; Modulename: String; Language: PAnsiChar; Silent: Boolean; CanIgnore: Boolean ): Integer;
-external 'IssFindModuleW@files:IssProc.dll stdcall setuponly';
-
-function IssFindModuleU(hWnd: Integer; Modulename: String; Language: PAnsiChar; Silent: Boolean; CanIgnore: Boolean ): Integer;
-external 'IssFindModuleW@{app}\IssProc.dll stdcall uninstallonly';
+    dotNET40Missing: Boolean;
+           IsUpdate: Boolean;
+          UsagePage: TOutputMsgWizardPage;
+           Wz1, Wz2: TOutputMsgWizardPage;
+             ChkBox: TCheckBox;
+          LicenseID: Integer;  
+ InstallBottomPanel: TPanel;          
+InnerNotebookBounds: TRect;
+OuterNotebookBounds: TRect;
 
-//Call this to enable search for any in use file type
-function IssEnableAnyFileInUseCheck(Folder: String): Integer;
-external 'IssEnableAnyFileInUseCheckW@files:IssProc.dll stdcall setuponly';
-
-//IssEnableAnyFileInUseCheck called on uninstall
-function IssEnableAnyFileInUseCheckU(Folder: String): Integer;
-external 'IssEnableAnyFileInUseCheckW@{app}\IssProc.dll stdcall uninstallonly';
+// Importing ShowWindow Windows API from User32.DLL
+function ShowWindow(hWnd: Integer; uType: Integer): Integer;
+external 'ShowWindow@user32.dll stdcall';
 
-//Register for commercial use on install
-function IssRegister(rName: PAnsiChar; rKey: PAnsiChar): Integer;
-external 'IssRegister@files:IssProc.dll stdcall setuponly';
+function Rect(const ALeft, ATop, ARight, ABottom: Integer): TRect;
+begin
+  Result.Left := ALeft;
+  Result.Top := ATop;
+  Result.Bottom := ABottom;
+  Result.Right := ARight;
+end;
 
-//Register for commercial use on uninstall
-function IssRegisterU(rName: PAnsiChar; rKey: PAnsiChar): Integer;
-external 'IssRegister@{app}\IssProc.dll stdcall uninstallonly';
+function GetBoundsRect(AControl: TControl): TRect;
+begin
+  Result.Left := AControl.Left;
+  Result.Top := AControl.Top;
+  Result.Right := AControl.Left + AControl.Width;
+  Result.Bottom := AControl.Top + AControl.Height;
+end;
 
-// Importing LoadSkin API from ISSkin.DLL
-procedure LoadSkin(lpszPath: String; lpszIniFileName: String);
-external 'LoadSkin@files:isskin.dll stdcall';
+procedure SetBoundsRect(AControl: TControl; const ARect: TRect);
+begin
+  AControl.Left := ARect.Left;
+  AControl.Top := ARect.Top;
+  AControl.Width := ARect.Right - ARect.Left
+  AControl.Height := ARect.Bottom - ARect.Top;
+end;
 
-procedure UnloadSkin();
-external 'UnloadSkin@files:isskin.dll stdcall';
+procedure CenterHorizontally(ASource, ATarget: TControl);
+begin
+  ATarget.Left := (ASource.Width - ATarget.Width) div 2;
+end;
 
-// Importing ShowWindow Windows API from User32.DLL
-function ShowWindow(hWnd: Integer; uType: Integer): Integer;
-external 'ShowWindow@user32.dll stdcall';
+procedure CenterVertically(ASource, ATarget: TControl);
+begin
+  ATarget.Top := (ASource.Height - ATarget.Height) div 2;  
+end;
 
 function IsDotNetDetected(version: string; service: cardinal): boolean;
 //    'v1.1.4322'     .NET Framework 1.1
@@ -392,39 +401,29 @@ begin
       Result := false;
             
       hWnd := StrToInt(ExpandConstant('{wizardhwnd}'));                     { get main wizard handle }
-      IssEnableAnyFileInUseCheck(ExpandConstant('{app}'));
-      sModuleName :=ExpandConstant('{app}*;pithos*.exe;PithosPlus.exe');      
-      
-      nCode:=IssFindModule(hWnd,sModuleName,'en',false,true);                { search for module and display files-in-use window if found  }
-
      if nCode=1 then  begin                                                 { cancel pressed or files-in-use window closed }
           PostMessage (WizardForm.Handle, $0010, 0, 0);                     { quit setup, $0010=WM_CLOSE }
      end else if (nCode=0) or (nCode=2) then begin                          { no module found or ignored pressed}
           Result := true;                                                   { continue setup  }
      end;
-
   end;
-
 end;
 
 function InitializeSetup(): Boolean;
-begin
-  //Unpack The Skin
-  ExtractTemporaryFile('GRNETWhite.cjstyles');
-  LoadSkin(ExpandConstant('{tmp}\GRNETWhite.cjstyles'), '');
-    
+begin    
   // Test the presence of .NET 4.0
   if (not(RegKeyExists(HKLM, 'SOFTWARE\Microsoft\NET Framework Setup\NDP\v4'))) then
       dotNET40Missing := True;
     
   Result := True;
+
+  //Remove Old Database
+  DeleteFile(ExpandConstant('{localappdata}')+'\GRNET\PITHOS\pithos.db');
 end;
 
 procedure DeinitializeSetup();
 begin
   //Hide Window widget
-  ShowWindow(StrToInt(ExpandConstant('{wizardhwnd}')), 0);
-  UnloadSkin();
 end;
 
 function ShouldInstalldotNET40(): Boolean;
@@ -435,7 +434,17 @@ end;
 procedure CurPageChanged(CurPageID: Integer);
 begin
   if CurPageID = wpInstalling then
+    begin
     IsUpdate := FileExists(ExpandConstant('{app}\{#MyAppExeName}'));
+    //  SetBoundsRect(WizardForm.OuterNotebook, Rect(OuterNotebookBounds.Left, 
+    //  OuterNotebookBounds.Top, OuterNotebookBounds.Right, WizardForm.ClientHeight));
+    //  SetBoundsRect(WizardForm.InnerNotebook, Rect(OuterNotebookBounds.Left,
+    //  WizardForm.Bevel1.Top + WizardForm.Bevel1.Height, OuterNotebookBounds.Right, 
+    //  WizardForm.ClientHeight));          
+
+    //  CenterHorizontally(WizardForm.InstallingPage, InstallBackground);
+    //  WizardForm.ProgressGauge.Width := InstallBottomPanel.Width - 16;
+    end;
   if CurPageID = LicenseID then
     Wizardform.NextButton.Enabled := False;
   if (Pos('/SP-', UpperCase(GetCmdTail)) > 0) and (CurPageID = wpSelectComponents) then
@@ -459,7 +468,6 @@ begin
           begin            
             DelTree(ExpandConstant('{localappdata}')+'\GRNET\PithosPlus.exe_StrongName_1vmy3hmn3mscykecwcnmpvno4d4mqi52',true,true,true);     
             DelTree(ExpandConstant('{localappdata}')+'\GRNET\PITHOS\',true,true,true);
-            
           End
         else
           MsgBox ('Settings will not be removed', mbInformation, MB_OK);        
@@ -490,12 +498,12 @@ var
   Memo: TMemo;
   LabelWz: TLabel;
 
-begin  
+begin
   Page := CreateCustomPage(wpWelcome, 'GRNET Pithos+ Dev Build {#MyAppVersion}', 'Software License');
-  BitmapFileName := ExpandConstant('{tmp}\grnet-logo.bmp');
-  ExtractTemporaryFile(ExtractFileName(BitmapFileName));
-  
   Page.Surface.Color := clWhite;
+
+  BitmapFileName := ExpandConstant('{tmp}\grnet-logo.bmp');
+  ExtractTemporaryFile(ExtractFileName(BitmapFileName));  
   BitmapImage := TBitmapImage.Create(Page);
   BitmapImage.AutoSize := True;
   BitmapImage.Bitmap.LoadFromFile(BitmapFileName);
@@ -527,18 +535,19 @@ begin
   ExtractTemporaryFile(ExtractFileName(BitmapFileName));
 
   Page.Surface.Color := clWhite;
+
+  LabelWz := Tlabel.Create(Page);
+  LabelWz.Top := Page.Surface.Top;
+  LabelWz.Caption := 'To setup your account right click on the Pithos+ icon in the taskbar.';
+  LabelWz.Parent := Page.Surface;
+  
   BitmapImage1 := TBitmapImage.Create(Page);
   BitmapImage1.width := Page.SurfaceWidth;
-  BitmapImage1.height := PAge.SurfaceHeight;
+  BitmapImage1.height := Page.SurfaceHeight;
   BitmapImage1.Bitmap.LoadFromFile(BitmapFileName);
-  BitmapImage1.Left := 0 
-  BitmapImage1.Top := Page.Surface.Top;
+  BitmapImage1.Left := 0;
+  BitmapImage1.Top := Page.Surface.Top + LabelWz.Height;
   BitmapImage1.Parent := Page.Surface;
-  
-  LabelWz := Tlabel.Create(Page);
-  LabelWz.Top := 0;
-  LabelWz.Caption := 'To setup your account right click on the Pithos+ icon in the taskbar.';
-  LabelWz.Parent := Page.Surface;
 end;
 
 procedure InitializeWizard;
@@ -554,6 +563,34 @@ begin
    //abort();
   end;
   CreateTheWizardPages; 
+  WizardForm.MainPanel.Color := clWhite;
+  WizardForm.InstallingPage.Color := clWhite;
+  WizardForm.PreparingPage.Color := clWhite;
+  WizardForm.ReadyPage.Color := clWhite;
+  WizardForm.InfoAfterPage.Color := clWhite;
+  WizardForm.WelcomePage.Color := clWhite;
+  WizardForm.LicensePage.Color := clWhite;
+  WizardForm.FinishedPage.Color := clWhite;
+  WizardForm.SelectDirPage.Color := clWhite;
+  WizardForm.InnerPage.Color := clWhite;
+  WizardForm.UserInfoPage.Color := clWhite;
+  WizardForm.SelectComponentsPage.Color := clWhite;
+  WizardForm.SelectProgramGroupPage.Color := clWhite;
+  WizardForm.SelectTasksPage.Color := clWhite;
+  WizardForm.ReadyMemo.Color := clWhite;
+  WizardForm.TasksList.Color := clWhite;
+
+  InstallBottomPanel := TPanel.Create(WizardForm);
+  InstallBottomPanel.Parent := WizardForm.InstallingPage;
+  InstallBottomPanel.BevelOuter := bvNone;
+  InstallBottomPanel.Align := alBottom;
+  InstallBottomPanel.Caption := '';
+  InstallBottomPanel.Color := clWhite;
+  InstallBottomPanel.Height := 79;
+  InstallBottomPanel.ParentBackground := False;
+
+  InnerNotebookBounds := GetBoundsRect(WizardForm.InnerNotebook);
+  OuterNotebookBounds := GetBoundsRect(WizardForm.OuterNotebook);
 end;
 
 function ShouldSkipPage(CurPage: Integer): Boolean;
@@ -567,9 +604,9 @@ function ShouldSkipPage(CurPage: Integer): Boolean;
     end;
     
 [Run]
-;Kill Running Task
-Filename: cmd; parameters: /c taskkill /f /im pithos.exe;Flags: runhidden
-Filename: cmd; parameters: /c taskkill /f /im pithos.client.WPF.exe;Flags: runhidden
+;Kill Running Task from older versions
+Filename: cmd; parameters: /c taskkill /f /im pithos.exe; Flags: runhidden
+Filename: cmd; parameters: /c taskkill /f /im pithos.client.WPF.exe; Flags: runhidden
 ;Launch Redist
 Filename: {tmp}\dotNetFx40_Client_setup.exe; Description: Install Microsoft .Net Framework 4.0; Parameters: /q /noreboot; Flags: skipifdoesntexist; Check: ShouldInstalldotNET40
-Filename: {app}\UninsHs.exe; Parameters: /r0=AppId,{language},{srcexe}; Flags: runminimized
+Filename: {app}\UninsHs.exe; Parameters: /r0=AppId,{language},{srcexe}; Flags: runminimized
\ No newline at end of file