diff --git a/.DS_Store b/.DS_Store index c6a08b5..d1bccb2 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/INVENTERA_INSTALLER.md b/INVENTERA_INSTALLER.md index 38c88cb..dec3ad9 100644 --- a/INVENTERA_INSTALLER.md +++ b/INVENTERA_INSTALLER.md @@ -138,9 +138,10 @@ build_inventera_cartridge_installer_windows.bat вынесены в `Inventera.Cartridge.iss`, поэтому изменения общего процесса установки автоматически попадают в обе редакции. -Картриджный установщик показывает изображения из `picture\Setup` на основных -этапах мастера. Для совместимости с Inno Setup их подготовленные BMP-копии лежат -в `installer\assets\cartridge`. +Картриджный установщик показывает изображения из `picture\Setup` в правом нижнем +углу основных страниц мастера: приветствие, выбор режима, настройка базы, выбор +папки, процесс и завершение. Для совместимости с Inno Setup их подготовленные +BMP-копии лежат в `installer\assets\cartridge`. Автозапуск картриджной редакции выполняет служба Windows `InventeraServer`. Она запускается автоматически вместе с Windows и настроена на три попытки diff --git a/Inventera.iss b/Inventera.iss index ed1a508..ef5d449 100644 --- a/Inventera.iss +++ b/Inventera.iss @@ -48,9 +48,10 @@ Source: "installer\initialize_inventera_database.ps1"; Flags: dontcopy noencrypt #if InventeraEdition == "cartridge" Source: "installer\configure_inventera_service.ps1"; DestDir: "{tmp}"; Flags: deleteafterinstall noencryption Source: "installer\assets\cartridge\start.bmp"; Flags: dontcopy noencryption -Source: "installer\assets\cartridge\bd.bmp"; Flags: dontcopy noencryption -Source: "installer\assets\cartridge\bd_setup.bmp"; Flags: dontcopy noencryption -Source: "installer\assets\cartridge\proces.bmp"; Flags: dontcopy noencryption +Source: "installer\assets\cartridge\check.bmp"; Flags: dontcopy noencryption +Source: "installer\assets\cartridge\setup_db.bmp"; Flags: dontcopy noencryption +Source: "installer\assets\cartridge\select_folder.bmp"; Flags: dontcopy noencryption +Source: "installer\assets\cartridge\process_setup.bmp"; Flags: dontcopy noencryption Source: "installer\assets\cartridge\finish.bmp"; Flags: dontcopy noencryption #else Source: "installer\configure_inventera_autostart.ps1"; Flags: dontcopy noencryption @@ -497,18 +498,17 @@ end; procedure ShowCartridgeStageImage( ParentControl: TWinControl; - const FileName: String; - ImageWidth: Integer; - ImageHeight: Integer + const FileName: String ); begin CartridgeStageImage.Visible := False; CartridgeStageImage.Parent := ParentControl; - CartridgeStageImage.Width := ScaleX(ImageWidth); - CartridgeStageImage.Height := ScaleY(ImageHeight); + CartridgeStageImage.Width := ScaleX(100); + CartridgeStageImage.Height := ScaleY(100); CartridgeStageImage.Left := ParentControl.ClientWidth - CartridgeStageImage.Width - ScaleX(8); - CartridgeStageImage.Top := ScaleY(48); + CartridgeStageImage.Top := + ParentControl.ClientHeight - CartridgeStageImage.Height - ScaleY(8); LoadCartridgeBitmap(CartridgeStageImage, FileName); CartridgeStageImage.Visible := True; end; @@ -519,89 +519,89 @@ begin if CurPageID = wpWelcome then begin - LoadCartridgeBitmap(WizardForm.WizardBitmapImage, 'start.bmp'); + ShowCartridgeStageImage(WizardForm.WelcomePage, 'start.bmp'); Exit; end; if CurPageID = ModePage.ID then begin - ShowCartridgeStageImage(ModePage.Surface, 'bd.bmp', 190, 127); + ShowCartridgeStageImage(ModePage.Surface, 'check.bmp'); Exit; end; if CurPageID = PostgreSqlInstallPage.ID then begin - ShowCartridgeStageImage( - PostgreSqlInstallPage.Surface, - 'bd_setup.bmp', - 155, - 155 - ); + ShowCartridgeStageImage(PostgreSqlInstallPage.Surface, 'setup_db.bmp'); Exit; end; if CurPageID = AdminPage.ID then begin - ShowCartridgeStageImage(AdminPage.Surface, 'bd_setup.bmp', 155, 155); + ShowCartridgeStageImage(AdminPage.Surface, 'setup_db.bmp'); Exit; end; if CurPageID = PortsPage.ID then begin - ShowCartridgeStageImage(PortsPage.Surface, 'bd_setup.bmp', 155, 155); + ShowCartridgeStageImage(PortsPage.Surface, 'setup_db.bmp'); Exit; end; if CurPageID = DatabasePage.ID then begin - ShowCartridgeStageImage(DatabasePage.Surface, 'bd_setup.bmp', 155, 155); + ShowCartridgeStageImage(DatabasePage.Surface, 'setup_db.bmp'); Exit; end; if CurPageID = ExistingPsqlPage.ID then begin - ShowCartridgeStageImage(ExistingPsqlPage.Surface, 'bd_setup.bmp', 155, 155); + ShowCartridgeStageImage(ExistingPsqlPage.Surface, 'setup_db.bmp'); + Exit; + end; + + if CurPageID = wpSelectDir then + begin + ShowCartridgeStageImage( + WizardForm.SelectDirPage, + 'select_folder.bmp' + ); Exit; end; if CurPageID = wpPreparing then begin - ShowCartridgeStageImage( - WizardForm.PreparingPage, - 'proces.bmp', - 190, - 127 - ); + ShowCartridgeStageImage(WizardForm.PreparingPage, 'process_setup.bmp'); Exit; end; if CurPageID = wpInstalling then begin - ShowCartridgeStageImage( - WizardForm.InstallingPage, - 'proces.bmp', - 190, - 127 - ); + ShowCartridgeStageImage(WizardForm.InstallingPage, 'process_setup.bmp'); Exit; end; if CurPageID = wpFinished then - LoadCartridgeBitmap(WizardForm.WizardBitmapImage2, 'finish.bmp'); + ShowCartridgeStageImage(WizardForm.FinishedPage, 'finish.bmp'); end; procedure InitializeCartridgeImages; begin ExtractTemporaryFile('start.bmp'); - ExtractTemporaryFile('bd.bmp'); - ExtractTemporaryFile('bd_setup.bmp'); - ExtractTemporaryFile('proces.bmp'); + ExtractTemporaryFile('check.bmp'); + ExtractTemporaryFile('setup_db.bmp'); + ExtractTemporaryFile('select_folder.bmp'); + ExtractTemporaryFile('process_setup.bmp'); ExtractTemporaryFile('finish.bmp'); CartridgeStageImage := TBitmapImage.Create(WizardForm); CartridgeStageImage.Stretch := True; CartridgeStageImage.Visible := False; + WizardForm.WizardBitmapImage.Visible := False; + WizardForm.WizardBitmapImage2.Visible := False; + WizardForm.WelcomeLabel2.Caption := + 'Мастер установит Inventera Cartridge на этот компьютер.'; + ModePage.CheckListBox.Width := ScaleX(205); PostgreSqlInstallPage.CheckListBox.Width := ScaleX(205); AdminPage.Edits[0].Width := ScaleX(205); @@ -629,7 +629,6 @@ begin WizardForm.FilenameLabel.Width := ScaleX(205); WizardForm.ProgressGauge.Width := ScaleX(205); - LoadCartridgeBitmap(WizardForm.WizardBitmapImage, 'start.bmp'); end; #endif diff --git a/build_inventera_installer_windows.bat b/build_inventera_installer_windows.bat index 9b2720d..1d737b2 100644 --- a/build_inventera_installer_windows.bat +++ b/build_inventera_installer_windows.bat @@ -23,7 +23,7 @@ if "%BUILD_SERVICE%"=="1" ( echo Missing Windows service spec: %SERVICE_SPEC% goto :fail ) - for %%I in (start bd bd_setup proces finish) do ( + for %%I in (start check setup_db select_folder process_setup finish) do ( if not exist "installer\assets\cartridge\%%I.bmp" ( echo Missing cartridge installer image: installer\assets\cartridge\%%I.bmp goto :fail diff --git a/installer/assets/cartridge/check.bmp b/installer/assets/cartridge/check.bmp new file mode 100644 index 0000000..5b4aeda Binary files /dev/null and b/installer/assets/cartridge/check.bmp differ diff --git a/installer/assets/cartridge/finish.bmp b/installer/assets/cartridge/finish.bmp index 32cce84..0e469e3 100644 Binary files a/installer/assets/cartridge/finish.bmp and b/installer/assets/cartridge/finish.bmp differ diff --git a/installer/assets/cartridge/process_setup.bmp b/installer/assets/cartridge/process_setup.bmp new file mode 100644 index 0000000..5e3a08e Binary files /dev/null and b/installer/assets/cartridge/process_setup.bmp differ diff --git a/installer/assets/cartridge/select_folder.bmp b/installer/assets/cartridge/select_folder.bmp new file mode 100644 index 0000000..b4ddb4f Binary files /dev/null and b/installer/assets/cartridge/select_folder.bmp differ diff --git a/installer/assets/cartridge/setup_db.bmp b/installer/assets/cartridge/setup_db.bmp new file mode 100644 index 0000000..5e04632 Binary files /dev/null and b/installer/assets/cartridge/setup_db.bmp differ diff --git a/installer/assets/cartridge/start.bmp b/installer/assets/cartridge/start.bmp index 79fcbc0..ae1a481 100644 Binary files a/installer/assets/cartridge/start.bmp and b/installer/assets/cartridge/start.bmp differ diff --git a/picture/.DS_Store b/picture/.DS_Store index 29cd838..9c28ea2 100644 Binary files a/picture/.DS_Store and b/picture/.DS_Store differ diff --git a/picture/Setup/.DS_Store b/picture/Setup/.DS_Store index f45a07b..28915d2 100644 Binary files a/picture/Setup/.DS_Store and b/picture/Setup/.DS_Store differ diff --git a/picture/Setup/Check.png b/picture/Setup/Check.png new file mode 100644 index 0000000..07c0878 Binary files /dev/null and b/picture/Setup/Check.png differ diff --git a/picture/Setup/Progres_setup.png b/picture/Setup/Progres_setup.png new file mode 100755 index 0000000..e237db9 Binary files /dev/null and b/picture/Setup/Progres_setup.png differ diff --git a/picture/Setup/Select_Folder.png b/picture/Setup/Select_Folder.png new file mode 100755 index 0000000..04af3b7 Binary files /dev/null and b/picture/Setup/Select_Folder.png differ diff --git a/picture/Setup/Setup_db.png b/picture/Setup/Setup_db.png new file mode 100755 index 0000000..71e4493 Binary files /dev/null and b/picture/Setup/Setup_db.png differ diff --git a/picture/Setup/bd.png b/picture/Setup/bd.png deleted file mode 100644 index 3b033e6..0000000 Binary files a/picture/Setup/bd.png and /dev/null differ diff --git a/picture/Setup/bd_setup.png b/picture/Setup/bd_setup.png deleted file mode 100644 index 3fcfb54..0000000 Binary files a/picture/Setup/bd_setup.png and /dev/null differ diff --git a/picture/Setup/finish.png b/picture/Setup/finish.png old mode 100644 new mode 100755 index 9e05afc..4242d99 Binary files a/picture/Setup/finish.png and b/picture/Setup/finish.png differ diff --git a/picture/Setup/proces.png b/picture/Setup/proces.png deleted file mode 100644 index edd1022..0000000 Binary files a/picture/Setup/proces.png and /dev/null differ diff --git a/picture/Setup/start.png b/picture/Setup/start.png old mode 100644 new mode 100755 index c56f16a..71e6bc3 Binary files a/picture/Setup/start.png and b/picture/Setup/start.png differ