[Tora-cvs] SF.net SVN: tora:[4898] trunk/tora/src/windows/installer/tora.wxs

[<ibr...@us...>]

Revision: 4898
          http://sourceforge.net/p/tora/code/4898
Author:   ibre5041
Date:     2013-10-22 11:16:48 +0000 (Tue, 22 Oct 2013)
Log Message:
-----------
Launch Tora from installer

Modified Paths:
--------------
    trunk/tora/src/windows/installer/tora.wxs

Modified: trunk/tora/src/windows/installer/tora.wxs
===================================================================
--- trunk/tora/src/windows/installer/tora.wxs	2013-10-22 10:52:44 UTC (rev 4897)
+++ trunk/tora/src/windows/installer/tora.wxs	2013-10-22 11:16:48 UTC (rev 4898)
@@ -146,6 +146,13 @@
     <Property Id="INSTALLDESKTOPSHORTCUT" Value="1" />
     <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
     <UIRef Id="MyWixUI_InstallDir" />
+    <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch My Application Name" />
+
+    <!-- Step 3: Include the custom action -->
+    <CustomAction Id="LaunchApplication" FileKey="TORA.EXE" ExeCommand="" Execute="immediate" Impersonate="yes" Return="asyncNoWait" />
+    <UI>
+      <Publish Dialog="MyExitDialog" Control="Finish" Order="1" Event="DoAction" Value="LaunchApplication">LAUNCHAPPONEXIT</Publish>
+    </UI>
   </Product>
 
   <Fragment>
@@ -171,7 +178,7 @@
       <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish>
       <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4"><![CDATA[WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
 
-      <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
+      <Publish Dialog="MyExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
 
       <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="MyInstallDirDlg">NOT Installed</Publish>
       <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish>
@@ -225,6 +232,39 @@
     </UI>
   </Fragment>
 
+  <Fragment>
+    <UI>
+      <Dialog Id="MyExitDialog" Width="370" Height="270" Title="!(loc.ExitDialog_Title)">
+	<Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIFinish)" />
+	<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUICancel)" />
+	<Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.ExitDialogBitmap)" />
+	<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
+	<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+	<Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogDescription)" />
+	<Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogTitle)" />
+	<!--
+	<Control Id="OptionalText" Type="Text" X="135" Y="100" Width="220" Height="80" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="[WIXUI_EXITDIALOGOPTIONALTEXT]">
+	  <Condition Action="show">WIXUI_EXITDIALOGOPTIONALTEXT AND NOT Installed</Condition>
+	</Control>
+	<Control Id="OptionalCheckBox" Type="CheckBox" X="135" Y="190" Width="220" Height="40" Hidden="yes" Property="WIXUI_EXITDIALOGOPTIONALCHECKBOX" CheckBoxValue="1" Text="[WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT]">
+	  <Condition Action="show">WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT AND NOT Installed</Condition>
+	</Control>
+	-->
+	<Control Id="LaunchCheckBox" Type="CheckBox" X="10" Y="243" Width="170" Height="17" Property="LAUNCHAPPONEXIT" Hidden="yes" CheckBoxValue="1" Text="Launch $(var.ProductName) when setup exits.">
+	  <Condition Action="show">NOT Installed</Condition>
+	</Control>
+      </Dialog>
+
+      <InstallUISequence>
+	<Show Dialog="MyExitDialog" OnExit="success" />
+      </InstallUISequence>
+
+      <AdminUISequence>
+	<Show Dialog="MyExitDialog" OnExit="success" />
+      </AdminUISequence>
+    </UI>
+  </Fragment>
+
 </Wix>
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.