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
=== added file 'data/ubuntu-logo-22x22.ico'
0Binary 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 differ0Binary 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
=== added file 'data/ubuntu-logo-24x24.ico'
1Binary 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 differ1Binary 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
=== added file 'data/ubuntu-logo-32x32.ico'
2Binary 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 differ2Binary 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
=== modified file 'install/UbuntuOne7.wxs'
--- install/UbuntuOne7.wxs 2010-10-06 09:06:45 +0000
+++ install/UbuntuOne7.wxs 2010-10-06 09:06:46 +0000
@@ -12,7 +12,7 @@
12 Codepage="1252"12 Codepage="1252"
13 Version="1.0.0" 13 Version="1.0.0"
14 Manufacturer="Canonical Ltd.">14 Manufacturer="Canonical Ltd.">
15 15
16 <Package Id="*"16 <Package Id="*"
17 Keywords="Installer"17 Keywords="Installer"
18 Description="Ubuntu One is the personal cloud service that 18 Description="Ubuntu One is the personal cloud service that
@@ -27,7 +27,13 @@
27 Languages="1033" 27 Languages="1033"
28 Compressed="yes"28 Compressed="yes"
29 SummaryCodepage="1252" />29 SummaryCodepage="1252" />
30 30
31 <!-- Set the icon to be used in the msi as well as in the add remove location -->
32 <Icon Id="UbuntuOne.exe" SourceFile="build_results\data\ubuntu-logo-32x32.ico" />
33 <!-- sets the icon in the icon table so that the msi uses it. -->
34 <Property Id="ARPPRODUCTICON" Value="UbuntuOne.exe" />
35 <Property Id="ALLUSERS" Value="1" />
36
31 <Media Id="1"37 <Media Id="1"
32 Cabinet="UbuntuOne.cab"38 Cabinet="UbuntuOne.cab"
33 EmbedCab="yes" />39 EmbedCab="yes" />
3440
=== modified file 'install/UbuntuOneXP.wxs'
--- install/UbuntuOneXP.wxs 2010-10-06 09:06:45 +0000
+++ install/UbuntuOneXP.wxs 2010-10-06 09:06:46 +0000
@@ -12,7 +12,7 @@
12 Codepage="1252"12 Codepage="1252"
13 Version="1.0.0" 13 Version="1.0.0"
14 Manufacturer="Canonical Ltd.">14 Manufacturer="Canonical Ltd.">
15 15
16 <Package Id="*"16 <Package Id="*"
17 Keywords="Installer"17 Keywords="Installer"
18 Description="Ubuntu One is the personal cloud service that 18 Description="Ubuntu One is the personal cloud service that
@@ -27,7 +27,13 @@
27 Languages="1033" 27 Languages="1033"
28 Compressed="yes"28 Compressed="yes"
29 SummaryCodepage="1252" />29 SummaryCodepage="1252" />
30 30
31 <!-- Set the icon to be used in the msi as well as in the add remove location -->
32 <Icon Id="UbuntuOne.exe" SourceFile="build_results\data\ubuntu-logo-32x32.ico" />
33 <!-- sets the icon in the icon table so that the msi uses it. -->
34 <Property Id="ARPPRODUCTICON" Value="UbuntuOne.exe" />
35 <Property Id="ALLUSERS" Value="1" />
36
31 <Media Id="1"37 <Media Id="1"
32 Cabinet="UbuntuOne.cab"38 Cabinet="UbuntuOne.cab"
33 EmbedCab="yes" />39 EmbedCab="yes" />
3440
=== modified file 'main.build'
--- main.build 2010-10-06 09:06:45 +0000
+++ main.build 2010-10-06 09:06:46 +0000
@@ -222,10 +222,11 @@
222 222
223 <mkdir dir="${build_results}" />223 <mkdir dir="${build_results}" />
224 224
225 <!-- copy the data folder to add the certificates in the installer -->225 <!-- copy the data folder to add the certificates in the installer as well as the icons-->
226 <copy todir="${build_results}/data" flatten="true">226 <copy todir="${build_results}/data" flatten="true">
227 <fileset basedir="data">227 <fileset basedir="data">
228 <include name="*.pem" />228 <include name="*.pem" />
229 <include name="*.ico" />
229 </fileset>230 </fileset>
230 </copy>231 </copy>
231 232
232233
=== modified file 'src/UbuntuOneClient/UbuntuOneClient.csproj'
--- src/UbuntuOneClient/UbuntuOneClient.csproj 2010-10-06 09:06:45 +0000
+++ src/UbuntuOneClient/UbuntuOneClient.csproj 2010-10-06 09:06:46 +0000
@@ -14,6 +14,7 @@
14 <FileAlignment>512</FileAlignment>14 <FileAlignment>512</FileAlignment>
15 <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>15 <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
16 <WarningLevel>4</WarningLevel>16 <WarningLevel>4</WarningLevel>
17 <ApplicationIcon>ubuntu-logo-32x32.ico</ApplicationIcon>
17 </PropertyGroup>18 </PropertyGroup>
18 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">19 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
19 <DebugSymbols>true</DebugSymbols>20 <DebugSymbols>true</DebugSymbols>
@@ -120,6 +121,9 @@
120 <ItemGroup>121 <ItemGroup>
121 <EmbeddedResource Include="objects.xml" />122 <EmbeddedResource Include="objects.xml" />
122 </ItemGroup>123 </ItemGroup>
124 <ItemGroup>
125 <Resource Include="ubuntu-logo-32x32.ico" />
126 </ItemGroup>
123 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />127 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
124 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 128 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
125 Other similar extension points exist, see Microsoft.Common.targets.129 Other similar extension points exist, see Microsoft.Common.targets.
126130
=== added file 'src/UbuntuOneClient/ubuntu-logo-32x32.ico'
127Binary 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 differ131Binary 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: