Ubuntu One Windows Installer

Merge lp:~mandel/ubuntuone-windows-installer/start_app_after_install into lp:ubuntuone-windows-installer/beta

  1. start_app_after_install
  2. Merge into beta
Proposed by Manuel de la Peña
Status: Merged
Approved by: John Lenton
Approved revision: 177
Merged at revision: 132
Proposed branch: lp:~mandel/ubuntuone-windows-installer/start_app_after_install
Merge into: lp:ubuntuone-windows-installer/beta
Prerequisite: lp:~mandel/ubuntuone-windows-installer/manual_sync_does_nothing
Diff against target: 149 lines (+78/-5)
2 files modified
install/UbuntuOne7.wxs (+41/-4)
install/UbuntuOneXP.wxs (+37/-1)
To merge this branch: bzr merge lp:~mandel/ubuntuone-windows-installer/start_app_after_install
Reviewer Review Type Date Requested Status
John Lenton (community) Approve
Review via email: mp+40641@code.launchpad.net

Description of the change

Adds an option to start the application after install.

To post a comment you must log in.
Revision history for this message
John Lenton (chipaca) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'install/UbuntuOne7.wxs'
--- install/UbuntuOne7.wxs 2010-11-11 15:42:52 +0000
+++ install/UbuntuOne7.wxs 2010-11-11 15:42:52 +0000
@@ -34,6 +34,7 @@
34 <Property Id="ARPPRODUCTICON" Value="UbuntuOne.exe" />34 <Property Id="ARPPRODUCTICON" Value="UbuntuOne.exe" />
35 <Property Id="ALLUSERS" Value="1" />35 <Property Id="ALLUSERS" Value="1" />
36 36
37
37 <Media Id="1"38 <Media Id="1"
38 Cabinet="UbuntuOne.cab"39 Cabinet="UbuntuOne.cab"
39 EmbedCab="yes" />40 EmbedCab="yes" />
@@ -1552,7 +1553,42 @@
1552 <ComponentRef Id="IconsOverlayWin32PGuiComponent" />1553 <ComponentRef Id="IconsOverlayWin32PGuiComponent" />
1553 </Feature>1554 </Feature>
1554 1555
1556 <!-- Make the app to start -->
1557 <Property Id="WixShellExecTarget" Value="[#UbuntuOneClient.exe]" />
1558 <Property Id="LAUNCHAPPONEXIT" Value="1" />
1559 <CustomAction Id="LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes" />
1560
1561
1555 <UI Id="WixUI_Minimal_No_License">1562 <UI Id="WixUI_Minimal_No_License">
1563 <!-- Exit UI -->
1564 <Dialog Id="MyExitDialog" Width="370" Height="270" Title="!(loc.ExitDialog_Title)">
1565 <Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIFinish)" />
1566 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUICancel)" />
1567 <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.ExitDialogBitmap)" />
1568 <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
1569 <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
1570 <Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogDescription)" />
1571 <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogTitle)" />
1572 <Control Id="OptionalText" Type="Text" X="135" Y="100" Width="220" Height="80" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="[WIXUI_EXITDIALOGOPTIONALTEXT]">
1573 <Condition Action="show">WIXUI_EXITDIALOGOPTIONALTEXT AND NOT Installed</Condition>
1574 </Control>
1575 <Control Id="OptionalCheckBox" Type="CheckBox" X="135" Y="190" Width="220" Height="40" Hidden="yes" Property="WIXUI_EXITDIALOGOPTIONALCHECKBOX" CheckBoxValue="1" Text="[WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT]">
1576 <Condition Action="show">WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT AND NOT Installed</Condition>
1577 </Control>
1578 <Control Id="LaunchCheckBox" Type="CheckBox" X="10" Y="243" Width="170" Height="17" Property="LAUNCHAPPONEXIT" Hidden="yes" CheckBoxValue="1" Text="Launch Ubuntu One when setupt exits.">
1579 <Condition Action="show">NOT Installed</Condition>
1580 </Control>
1581 </Dialog>
1582
1583 <InstallUISequence>
1584 <Show Dialog="MyExitDialog" OnExit="success" />
1585 </InstallUISequence>
1586
1587 <AdminUISequence>
1588 <Show Dialog="MyExitDialog" OnExit="success" />
1589 </AdminUISequence>
1590
1591 <!-- Rest UI -->
1556 <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />1592 <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
1557 <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />1593 <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
1558 <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />1594 <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
@@ -1570,7 +1606,7 @@
1570 <DialogRef Id="UserExit" />1606 <DialogRef Id="UserExit" />
1571 <DialogRef Id="WelcomeDlg" />1607 <DialogRef Id="WelcomeDlg" />
15721608
1573 <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>1609 <Publish Dialog="MyExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
15741610
1575 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>1611 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
15761612
@@ -1581,6 +1617,7 @@
1581 <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>1617 <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
15821618
1583 <Property Id="ARPNOMODIFY" Value="1" />1619 <Property Id="ARPNOMODIFY" Value="1" />
1620 <Publish Dialog="MyExitDialog" Control="Finish" Event="DoAction" Value="LaunchApplication">LAUNCHAPPONEXIT</Publish>
1584 </UI>1621 </UI>
1585 1622
1586 <UIRef Id="WixUI_Common" />1623 <UIRef Id="WixUI_Common" />
@@ -1605,9 +1642,9 @@
16051642
1606 <InstallExecuteSequence>1643 <InstallExecuteSequence>
16071644
1608 <Custom Action="RegisterEmblems" 1645 <Custom Action="RegisterEmblems"
1609 After="InstallFiles" />1646 After="InstallFiles" />
1610</InstallExecuteSequence>1647 </InstallExecuteSequence>
1611 1648
1612 </Product>1649 </Product>
1613</Wix>1650</Wix>
1614\ No newline at end of file1651\ No newline at end of file
16151652
=== modified file 'install/UbuntuOneXP.wxs'
--- install/UbuntuOneXP.wxs 2010-10-20 23:32:43 +0000
+++ install/UbuntuOneXP.wxs 2010-11-11 15:42:52 +0000
@@ -647,7 +647,42 @@
647 <ComponentRef Id="Newtonsoft.Json" />647 <ComponentRef Id="Newtonsoft.Json" />
648 </Feature>648 </Feature>
649 649
650 <!-- Make the app to start -->
651 <Property Id="WixShellExecTarget" Value="[#UbuntuOneClient.exe]" />
652 <Property Id="LAUNCHAPPONEXIT" Value="1" />
653 <CustomAction Id="LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes" />
654
655
650 <UI Id="WixUI_Minimal_No_License">656 <UI Id="WixUI_Minimal_No_License">
657 <!-- Exit UI -->
658 <Dialog Id="MyExitDialog" Width="370" Height="270" Title="!(loc.ExitDialog_Title)">
659 <Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIFinish)" />
660 <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUICancel)" />
661 <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.ExitDialogBitmap)" />
662 <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
663 <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
664 <Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogDescription)" />
665 <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogTitle)" />
666 <Control Id="OptionalText" Type="Text" X="135" Y="100" Width="220" Height="80" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="[WIXUI_EXITDIALOGOPTIONALTEXT]">
667 <Condition Action="show">WIXUI_EXITDIALOGOPTIONALTEXT AND NOT Installed</Condition>
668 </Control>
669 <Control Id="OptionalCheckBox" Type="CheckBox" X="135" Y="190" Width="220" Height="40" Hidden="yes" Property="WIXUI_EXITDIALOGOPTIONALCHECKBOX" CheckBoxValue="1" Text="[WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT]">
670 <Condition Action="show">WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT AND NOT Installed</Condition>
671 </Control>
672 <Control Id="LaunchCheckBox" Type="CheckBox" X="10" Y="243" Width="170" Height="17" Property="LAUNCHAPPONEXIT" Hidden="yes" CheckBoxValue="1" Text="Launch Ubuntu One when setupt exits.">
673 <Condition Action="show">NOT Installed</Condition>
674 </Control>
675 </Dialog>
676
677 <InstallUISequence>
678 <Show Dialog="MyExitDialog" OnExit="success" />
679 </InstallUISequence>
680
681 <AdminUISequence>
682 <Show Dialog="MyExitDialog" OnExit="success" />
683 </AdminUISequence>
684
685 <!-- Rest UI -->
651 <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />686 <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
652 <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />687 <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
653 <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />688 <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
@@ -665,7 +700,7 @@
665 <DialogRef Id="UserExit" />700 <DialogRef Id="UserExit" />
666 <DialogRef Id="WelcomeDlg" />701 <DialogRef Id="WelcomeDlg" />
667702
668 <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>703 <Publish Dialog="MyExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
669704
670 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>705 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
671706
@@ -676,6 +711,7 @@
676 <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>711 <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
677712
678 <Property Id="ARPNOMODIFY" Value="1" />713 <Property Id="ARPNOMODIFY" Value="1" />
714 <Publish Dialog="MyExitDialog" Control="Finish" Event="DoAction" Value="LaunchApplication">LAUNCHAPPONEXIT</Publish>
679 </UI>715 </UI>
680 716
681 <UIRef Id="WixUI_Common" />717 <UIRef Id="WixUI_Common" />

Subscribers

People subscribed via source and target branches

to all changes: