diff options
| author | Andras Timar <atimar@suse.com> | 2012-05-09 13:41:19 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-05-09 14:54:45 +0200 |
| commit | 949e9a5c55c6ddc63e53a5e5959773ec39bd7331 (patch) | |
| tree | 21bb39633a61937ffb34d2499e739279105d6b0a /instsetoo_native/inc_ooohelppack | |
| parent | 3ea961725a8488082e3741df98cbea358d807c87 (diff) | |
partially revert 6d1f7fadc06bb57b175d5f4b94147373fc07f8a8
Change-Id: I I I0bfc367a3b2c551509b383fc4f6dcaa3cb8661f8
Diffstat (limited to 'instsetoo_native/inc_ooohelppack')
4 files changed, 21 insertions, 2 deletions
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt index de52236327be..f1b7ff069d56 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt @@ -175,6 +175,18 @@ 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 0 0 374 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 0 0 374 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 9e3faef6c88c..4063ebb17010 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt +++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt @@ -12,6 +12,8 @@ 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 63ea9957f2f2..79ab5c1c85d9 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 InstallWelcome 1 1 +CustomerInformation Back NewDialog LicenseAgreement 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 @@ -52,7 +52,11 @@ 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 DestinationFolder 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 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 7e97dd8c7956..b8a27e7e9640 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Dialog.idt +++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Dialog.idt @@ -14,6 +14,7 @@ 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 |