From 1c2529ee738148f95f0f80df25950979ea89910f Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Mon, 7 May 2012 10:14:56 +0200 Subject: remove unused checkboxes from Windows installer Change-Id: I51eea9c45b893f56dece99e8d01e385c96051f8d --- .../inc_sdkoo/windows/msi_templates/CheckBox.idt | 4 ---- .../inc_sdkoo/windows/msi_templates/Control.idt | 9 --------- .../inc_sdkoo/windows/msi_templates/ControlC.idt | 13 ++----------- .../inc_sdkoo/windows/msi_templates/ControlE.idt | 2 -- 4 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 instsetoo_native/inc_sdkoo/windows/msi_templates/CheckBox.idt (limited to 'instsetoo_native/inc_sdkoo') diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/CheckBox.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/CheckBox.idt deleted file mode 100644 index c7c8e06d7bb3..000000000000 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/CheckBox.idt +++ /dev/null @@ -1,4 +0,0 @@ -Property Value -s72 S64 -CheckBox Property -ISCHECKFORPRODUCTUPDATES 1 diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt index 59c5b34b8069..667eef0bfc3c 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt @@ -251,21 +251,12 @@ SetupCompleteError TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_190 SetupCompleteError TextLine2 Text 135 55 228 25 65539 OOO_CONTROL_191 SetupCompleteSuccess Back PushButton 164 243 66 17 1 OOO_CONTROL_192 OK SetupCompleteSuccess Cancel PushButton 301 243 66 17 1 OOO_CONTROL_193 Image -SetupCompleteSuccess CheckBoxUpdates CheckBox 135 164 10 9 2 ISCHECKFORPRODUCTUPDATES CheckBox1 Back -SetupCompleteSuccess CheckForUpdatesText Text 152 162 190 30 65538 OOO_CONTROL_194 -SetupCompleteSuccess CheckLaunchProgram CheckBox 151 114 10 9 2 LAUNCHPROGRAM -SetupCompleteSuccess CheckLaunchReadme CheckBox 151 148 10 9 2 LAUNCHREADME SetupCompleteSuccess DlgLine Line 0 234 374 0 1 SetupCompleteSuccess Image Bitmap 0 0 125 234 1 ImageBmp CheckBoxUpdates -SetupCompleteSuccess LaunchProgramText Text 164 112 198 15 65538 OOO_CONTROL_195 -SetupCompleteSuccess LaunchReadmeText Text 164 148 198 13 65538 OOO_CONTROL_196 SetupCompleteSuccess OK PushButton 230 243 66 17 3 OOO_CONTROL_197 Cancel SetupCompleteSuccess TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_198 SetupCompleteSuccess TextLine2 Text 135 55 228 45 65538 OOO_CONTROL_199 SetupCompleteSuccess TextLine3 Text 135 55 228 45 65538 OOO_CONTROL_200 -SetupCompleteSuccess UpdateTextLine1 Text 135 30 228 45 65538 OOO_CONTROL_201 -SetupCompleteSuccess UpdateTextLine2 Text 135 80 228 45 65538 OOO_CONTROL_202 -SetupCompleteSuccess UpdateTextLine3 Text 135 120 228 45 65538 OOO_CONTROL_203 SetupError A PushButton 192 80 66 17 3 OOO_CONTROL_204 SetupError C PushButton 192 80 66 17 3 OOO_CONTROL_205 SetupError ErrorText Text 50 15 200 50 3 OOO_CONTROL_206 diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlC.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlC.idt index 9adacf8e837e..99e522483149 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlC.idt +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlC.idt @@ -29,17 +29,8 @@ SetupCompleteError RestContText1 Hide NOT UpdateStarted SetupCompleteError RestContText1 Show UpdateStarted SetupCompleteError RestContText2 Hide NOT UpdateStarted SetupCompleteError RestContText2 Show UpdateStarted -SetupCompleteSuccess CheckBoxUpdates Show ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL" -SetupCompleteSuccess CheckForUpdatesText Show ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL" -SetupCompleteSuccess CheckLaunchProgram Show SHOWLAUNCHPROGRAM="-1" And PROGRAMFILETOLAUNCHATEND <> "" And NOT Installed And NOT ISENABLEDWUSFINISHDIALOG -SetupCompleteSuccess CheckLaunchReadme Show SHOWLAUNCHREADME="-1" And READMEFILETOLAUNCHATEND <> "" And NOT Installed And NOT ISENABLEDWUSFINISHDIALOG -SetupCompleteSuccess LaunchProgramText Show SHOWLAUNCHPROGRAM="-1" And PROGRAMFILETOLAUNCHATEND <> "" And NOT Installed And NOT ISENABLEDWUSFINISHDIALOG -SetupCompleteSuccess LaunchReadmeText Show SHOWLAUNCHREADME="-1" And READMEFILETOLAUNCHATEND <> "" And NOT Installed And NOT ISENABLEDWUSFINISHDIALOG -SetupCompleteSuccess TextLine2 Show ProgressType2="installed" And ((ACTION<>"INSTALL") OR (NOT ISENABLEDWUSFINISHDIALOG) OR (ISENABLEDWUSFINISHDIALOG And Installed)) -SetupCompleteSuccess TextLine3 Show ProgressType2="uninstalled" And ((ACTION<>"INSTALL") OR (NOT ISENABLEDWUSFINISHDIALOG) OR (ISENABLEDWUSFINISHDIALOG And Installed)) -SetupCompleteSuccess UpdateTextLine1 Show ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL" -SetupCompleteSuccess UpdateTextLine2 Show ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL" -SetupCompleteSuccess UpdateTextLine3 Show ISENABLEDWUSFINISHDIALOG And NOT Installed And ACTION="INSTALL" +SetupCompleteSuccess TextLine2 Show ProgressType2="installed" And ((ACTION<>"INSTALL") +SetupCompleteSuccess TextLine3 Show ProgressType2="uninstalled" And ((ACTION<>"INSTALL") SetupInterrupted Back Default UpdateStarted SetupInterrupted Back Disable NOT UpdateStarted SetupInterrupted Back Enable UpdateStarted diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt index 6bd5f27f6277..89c3e398cb4e 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt @@ -100,8 +100,6 @@ SetupCompleteError Back EndDialog Return 1 2 SetupCompleteError Cancel [Suspend] 1 1 1 SetupCompleteError Cancel EndDialog Return 1 2 SetupCompleteError Finish EndDialog Exit 1 2 -SetupCompleteSuccess OK DoAction CheckForProductUpdates ISCHECKFORPRODUCTUPDATES="1" And ISENABLEDWUSFINISHDIALOG And NOT ISREBOOTREQUIRED And NOT Installed And ACTION="INSTALL" 4 -SetupCompleteSuccess OK DoAction CheckForProductUpdatesOnReboot ISCHECKFORPRODUCTUPDATES="1" And ISENABLEDWUSFINISHDIALOG And ISREBOOTREQUIRED And NOT Installed And ACTION="INSTALL" 5 SetupCompleteSuccess OK EndDialog Exit 1 2 SetupError A EndDialog ErrorAbort 1 0 SetupError C EndDialog ErrorCancel 1 0 -- cgit