Ubuntu One Windows Installer

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

  1. add_icon
  2. Merge into beta
Proposed by Manuel de la Peña
Status: Merged
Approved by: Rick McBride
Approved revision: 97
Merged at revision: 97
Proposed branch: lp:~mandel/ubuntuone-windows-installer/add_icon
Merge into: lp:ubuntuone-windows-installer/beta
Prerequisite: lp:~mandel/ubuntuone-windows-installer/fix_628160
Diff against target: 103 lines (+22/-5)
4 files modified
install/UbuntuOne7.wxs (+8/-2)
install/UbuntuOneXP.wxs (+8/-2)
main.build (+2/-1)
src/UbuntuOneClient/UbuntuOneClient.csproj (+4/-0)
To merge this branch: bzr merge lp:~mandel/ubuntuone-windows-installer/add_icon
Reviewer Review Type Date Requested Status
Rick McBride (community) Approve
John Lenton (community) Approve
Review via email: mp+37715@code.launchpad.net

Description of the change

Fixes lp:655285 by adding the .ico in the ubuntu one client application as well as adding the .ico in the wix project so that it is used in the add/remove programs

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'data/ubuntu-logo-22x22.ico'
2Binary files data/ubuntu-logo-22x22.ico 1970-01-01 00:00:00 +0000 and data/ubuntu-logo-22x22.ico 2010-10-06 09:06:46 +0000 differ
3=== added file 'data/ubuntu-logo-24x24.ico'
4Binary files data/ubuntu-logo-24x24.ico 1970-01-01 00:00:00 +0000 and data/ubuntu-logo-24x24.ico 2010-10-06 09:06:46 +0000 differ
5=== added file 'data/ubuntu-logo-32x32.ico'
6Binary files data/ubuntu-logo-32x32.ico 1970-01-01 00:00:00 +0000 and data/ubuntu-logo-32x32.ico 2010-10-06 09:06:46 +0000 differ
7=== modified file 'install/UbuntuOne7.wxs'
8--- install/UbuntuOne7.wxs 2010-10-06 09:06:45 +0000
9+++ install/UbuntuOne7.wxs 2010-10-06 09:06:46 +0000
10@@ -12,7 +12,7 @@
11 Codepage="1252"
12 Version="1.0.0"
13 Manufacturer="Canonical Ltd.">
14-
15+
16 <Package Id="*"
17 Keywords="Installer"
18 Description="Ubuntu One is the personal cloud service that
19@@ -27,7 +27,13 @@
20 Languages="1033"
21 Compressed="yes"
22 SummaryCodepage="1252" />
23-
24+
25+ <!-- Set the icon to be used in the msi as well as in the add remove location -->
26+ <Icon Id="UbuntuOne.exe" SourceFile="build_results\data\ubuntu-logo-32x32.ico" />
27+ <!-- sets the icon in the icon table so that the msi uses it. -->
28+ <Property Id="ARPPRODUCTICON" Value="UbuntuOne.exe" />
29+ <Property Id="ALLUSERS" Value="1" />
30+
31 <Media Id="1"
32 Cabinet="UbuntuOne.cab"
33 EmbedCab="yes" />
34
35=== modified file 'install/UbuntuOneXP.wxs'
36--- install/UbuntuOneXP.wxs 2010-10-06 09:06:45 +0000
37+++ install/UbuntuOneXP.wxs 2010-10-06 09:06:46 +0000
38@@ -12,7 +12,7 @@
39 Codepage="1252"
40 Version="1.0.0"
41 Manufacturer="Canonical Ltd.">
42-
43+
44 <Package Id="*"
45 Keywords="Installer"
46 Description="Ubuntu One is the personal cloud service that
47@@ -27,7 +27,13 @@
48 Languages="1033"
49 Compressed="yes"
50 SummaryCodepage="1252" />
51-
52+
53+ <!-- Set the icon to be used in the msi as well as in the add remove location -->
54+ <Icon Id="UbuntuOne.exe" SourceFile="build_results\data\ubuntu-logo-32x32.ico" />
55+ <!-- sets the icon in the icon table so that the msi uses it. -->
56+ <Property Id="ARPPRODUCTICON" Value="UbuntuOne.exe" />
57+ <Property Id="ALLUSERS" Value="1" />
58+
59 <Media Id="1"
60 Cabinet="UbuntuOne.cab"
61 EmbedCab="yes" />
62
63=== modified file 'main.build'
64--- main.build 2010-10-06 09:06:45 +0000
65+++ main.build 2010-10-06 09:06:46 +0000
66@@ -222,10 +222,11 @@
67
68 <mkdir dir="${build_results}" />
69
70- <!-- copy the data folder to add the certificates in the installer -->
71+ <!-- copy the data folder to add the certificates in the installer as well as the icons-->
72 <copy todir="${build_results}/data" flatten="true">
73 <fileset basedir="data">
74 <include name="*.pem" />
75+ <include name="*.ico" />
76 </fileset>
77 </copy>
78
79
80=== modified file 'src/UbuntuOneClient/UbuntuOneClient.csproj'
81--- src/UbuntuOneClient/UbuntuOneClient.csproj 2010-10-06 09:06:45 +0000
82+++ src/UbuntuOneClient/UbuntuOneClient.csproj 2010-10-06 09:06:46 +0000
83@@ -14,6 +14,7 @@
84 <FileAlignment>512</FileAlignment>
85 <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
86 <WarningLevel>4</WarningLevel>
87+ <ApplicationIcon>ubuntu-logo-32x32.ico</ApplicationIcon>
88 </PropertyGroup>
89 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
90 <DebugSymbols>true</DebugSymbols>
91@@ -120,6 +121,9 @@
92 <ItemGroup>
93 <EmbeddedResource Include="objects.xml" />
94 </ItemGroup>
95+ <ItemGroup>
96+ <Resource Include="ubuntu-logo-32x32.ico" />
97+ </ItemGroup>
98 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
99 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
100 Other similar extension points exist, see Microsoft.Common.targets.
101
102=== added file 'src/UbuntuOneClient/ubuntu-logo-32x32.ico'
103Binary files src/UbuntuOneClient/ubuntu-logo-32x32.ico 1970-01-01 00:00:00 +0000 and src/UbuntuOneClient/ubuntu-logo-32x32.ico 2010-10-06 09:06:46 +0000 differ

Subscribers

People subscribed via source and target branches

to all changes: