instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt  |   14 
----------
 instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt |   12 
++------
 instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt   |    1 
 3 files changed, 4 insertions(+), 23 deletions(-)

New commits:
commit 5e01d13b84c1dbd82da54be3f25b522f825febfe
Author: Andras Timar <[email protected]>
Date:   Wed May 30 15:54:14 2012 +0200

    fdo#46559 bypass CustomerInformation dialog in Windows installer
    
    User name and Company asked here are useless, and misleading. Users
    think that they are related to Tools - Options - LibreOffice -
    User Data. Also per-user installation context makes little sense.
    If anybody still wants to install LibreOffice only for the current
    user, it is still possible with the ALLUSERS property.
    
    Change-Id: I537b45ab77d6d227264e1dc0bcaf93a9cfa8ea71

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
index 2c6b457..a7683a7 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
@@ -58,11 +58,11 @@ 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       CustomerInformation     HIDEEULA = 1    0
+InstallWelcome Next    NewDialog       SetupType       HIDEEULA = 1    0
 LanguageInfo1  OK      EndDialog       Return  1       0
 LicenseAgreement       Back    NewDialog       InstallWelcome  1       0
 LicenseAgreement       Cancel  SpawnDialog     CancelSetup     1       0
-LicenseAgreement       Next    NewDialog       CustomerInformation     
AgreeToLicense = "Yes"  0
+LicenseAgreement       Next    NewDialog       SetupType       AgreeToLicense 
= "Yes"  0
 MaintenanceType        Back    NewDialog       MaintenanceWelcome      1       0
 MaintenanceType        Cancel  SpawnDialog     CancelSetup     1       0
 MaintenanceType        Next    [ProgressType0] Modify  _IsMaintenance = 
"Change"       2
@@ -127,7 +127,8 @@ SetupProgress       Cancel  SpawnDialog     CancelSetup     
1       0
 SetupResume    Cancel  SpawnDialog     CancelSetup     1       0
 SetupResume    Next    EndDialog       Return  OutOfNoRbDiskSpace <> 1 0
 SetupResume    Next    NewDialog       OutOfSpace      OutOfNoRbDiskSpace = 1  0
-SetupType      Back    NewDialog       CustomerInformation     1       0
+SetupType      Back    NewDialog       LicenseAgreement        HIDEEULA <> 1   
1
+SetupType      Back    NewDialog       InstallWelcome  HIDEEULA = 1    1
 SetupType      Cancel  SpawnDialog     CancelSetup     1       0
 SetupType      Next    NewDialog       CustomSetup     _IsSetupTypeMin = 
"Custom"      0
 SetupType      Next    [FILETYPEDIALOGUSED]    0       _IsSetupTypeMin <> 
"Custom"     5
commit 0d30946780e9d86d9be92c3c6d30b33305c5830f
Author: Andras Timar <[email protected]>
Date:   Wed May 30 15:47:41 2012 +0200

    MSI: remove unused DestinationFolder dialog
    
    Change-Id: I43b360b417ba06daad55bf6ccfddaace1b55d47f

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index 2a29390..5611333 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -98,20 +98,6 @@ CustomSetupTips      InstallText     Text    60      105     
300     20      3               OOO_CONTROL_69
 CustomSetupTips        MenuText        Text    50      52      300     36      
3               OOO_CONTROL_70          
 CustomSetupTips        OK      PushButton      301     243     66      17      
3               OOO_CONTROL_72          
 CustomSetupTips        PartialText     Text    60      130     300     20      
3               OOO_CONTROL_73          
-DestinationFolder      Back    PushButton      164     243     66      17      
3               OOO_CONTROL_84  Next    
-DestinationFolder      Banner  Bitmap  0       0       374     44      1       
        BannerBmp               
-DestinationFolder      BannerLine      Line    0       44      374     0       
1                               
-DestinationFolder      Branding1       Text    4       229     88      13      
3               {&MSSWhiteSerif8}[ProductName]          
-DestinationFolder      Branding2       Text    3       228     88      13      
65537           [ProductName]           
-DestinationFolder      Cancel  PushButton      301     243     66      17      
3               OOO_CONTROL_87  ChangeFolder    
-DestinationFolder      ChangeFolder    PushButton      301     65      66      
17      3               OOO_CONTROL_88  Back    
-DestinationFolder      DestFolder      Icon    21      52      24      24      
5242881         OpenFolderIco           
-DestinationFolder      DlgDesc Text    21      23      272     25      65539   
        OOO_CONTROL_89          
-DestinationFolder      DlgLine Line    90      234     284     0       1       
                        
-DestinationFolder      DlgTitle        Text    13      6       280     25      
65539           OOO_CONTROL_90          
-DestinationFolder      Location        Text    57      65      240     40      
3       _BrowseProperty OOO_CONTROL_91          
-DestinationFolder      LocLabel        Text    57      52      290     10      
3               OOO_CONTROL_92          
-DestinationFolder      Next    PushButton      230     243     66      17      
3               OOO_CONTROL_93  Cancel  
 DiskSpaceRequirements  Banner  Bitmap  0       0       374     44      1       
        BannerBmp               
 DiskSpaceRequirements  BannerLine      Line    0       44      374     0       
1                               
 DiskSpaceRequirements  Branding1       Text    4       229     88      13      
3               {&MSSWhiteSerif8}[ProductName]          
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
index b5d02f5..2c6b457 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
@@ -42,11 +42,6 @@ CustomSetup  Next    DoAction        SetApplicationSelected  
Not Installed And (APPLICATIONC
 CustomSetup    Next    DoAction        SetApplicationSelected  Installed       
5
 CustomSetup    Next    SpawnDialog     ApplicationInfo1        APP_SELECTED <> 
1       6
 CustomSetupTips        OK      EndDialog       Return  1       1
-DestinationFolder      Back    NewDialog       CustomerInformation     1       0
-DestinationFolder      Cancel  SpawnDialog     CancelSetup     1       1
-DestinationFolder      ChangeFolder    [_BrowseProperty]       INSTALLLOCATION 
1       2
-DestinationFolder      ChangeFolder    SpawnDialog     InstallChangeFolder     
1       1
-DestinationFolder      Next    NewDialog       SetupType       1       0
 DiskSpaceRequirements  OK      EndDialog       Return  1       0
 FilesInUse     Exit    EndDialog       Exit    1       0
 FilesInUse     Ignore  EndDialog       Ignore  1       0
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt
index 284eb95..1b2694a 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt
@@ -9,7 +9,6 @@ CancelSetup     50      50      260     85      3       
[ProductName] [Setup]   No      No      No
 CustomerInformation    50      50      374     266     3       [ProductName] - 
[STR_INSTALLATION_WIZARD]       NameLabel       Next    Cancel
 CustomSetup    50      50      374     266     35      [ProductName] - 
[STR_INSTALLATION_WIZARD]       Tree    Next    Cancel
 CustomSetupTips        50      50      374     266     3       [ProductName] - 
[STR_INSTALLATION_WIZARD]       OK      OK      OK
-DestinationFolder      50      50      374     266     3       [ProductName] - 
[STR_INSTALLATION_WIZARD]       Next    Next    Cancel
 DiskSpaceRequirements  50      50      374     266     3       [ProductName] - 
[STR_INSTALLATION_WIZARD]       OK      OK      OK
 FilesInUse     50      50      374     266     19      [ProductName] - 
[STR_INSTALLATION_WIZARD]       Retry   Retry   Exit
 FileTypeDialog 50      50      374     266     3       [ProductName] - 
[STR_INSTALLATION_WIZARD]       CheckBox1       Next    Cancel
_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to