You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2017/09/26 19:00:07 UTC
svn commit: r1809777 - in /openoffice/trunk/main/instsetoo_native:
inc_ooolangpack/windows/msi_templates/
inc_openoffice/windows/msi_templates/ inc_sdkoo/windows/msi_templates/
Author: mseidel
Date: Tue Sep 26 19:00:07 2017
New Revision: 1809777
URL: http://svn.apache.org/viewvc?rev=1809777&view=rev
Log:
Minor changes to Windows SDK installer (MaintenanceType)
Modified:
openoffice/trunk/main/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
openoffice/trunk/main/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
openoffice/trunk/main/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
openoffice/trunk/main/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt
openoffice/trunk/main/instsetoo_native/inc_sdkoo/windows/msi_templates/RadioBut.idt
Modified: openoffice/trunk/main/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt?rev=1809777&r1=1809776&r2=1809777&view=diff
==============================================================================
--- openoffice/trunk/main/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt (original)
+++ openoffice/trunk/main/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt Tue Sep 26 19:00:07 2017
@@ -190,8 +190,8 @@ MaintenanceType Ico1 Icon 35 75 24 24 52
MaintenanceType Ico2 Icon 35 135 24 24 5242881 TrashcanIco
MaintenanceType Next PushButton 230 243 66 17 3 OOO_CONTROL_141 Cancel
MaintenanceType RadioGroup RadioButtonGroup 21 55 290 170 3 _IsMaintenance Back
-MaintenanceType Text1 Text 80 72 260 35 3 OOO_CONTROL_144
-MaintenanceType Text2 Text 80 135 260 35 3 OOO_CONTROL_145
+MaintenanceType Text1 Text 80 75 270 35 3 OOO_CONTROL_144
+MaintenanceType Text2 Text 80 135 270 35 3 OOO_CONTROL_145
MaintenanceWelcome Back PushButton 164 243 66 17 1 OOO_CONTROL_146 Next
MaintenanceWelcome Cancel PushButton 301 243 66 17 3 OOO_CONTROL_147 Back
MaintenanceWelcome DlgLine Line 0 234 376 0 1
Modified: openoffice/trunk/main/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt?rev=1809777&r1=1809776&r2=1809777&view=diff
==============================================================================
--- openoffice/trunk/main/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt (original)
+++ openoffice/trunk/main/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt Tue Sep 26 19:00:07 2017
@@ -195,14 +195,14 @@ MaintenanceType Cancel PushButton 301 24
MaintenanceType DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_139
MaintenanceType DlgLine Line 0 234 376 0 1
MaintenanceType DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_140
-MaintenanceType Ico1 Icon 34 75 24 24 5242881 SetupPartialIco
-MaintenanceType Ico2 Icon 34 135 24 24 5242881 SetupRepairIco
-MaintenanceType Ico3 Icon 34 195 24 24 5242881 TrashcanIco
+MaintenanceType Ico1 Icon 35 75 24 24 5242881 SetupPartialIco
+MaintenanceType Ico2 Icon 35 135 24 24 5242881 SetupRepairIco
+MaintenanceType Ico3 Icon 35 195 24 24 5242881 TrashcanIco
MaintenanceType Next PushButton 230 243 66 17 3 OOO_CONTROL_141 Cancel
MaintenanceType RadioGroup RadioButtonGroup 21 55 290 170 3 _IsMaintenance Back
-MaintenanceType Text1 Text 80 72 260 35 3 OOO_CONTROL_143
-MaintenanceType Text2 Text 80 135 260 35 3 OOO_CONTROL_144
-MaintenanceType Text3 Text 80 192 260 35 3 OOO_CONTROL_145
+MaintenanceType Text1 Text 80 75 270 35 3 OOO_CONTROL_143
+MaintenanceType Text2 Text 80 135 270 35 3 OOO_CONTROL_144
+MaintenanceType Text3 Text 80 195 270 35 3 OOO_CONTROL_145
MaintenanceWelcome Back PushButton 164 243 66 17 1 OOO_CONTROL_146 Next
MaintenanceWelcome Cancel PushButton 301 243 66 17 3 OOO_CONTROL_147 Back
MaintenanceWelcome DlgLine Line 0 234 376 0 1
Modified: openoffice/trunk/main/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt?rev=1809777&r1=1809776&r2=1809777&view=diff
==============================================================================
--- openoffice/trunk/main/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt (original)
+++ openoffice/trunk/main/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt Tue Sep 26 19:00:07 2017
@@ -181,14 +181,12 @@ MaintenanceType Cancel PushButton 301 24
MaintenanceType DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_139
MaintenanceType DlgLine Line 0 234 376 0 1
MaintenanceType DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_140
-MaintenanceType Ico1 Icon 35 75 24 24 5242881 SetupPartialIco
-MaintenanceType Ico2 Icon 35 135 24 24 5242881 SetupRepairIco
-MaintenanceType Ico3 Icon 35 195 24 24 5242881 TrashcanIco
+MaintenanceType Ico1 Icon 35 75 24 24 5242881 SetupRepairIco
+MaintenanceType Ico2 Icon 35 135 24 24 5242881 TrashcanIco
MaintenanceType Next PushButton 230 243 66 17 3 OOO_CONTROL_141 Cancel
MaintenanceType RadioGroup RadioButtonGroup 21 55 290 170 3 _IsMaintenance Back
-MaintenanceType Text1 Text 80 72 260 35 3 OOO_CONTROL_143
-MaintenanceType Text2 Text 80 135 260 35 3 OOO_CONTROL_144
-MaintenanceType Text3 Text 80 192 260 35 3 OOO_CONTROL_145
+MaintenanceType Text1 Text 80 75 270 35 3 OOO_CONTROL_144
+MaintenanceType Text2 Text 80 135 270 35 3 OOO_CONTROL_145
MaintenanceWelcome Back PushButton 164 243 66 17 1 OOO_CONTROL_146 Next
MaintenanceWelcome Cancel PushButton 301 243 66 17 3 OOO_CONTROL_147 Back
MaintenanceWelcome DlgLine Line 0 234 376 0 1
Modified: openoffice/trunk/main/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt?rev=1809777&r1=1809776&r2=1809777&view=diff
==============================================================================
--- openoffice/trunk/main/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt (original)
+++ openoffice/trunk/main/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt Tue Sep 26 19:00:07 2017
@@ -1,7 +1,7 @@
Property Value
s72 l0
WINDOWSENCODINGTEMPLATE Property Property
-_IsMaintenance Change
+_IsMaintenance Reinstall
_IsSetupTypeMin Typical
AgreeToLicense No
ApplicationUsers AllUsers
Modified: openoffice/trunk/main/instsetoo_native/inc_sdkoo/windows/msi_templates/RadioBut.idt
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/instsetoo_native/inc_sdkoo/windows/msi_templates/RadioBut.idt?rev=1809777&r1=1809776&r2=1809777&view=diff
==============================================================================
--- openoffice/trunk/main/instsetoo_native/inc_sdkoo/windows/msi_templates/RadioBut.idt (original)
+++ openoffice/trunk/main/instsetoo_native/inc_sdkoo/windows/msi_templates/RadioBut.idt Tue Sep 26 19:00:07 2017
@@ -1,9 +1,8 @@
Property Order Value X Y Width Height Text Help
s72 i2 s64 i2 i2 i2 i2 L64 L50
WINDOWSENCODINGTEMPLATE RadioButton Property Order
-_IsMaintenance 1 Change 0 0 290 14 OOO_RADIOBUTTON_1
-_IsMaintenance 2 Reinstall 0 60 290 14 OOO_RADIOBUTTON_2
-_IsMaintenance 3 Remove 0 120 290 14 OOO_RADIOBUTTON_3
+_IsMaintenance 1 Reinstall 0 0 290 14 OOO_RADIOBUTTON_2
+_IsMaintenance 2 Remove 0 60 290 14 OOO_RADIOBUTTON_3
_IsSetupTypeMin 1 Typical 0 0 264 14 OOO_RADIOBUTTON_4
_IsSetupTypeMin 2 Custom 0 60 264 14 OOO_RADIOBUTTON_5
AgreeToLicense 1 No 0 15 295 15 OOO_RADIOBUTTON_6