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
1=== modified file 'install/UbuntuOne7.wxs'
2--- install/UbuntuOne7.wxs 2010-11-11 15:42:52 +0000
3+++ install/UbuntuOne7.wxs 2010-11-11 15:42:52 +0000
4@@ -34,6 +34,7 @@
5 <Property Id="ARPPRODUCTICON" Value="UbuntuOne.exe" />
6 <Property Id="ALLUSERS" Value="1" />
7
8+
9 <Media Id="1"
10 Cabinet="UbuntuOne.cab"
11 EmbedCab="yes" />
12@@ -1552,7 +1553,42 @@
13 <ComponentRef Id="IconsOverlayWin32PGuiComponent" />
14 </Feature>
15
16+ <!-- Make the app to start -->
17+ <Property Id="WixShellExecTarget" Value="[#UbuntuOneClient.exe]" />
18+ <Property Id="LAUNCHAPPONEXIT" Value="1" />
19+ <CustomAction Id="LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes" />
20+
21+
22 <UI Id="WixUI_Minimal_No_License">
23+ <!-- Exit UI -->
24+ <Dialog Id="MyExitDialog" Width="370" Height="270" Title="!(loc.ExitDialog_Title)">
25+ <Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIFinish)" />
26+ <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUICancel)" />
27+ <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.ExitDialogBitmap)" />
28+ <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
29+ <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
30+ <Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogDescription)" />
31+ <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogTitle)" />
32+ <Control Id="OptionalText" Type="Text" X="135" Y="100" Width="220" Height="80" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="[WIXUI_EXITDIALOGOPTIONALTEXT]">
33+ <Condition Action="show">WIXUI_EXITDIALOGOPTIONALTEXT AND NOT Installed</Condition>
34+ </Control>
35+ <Control Id="OptionalCheckBox" Type="CheckBox" X="135" Y="190" Width="220" Height="40" Hidden="yes" Property="WIXUI_EXITDIALOGOPTIONALCHECKBOX" CheckBoxValue="1" Text="[WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT]">
36+ <Condition Action="show">WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT AND NOT Installed</Condition>
37+ </Control>
38+ <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.">
39+ <Condition Action="show">NOT Installed</Condition>
40+ </Control>
41+ </Dialog>
42+
43+ <InstallUISequence>
44+ <Show Dialog="MyExitDialog" OnExit="success" />
45+ </InstallUISequence>
46+
47+ <AdminUISequence>
48+ <Show Dialog="MyExitDialog" OnExit="success" />
49+ </AdminUISequence>
50+
51+ <!-- Rest UI -->
52 <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
53 <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
54 <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
55@@ -1570,7 +1606,7 @@
56 <DialogRef Id="UserExit" />
57 <DialogRef Id="WelcomeDlg" />
58
59- <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
60+ <Publish Dialog="MyExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
61
62 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
63
64@@ -1581,6 +1617,7 @@
65 <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
66
67 <Property Id="ARPNOMODIFY" Value="1" />
68+ <Publish Dialog="MyExitDialog" Control="Finish" Event="DoAction" Value="LaunchApplication">LAUNCHAPPONEXIT</Publish>
69 </UI>
70
71 <UIRef Id="WixUI_Common" />
72@@ -1605,9 +1642,9 @@
73
74 <InstallExecuteSequence>
75
76- <Custom Action="RegisterEmblems"
77- After="InstallFiles" />
78-</InstallExecuteSequence>
79+ <Custom Action="RegisterEmblems"
80+ After="InstallFiles" />
81+ </InstallExecuteSequence>
82
83 </Product>
84 </Wix>
85\ No newline at end of file
86
87=== modified file 'install/UbuntuOneXP.wxs'
88--- install/UbuntuOneXP.wxs 2010-10-20 23:32:43 +0000
89+++ install/UbuntuOneXP.wxs 2010-11-11 15:42:52 +0000
90@@ -647,7 +647,42 @@
91 <ComponentRef Id="Newtonsoft.Json" />
92 </Feature>
93
94+ <!-- Make the app to start -->
95+ <Property Id="WixShellExecTarget" Value="[#UbuntuOneClient.exe]" />
96+ <Property Id="LAUNCHAPPONEXIT" Value="1" />
97+ <CustomAction Id="LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes" />
98+
99+
100 <UI Id="WixUI_Minimal_No_License">
101+ <!-- Exit UI -->
102+ <Dialog Id="MyExitDialog" Width="370" Height="270" Title="!(loc.ExitDialog_Title)">
103+ <Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIFinish)" />
104+ <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUICancel)" />
105+ <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.ExitDialogBitmap)" />
106+ <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
107+ <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
108+ <Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogDescription)" />
109+ <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogTitle)" />
110+ <Control Id="OptionalText" Type="Text" X="135" Y="100" Width="220" Height="80" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="[WIXUI_EXITDIALOGOPTIONALTEXT]">
111+ <Condition Action="show">WIXUI_EXITDIALOGOPTIONALTEXT AND NOT Installed</Condition>
112+ </Control>
113+ <Control Id="OptionalCheckBox" Type="CheckBox" X="135" Y="190" Width="220" Height="40" Hidden="yes" Property="WIXUI_EXITDIALOGOPTIONALCHECKBOX" CheckBoxValue="1" Text="[WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT]">
114+ <Condition Action="show">WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT AND NOT Installed</Condition>
115+ </Control>
116+ <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.">
117+ <Condition Action="show">NOT Installed</Condition>
118+ </Control>
119+ </Dialog>
120+
121+ <InstallUISequence>
122+ <Show Dialog="MyExitDialog" OnExit="success" />
123+ </InstallUISequence>
124+
125+ <AdminUISequence>
126+ <Show Dialog="MyExitDialog" OnExit="success" />
127+ </AdminUISequence>
128+
129+ <!-- Rest UI -->
130 <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
131 <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
132 <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
133@@ -665,7 +700,7 @@
134 <DialogRef Id="UserExit" />
135 <DialogRef Id="WelcomeDlg" />
136
137- <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
138+ <Publish Dialog="MyExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
139
140 <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
141
142@@ -676,6 +711,7 @@
143 <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
144
145 <Property Id="ARPNOMODIFY" Value="1" />
146+ <Publish Dialog="MyExitDialog" Control="Finish" Event="DoAction" Value="LaunchApplication">LAUNCHAPPONEXIT</Publish>
147 </UI>
148
149 <UIRef Id="WixUI_Common" />

Subscribers

People subscribed via source and target branches

to all changes: