From 6d1f7fadc06bb57b175d5f4b94147373fc07f8a8 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Tue, 20 Mar 2012 16:07:39 +0100 Subject: remove unused License Agreement dialog from MSI --- .../inc_ooohelppack/windows/msi_templates/Control.idt | 12 ------------ .../inc_ooohelppack/windows/msi_templates/ControlC.idt | 2 -- .../inc_ooohelppack/windows/msi_templates/ControlE.idt | 11 +++-------- .../inc_ooohelppack/windows/msi_templates/Dialog.idt | 1 - 4 files changed, 3 insertions(+), 23 deletions(-) (limited to 'instsetoo_native/inc_ooohelppack') diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt index 92b51309a456..e9a774291d19 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt @@ -189,18 +189,6 @@ InstallWelcome Image Bitmap 0 0 122 234 1 ImageBmp InstallWelcome Next PushButton 230 243 66 17 3 OOO_CONTROL_125 Cancel InstallWelcome TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_126 InstallWelcome TextLine2 Text 135 55 228 45 65539 OOO_CONTROL_127 -LicenseAgreement Agree RadioButtonGroup 8 190 330 40 3 AgreeToLicense Back -LicenseAgreement Back PushButton 164 243 66 17 3 OOO_CONTROL_128 Next -LicenseAgreement Banner Bitmap 297 0 77 44 1 BannerBmp -LicenseAgreement BannerLine Line 0 44 374 0 1 -LicenseAgreement Branding1 Text 4 229 140 13 3 {&MSSWhiteSerif8}[ProductName] -LicenseAgreement Branding2 Text 3 228 140 13 65537 [ProductName] -LicenseAgreement Cancel PushButton 301 243 66 17 3 OOO_CONTROL_131 Agree -LicenseAgreement DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_132 -LicenseAgreement DlgLine Line 145 234 229 0 1 -LicenseAgreement DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_133 -LicenseAgreement Memo ScrollableText 8 54 358 130 7 -LicenseAgreement Next PushButton 230 243 66 17 3 OOO_CONTROL_134 Cancel MaintenanceType Back PushButton 164 243 66 17 3 OOO_CONTROL_135 Next MaintenanceType Banner Bitmap 297 0 77 44 1 BannerBmp MaintenanceType BannerLine Line 0 44 374 0 1 diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt index f3a286b3e39d..9adacf8e837e 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt +++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt @@ -12,8 +12,6 @@ CustomSetup Details Hide Installed CustomSetup InstallLabel Hide Installed InstallWelcome Copyright Hide SHOWCOPYRIGHT="No" InstallWelcome Copyright Show SHOWCOPYRIGHT="Yes" -LicenseAgreement Next Disable AgreeToLicense <> "Yes" -LicenseAgreement Next Enable AgreeToLicense = "Yes" ReadyToInstall DlgTitle Show ProgressType0="Modify" ReadyToInstall DlgTitle2 Show ProgressType0="Repair" ReadyToInstall DlgTitle3 Show ProgressType0="install" diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt index 21f7fe7726a5..b03c291ce03f 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt +++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt @@ -17,7 +17,7 @@ AdminWelcome Cancel SpawnDialog CancelSetup 1 0 AdminWelcome Next NewDialog AdminNetworkLocation 1 0 CancelSetup No EndDialog Return 1 0 CancelSetup Yes EndDialog Exit 1 2 -CustomerInformation Back NewDialog LicenseAgreement 1 1 +CustomerInformation Back NewDialog InstallWelcome 1 1 CustomerInformation Cancel SpawnDialog CancelSetup 1 0 CustomerInformation Next [ALLUSERS] {} ApplicationUsers = "OnlyCurrentUser" And Privileged 2 CustomerInformation Next [ALLUSERS] 1 ApplicationUsers = "AllUsers" And Privileged 1 @@ -38,8 +38,7 @@ DatabaseFolder Cancel SpawnDialog CancelSetup 1 1 DatabaseFolder ChangeFolder [_BrowseProperty] DATABASEDIR 1 2 DatabaseFolder ChangeFolder SpawnDialog InstallChangeFolder 1 1 DatabaseFolder Next NewDialog SetupType 1 1 -DestinationFolder Back NewDialog LicenseAgreement HIDEEULA <> 1 0 -DestinationFolder Back NewDialog InstallWelcome HIDEEULA = 1 0 +DestinationFolder Back NewDialog InstallWelcome 1 0 DestinationFolder Cancel SpawnDialog CancelSetup 1 1 DestinationFolder ChangeFolder [_BrowseProperty] INSTALLLOCATION 1 2 DestinationFolder ChangeFolder NewDialog InstallChangeFolder 1 1 @@ -59,11 +58,7 @@ InstallChangeFolder OK SetTargetPath [_BrowseProperty] 1 2 InstallChangeFolder Up DirectoryListUp 0 1 0 InstallWelcome Back NewDialog SplashBitmap Display_IsBitmapDlg 1 InstallWelcome Cancel SpawnDialog CancelSetup 1 0 -InstallWelcome Next NewDialog LicenseAgreement HIDEEULA <> 1 0 -InstallWelcome Next NewDialog DestinationFolder HIDEEULA = 1 0 -LicenseAgreement Back NewDialog InstallWelcome 1 0 -LicenseAgreement Cancel SpawnDialog CancelSetup 1 0 -LicenseAgreement Next NewDialog DestinationFolder AgreeToLicense = "Yes" 0 +InstallWelcome Next NewDialog DestinationFolder 1 0 MaintenanceType Back NewDialog MaintenanceWelcome 1 0 MaintenanceType Cancel SpawnDialog CancelSetup 1 0 MaintenanceType Next [ProgressType0] Modify _IsMaintenance = "Change" 2 diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Dialog.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Dialog.idt index 100074c408bf..d950c9af1ce9 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Dialog.idt +++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Dialog.idt @@ -15,7 +15,6 @@ FilesInUse 50 50 374 266 19 [ProductName] - [STR_INSTALLATION_WIZARD] Retry Retr FileTypeDialog 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] CheckBox1 Next Cancel InstallChangeFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] TailText OK Cancel InstallWelcome 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel -LicenseAgreement 50 50 374 266 2 [ProductName] - [STR_INSTALLATION_WIZARD] Agree Next Cancel MaintenanceType 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] RadioGroup Next Cancel MaintenanceWelcome 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel OutOfSpace 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Resume Resume Resume -- cgit v1.2.3