ubuntuone-installer

Merge lp:~dobey/ubuntuone-installer/new-logo into lp:ubuntuone-installer

  1. new-logo
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 28
Merged at revision: 31
Proposed branch: lp:~dobey/ubuntuone-installer/new-logo
Merge into: lp:ubuntuone-installer
Diff against target: 93 lines (+22/-7)
2 files modified
data/u1logo.svg (+19/-0)
ubuntuone/installer/gui.py (+3/-7)
To merge this branch: bzr merge lp:~dobey/ubuntuone-installer/new-logo
Reviewer Review Type Date Requested Status
Manuel de la Peña (community) Approve
Lisette Slegers (community) Approve
Review via email: mp+107280@code.launchpad.net

Commit message

Replace the logo with an SVG with better proportions

Description of the change

For a screenshot of the installer with the new logo, see: http://ubuntuone.com/0nEaIGiMba09ObquJ2Ul41

To post a comment you must log in.
Revision history for this message
Lisette Slegers (lisette-slegers) wrote :

The top of the U1 shape part of the logo should be aligned 12px from the top, not the top of the 'b'. It looks visually off now, but I understand it is impossible to lift the logo image up by 6px, without moving the text up too. We should consider using the alternative brand mark to avoid this in future versions.

review: Approve
Revision history for this message
dobey (dobey) wrote :

http://ubuntuone.com/0uP8qddPaI9dfFaiNCRMHi is a screen shot of the installer with fixed spacing of the content.

Revision history for this message
Manuel de la Peña (mandel) wrote :

Can we have some tests added for this, I'm not that concern about adding tests for the spacing (that is just stupid) but I'd like to see at least a test asserting that the correct logo is used.

Also AFAIK the data/u1logo.svg is not present in the setup.py, is that intentional? I thin that we should ensure that if a user uses the setup.py all the required data is copied.

review: Needs Fixing
Revision history for this message
dobey (dobey) wrote :

How do you mean to "test that the correct logo is used" exactly?

The image is picked up automatically, as it was before, by DistutilsExtra.auto.

Revision history for this message
Manuel de la Peña (mandel) :
review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :

The attempt to merge lp:~dobey/ubuntuone-installer/new-logo into lp:ubuntuone-installer failed. Below is the output from the failed tests.

Traceback (most recent call last):
  File "/usr/bin/u1trial", line 337, in <module>
    main()
  File "/usr/bin/u1trial", line 317, in main
    suite = trial_runner.get_suite(config)
  File "/usr/bin/u1trial", line 196, in get_suite
    config['ignore-paths']))
  File "/usr/bin/u1trial", line 180, in _collect_tests
    module_suite = self._load_unittest(filepath)
  File "/usr/bin/u1trial", line 120, in _load_unittest
    module = __import__(modpath, None, None, [""])
  File "/mnt/tarmac/cache/ubuntuone-installer/trunk/ubuntuone/installer/tests/test_gui.py", line 18, in <module>
    from gi.repository import Gtk
  File "/usr/lib/python2.7/dist-packages/gi/importer.py", line 76, in load_module
    dynamic_module._load()
  File "/usr/lib/python2.7/dist-packages/gi/module.py", line 224, in _load
    overrides_modules = __import__('gi.overrides', fromlist=[self._namespace])
  File "/usr/lib/python2.7/dist-packages/gi/overrides/Gtk.py", line 1533, in <module>
    raise RuntimeError("Gtk couldn't be initialized")
RuntimeError: Gtk couldn't be initialized

Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :

The attempt to merge lp:~dobey/ubuntuone-installer/new-logo into lp:ubuntuone-installer failed. Below is the output from the failed tests.

Traceback (most recent call last):
  File "/usr/bin/u1trial", line 337, in <module>
    main()
  File "/usr/bin/u1trial", line 317, in main
    suite = trial_runner.get_suite(config)
  File "/usr/bin/u1trial", line 196, in get_suite
    config['ignore-paths']))
  File "/usr/bin/u1trial", line 180, in _collect_tests
    module_suite = self._load_unittest(filepath)
  File "/usr/bin/u1trial", line 120, in _load_unittest
    module = __import__(modpath, None, None, [""])
  File "/mnt/tarmac/cache/ubuntuone-installer/trunk/ubuntuone/installer/tests/test_gui.py", line 21, in <module>
    from ubuntuone.installer import gui
  File "/mnt/tarmac/cache/ubuntuone-installer/trunk/ubuntuone/installer/gui.py", line 18, in <module>
    import aptdaemon.gtk3widgets as aptgtk
ImportError: No module named aptdaemon.gtk3widgets

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== removed file 'data/u1logo.png'
0Binary files data/u1logo.png 2011-08-24 17:27:17 +0000 and data/u1logo.png 1970-01-01 00:00:00 +0000 differ0Binary files data/u1logo.png 2011-08-24 17:27:17 +0000 and data/u1logo.png 1970-01-01 00:00:00 +0000 differ
=== added file 'data/u1logo.svg'
--- data/u1logo.svg 1970-01-01 00:00:00 +0000
+++ data/u1logo.svg 2012-05-25 19:32:28 +0000
@@ -0,0 +1,19 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
3<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
4<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="122.084px" height="49.5px" viewBox="0 0 122.084 49.5" enable-background="new 0 0 122.084 49.5" xml:space="preserve">
5<g>
6 <g>
7 <path fill="#DD4814" d="M23.649,7.29v30.984H13.5V17.713H8.673L14.228,7.29H1.362v22.837c0,2.77,0.288,5.282,0.863,7.551 c0.573,2.269,1.514,4.239,2.813,5.906c1.301,1.666,3.032,2.959,5.164,3.873c2.14,0.913,5.038,1.368,8.164,1.368 c3.6,0,6.915-0.236,9.647-0.699c2.743-0.471,5.087-0.914,6.756-1.333V7.29H23.649z"/>
8 <path fill="#DD4814" d="M53.901,20.038c-1.087,0.273-2.927,0.656-5.254,0.656c-4.04,0-5.48-2.496-5.48-6.033V7.29h2.349v6.866 c0,3.205,0.989,4.464,3.387,4.464c0.986,0,2.322-0.123,2.651-0.249V7.29h2.348V20.038z"/>
9 <path fill="#DD4814" d="M82.605,20.038c-1.084,0.273-2.935,0.656-5.256,0.656c-4.037,0-5.48-2.496-5.48-6.033V7.29h2.351v6.866 c0,3.205,0.985,4.464,3.382,4.464c0.988,0,2.328-0.123,2.657-0.249V7.29h2.346V20.038z"/>
10 <path fill="#DD4814" d="M120.8,20.038c-1.084,0.273-2.934,0.656-5.256,0.656c-4.037,0-5.479-2.496-5.479-6.033V7.29h2.348v6.866 c0,3.205,0.986,4.464,3.388,4.464c0.984,0,2.321-0.123,2.645-0.249V7.29h2.355V20.038z"/>
11 <path fill="#DD4814" d="M59.844,7.871c0.58-0.379,1.864-0.886,3.376-0.886c3.771,0,5.968,2.832,5.968,6.873 c0,4.249-2.625,6.873-6.646,6.873c-2.198,0-3.966-0.379-5.056-0.681V1.229l2.356-0.404V7.871z M59.844,18.377 c0.473,0.132,1.386,0.283,2.673,0.283c2.529,0,4.22-1.742,4.22-4.802c0-2.726-1.09-4.798-3.816-4.798 c-1.283,0-2.497,0.53-3.077,1.01V18.377z"/>
12 <path fill="#DD4814" d="M86.206,7.663c1.083-0.27,2.93-0.656,5.245-0.656c4.16,0,5.469,2.472,5.469,6.024v7.357h-2.347v-6.85 c0-3.25-0.882-4.458-3.376-4.458c-1.011,0-2.294,0.173-2.65,0.248v11.06h-2.341V7.663z"/>
13 <path fill="#DD4814" d="M102.581,7.293h5.095v1.965h-5.095v6.048c0,2.627,0.854,3.301,2.469,3.301c1.407,0,2.34-0.454,2.665-0.581 l0.454,1.941c-0.475,0.229-1.809,0.701-3.326,0.701c-3.523,0-4.607-1.833-4.607-5.335V3.641l2.346-0.405V7.293z"/>
14 <path fill="#333333" d="M57.622,25.197c1.093-0.276,2.953-0.656,5.299-0.656c4.206,0,5.522,2.49,5.522,6.083v7.44h-2.372v-6.93 c0-3.284-0.884-4.511-3.413-4.511c-1.012,0-2.313,0.181-2.667,0.255v11.187h-2.37V25.197z"/>
15 <path fill="#333333" d="M70.471,31.42c0-4.607,2.975-6.86,6.005-6.86c3.511,0,5.488,2.151,5.488,6.63c0,0.199,0,0.55-0.018,0.83 h-9.044c0.196,2.71,1.551,4.137,4.456,4.137c1.627,0,2.804-0.352,3.382-0.628l0.326,1.953c-0.576,0.301-2.161,0.73-3.961,0.73 C72.577,38.212,70.471,35.331,70.471,31.42L70.471,31.42z M79.54,30.145c0.018-2.106-1.182-3.607-3.08-3.607 c-2.159,0-3.308,1.801-3.513,3.607H79.54z"/>
16 <path fill="#333333" d="M55.308,31.389c0,4.115-2.628,6.844-6.189,6.844c-3.557,0-6.186-2.729-6.186-6.844 c0-4.1,2.629-6.829,6.186-6.829C52.68,24.56,55.308,27.29,55.308,31.389L55.308,31.389z M52.877,31.389 c0-2.923-1.478-4.78-3.758-4.78c-2.276,0-3.752,1.857-3.752,4.78c0,2.938,1.476,4.787,3.752,4.787 C51.399,36.176,52.877,34.327,52.877,31.389z"/>
17 </g>
18</g>
19</svg>
0\ No newline at end of file20\ No newline at end of file
121
=== modified file 'ubuntuone/installer/gui.py'
--- ubuntuone/installer/gui.py 2012-05-21 18:37:40 +0000
+++ ubuntuone/installer/gui.py 2012-05-25 19:32:28 +0000
@@ -110,12 +110,12 @@
110 self.set_position(Gtk.WindowPosition.CENTER)110 self.set_position(Gtk.WindowPosition.CENTER)
111111
112 vbox = Gtk.VBox()112 vbox = Gtk.VBox()
113 vbox.set_border_width(12)
113 vbox.set_spacing(24)114 vbox.set_spacing(24)
114 self.add(vbox)115 self.add(vbox)
115 vbox.show()116 vbox.show()
116117
117 self.__header = Gtk.HBox()118 self.__header = Gtk.HBox()
118 self.__header.set_border_width(12)
119 self.__header.set_spacing(64)119 self.__header.set_spacing(64)
120 vbox.pack_start(self.__header, False, False, 0)120 vbox.pack_start(self.__header, False, False, 0)
121 self.__header.show()121 self.__header.show()
@@ -143,7 +143,7 @@
143 self.__header.pack_end(self.__hlogo, False, False, 0)143 self.__header.pack_end(self.__hlogo, False, False, 0)
144 self.__hlogo.show()144 self.__hlogo.show()
145145
146 logo = self.__find_data_file('u1logo.png')146 logo = self.__find_data_file('u1logo.svg')
147 if logo:147 if logo:
148 self.__hlogo.set_from_file(logo)148 self.__hlogo.set_from_file(logo)
149149
@@ -177,7 +177,6 @@
177 self.__notebook.show()177 self.__notebook.show()
178178
179 self.__action_area = Gtk.HButtonBox()179 self.__action_area = Gtk.HButtonBox()
180 self.__action_area.set_border_width(12)
181 self.__action_area.set_spacing(12)180 self.__action_area.set_spacing(12)
182 self.__action_area.set_layout(Gtk.ButtonBoxStyle.END)181 self.__action_area.set_layout(Gtk.ButtonBoxStyle.END)
183 vbox.pack_end(self.__action_area, False, True, 0)182 vbox.pack_end(self.__action_area, False, True, 0)
@@ -263,7 +262,6 @@
263 def __construct_info_page(self):262 def __construct_info_page(self):
264 """Build the initial info page."""263 """Build the initial info page."""
265 page = Gtk.HBox()264 page = Gtk.HBox()
266 page.set_border_width(6)
267 page.set_spacing(12)265 page.set_spacing(12)
268 page.show()266 page.show()
269267
@@ -276,7 +274,7 @@
276 table = Gtk.Table(5, 2, False)274 table = Gtk.Table(5, 2, False)
277 table.set_row_spacings(6)275 table.set_row_spacings(6)
278 table.set_col_spacings(12)276 table.set_col_spacings(12)
279 page.pack_start(table, True, True, 24)277 page.pack_start(table, True, True, 0)
280 table.show()278 table.show()
281279
282 image = Gtk.Image()280 image = Gtk.Image()
@@ -339,7 +337,6 @@
339 def __construct_progress_page(self):337 def __construct_progress_page(self):
340 """Build the install progress page."""338 """Build the install progress page."""
341 page = Gtk.VBox()339 page = Gtk.VBox()
342 page.set_border_width(24)
343 page.set_spacing(6)340 page.set_spacing(6)
344 page.show()341 page.show()
345342
@@ -356,7 +353,6 @@
356 def __construct_error_page(self):353 def __construct_error_page(self):
357 """A page for showing errors to the user."""354 """A page for showing errors to the user."""
358 page = Gtk.HBox()355 page = Gtk.HBox()
359 page.set_border_width(24)
360 page.set_spacing(12)356 page.set_spacing(12)
361 page.show()357 page.show()
362358

Subscribers

People subscribed via source and target branches

to all changes: