Merge lp:~dobey/ubuntu/oneiric/ubuntuone-installer/release-173 into lp:ubuntu/oneiric/ubuntuone-installer

[dobey]

[Ken VanDine (ken-vandine)]

review: Approve

=== removed file 'MANIFEST'
--- MANIFEST	2011-08-17 12:00:40 +0000
+++ MANIFEST	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-# file GENERATED by distutils, do NOT edit
-COPYING
-MANIFEST
-run-tests
-setup.py
-ubuntuone-installer.desktop.in
-ubuntuone.installer.pth
-bin/ubuntuone-installer
-data/header.png
-po/LINGUAS
-po/POTFILES.in
-po/ubuntuone-installer.pot
-ubuntuone/__init__.py
-ubuntuone/installer/__init__.py
-ubuntuone/installer/gui.py
-ubuntuone/installer/tests/__init__.py
-ubuntuone/installer/tests/test_gui.py
 
=== modified file 'PKG-INFO'
--- PKG-INFO	2011-08-17 12:00:40 +0000
+++ PKG-INFO	2011-08-24 20:37:24 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: ubuntuone-installer
-Version: 1.7.2
+Version: 1.7.3
 Summary: Ubuntu One Installer
 Home-page: https://launchpad.net/ubuntuone-installer
 Author: Ubuntu One Hackers
 
=== removed file 'data/header.png'
 Binary files data/header.png	2011-08-17 12:00:40 +0000 and data/header.png	1970-01-01 00:00:00 +0000 differ
=== added directory 'data/icons'
=== added directory 'data/icons/16x16'
=== added directory 'data/icons/16x16/apps'
=== added file 'data/icons/16x16/apps/ubuntuone-installer.png'
 Binary files data/icons/16x16/apps/ubuntuone-installer.png	1970-01-01 00:00:00 +0000 and data/icons/16x16/apps/ubuntuone-installer.png	2011-08-24 20:37:24 +0000 differ
=== added directory 'data/icons/24x24'
=== added directory 'data/icons/24x24/apps'
=== added file 'data/icons/24x24/apps/ubuntuone-installer.png'
 Binary files data/icons/24x24/apps/ubuntuone-installer.png	1970-01-01 00:00:00 +0000 and data/icons/24x24/apps/ubuntuone-installer.png	2011-08-24 20:37:24 +0000 differ
=== added directory 'data/icons/32x32'
=== added directory 'data/icons/32x32/apps'
=== added file 'data/icons/32x32/apps/ubuntuone-installer.png'
 Binary files data/icons/32x32/apps/ubuntuone-installer.png	1970-01-01 00:00:00 +0000 and data/icons/32x32/apps/ubuntuone-installer.png	2011-08-24 20:37:24 +0000 differ
=== added directory 'data/icons/48x48'
=== added directory 'data/icons/48x48/apps'
=== added file 'data/icons/48x48/apps/ubuntuone-installer.png'
 Binary files data/icons/48x48/apps/ubuntuone-installer.png	1970-01-01 00:00:00 +0000 and data/icons/48x48/apps/ubuntuone-installer.png	2011-08-24 20:37:24 +0000 differ
=== added file 'data/share.png'
 Binary files data/share.png	1970-01-01 00:00:00 +0000 and data/share.png	2011-08-24 20:37:24 +0000 differ
=== added file 'data/stream.png'
 Binary files data/stream.png	1970-01-01 00:00:00 +0000 and data/stream.png	2011-08-24 20:37:24 +0000 differ
=== added file 'data/sync.png'
 Binary files data/sync.png	1970-01-01 00:00:00 +0000 and data/sync.png	2011-08-24 20:37:24 +0000 differ
=== added file 'data/u1logo.png'
 Binary files data/u1logo.png	1970-01-01 00:00:00 +0000 and data/u1logo.png	2011-08-24 20:37:24 +0000 differ
=== modified file 'debian/changelog'
--- debian/changelog	2011-08-22 14:39:30 +0000
+++ debian/changelog	2011-08-24 20:37:24 +0000
@@ -1,3 +1,12 @@
+ubuntuone-installer (1.7.3-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release.
+    - Add icons for the installer app (LP: #833231)
+    - Update the UI to match the final design (LP: #828195)
+    - Add a learn more button (LP: #828169)
+
+ -- Rodney Dawes <[e-mail]>  Wed, 24 Aug 2011 16:30:01 -0400
+
 ubuntuone-installer (1.7.2-0ubuntu2) oneiric; urgency=low
 
   * Require new DistUtilsExtra, avoid override with xvfb, fixes FTBFS
 
=== removed file 'po/ubuntuone-installer.pot'
--- po/ubuntuone-installer.pot	2011-08-17 12:00:40 +0000
+++ po/ubuntuone-installer.pot	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-11 14:12-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <[e-mail]>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../ubuntuone-installer.desktop.in.h:1
-msgid "Configure and manage your Ubuntu One account"
-msgstr ""
 
=== modified file 'setup.py'
--- setup.py	2011-08-17 12:00:40 +0000
+++ setup.py	2011-08-24 20:37:24 +0000
@@ -52,7 +52,7 @@
 
 DistUtilsExtra.auto.setup(
     name='ubuntuone-installer',
-    version='1.7.2',
+    version='1.7.3',
     license='GPL v3',
     author='Ubuntu One Hackers',
     author_email='[e-mail]',
 
=== modified file 'ubuntuone-installer.desktop.in'
--- ubuntuone-installer.desktop.in	2011-08-17 12:00:40 +0000
+++ ubuntuone-installer.desktop.in	2011-08-24 20:37:24 +0000
@@ -2,7 +2,7 @@
 Name=Ubuntu One
 _Comment=Configure and manage your Ubuntu One account
 Exec=ubuntuone-installer
-Icon=ubuntuone
+Icon=ubuntuone-installer
 Terminal=false
 Type=Application
 Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings
 
=== modified file 'ubuntuone/installer/gui.py'
--- ubuntuone/installer/gui.py	2011-08-17 12:00:40 +0000
+++ ubuntuone/installer/gui.py	2011-08-24 20:37:24 +0000
@@ -19,7 +19,7 @@
 import aptdaemon.client as aptclient
 import os
 
-from gi.repository import Gtk, GObject, GLib, Gdk
+from gi.repository import Gtk, GObject, GLib, Gdk, Pango
 
 # Some shenanigans to deal with pyflakes complaining
 inline_callbacks = None
@@ -36,6 +36,29 @@
     """Exception for when on an unsupported distribution."""
 
 
+class VSeparator(Gtk.VSeparator):
+    """A dotted line separator."""
+
+    def do_draw(self, cairo_context):
+        """Draw some magic."""
+        sc = self.get_style_context()
+        state = self.get_state_flags()
+        width = self.get_allocated_width()
+        height = self.get_allocated_height()
+
+        sc.save()
+        sc.set_state(state)
+
+        y = 0
+        x = width / 2
+        while y < height:
+            Gtk.render_activity(sc, cairo_context, float(x), float(y), 1, 1)
+            y += 3
+
+        sc.restore()
+        return True
+
+
 class Window(Gtk.Window):
     """The main dialog to use."""
 
@@ -47,28 +70,54 @@
     def __init__(self):
         Gtk.Window.__init__(self)
         self.set_title('Ubuntu One')
+        self.set_default_icon_name('ubuntuone-installer')
         self.set_type_hint(Gdk.WindowTypeHint.DIALOG)
         self.set_position(Gtk.WindowPosition.CENTER)
 
         vbox = Gtk.VBox()
+        vbox.set_spacing(24)
         self.add(vbox)
         vbox.show()
 
-        self.__header = Gtk.Image()
-        self.__header.set_size_request(734, 162)
+        self.__header = Gtk.HBox()
+        self.__header.set_border_width(12)
+        self.__header.set_spacing(64)
         vbox.pack_start(self.__header, False, False, 0)
         self.__header.show()
 
-        header = self.__find_data_file('header.png')
-        if header:
-            self.__header.set_from_file(header)
+        self.__hlabelbox = Gtk.VBox()
+        self.__hlabelbox.set_spacing(12)
+        self.__header.pack_start(self.__hlabelbox, True, True, 0)
+        self.__hlabelbox.show()
+
+        self.__hlabel = Gtk.Label((u'<span size="xx-large">{}</span>').format(
+                u'Install Ubuntu One'))
+        self.__hlabel.set_use_markup(True)
+        self.__hlabel.set_alignment(0.0, 0.0)
+        self.__hlabelbox.pack_start(self.__hlabel, False, False, 0)
+        self.__hlabel.show()
+
+        self.__hlabel2 = Gtk.Label((u'<span size="large">{}</span>').format(
+                u'Discover the freedom of your personal cloud'))
+        self.__hlabel2.set_use_markup(True)
+        self.__hlabel2.set_alignment(0.0, 0.0)
+        self.__hlabelbox.pack_start(self.__hlabel2, False, False, 0)
+        self.__hlabel2.show()
+
+        self.__hlogo = Gtk.Image()
+        self.__header.pack_end(self.__hlogo, False, False, 0)
+        self.__hlogo.show()
+
+        logo = self.__find_data_file('u1logo.png')
+        if logo:
+            self.__hlogo.set_from_file(logo)
 
         self.__notebook = Gtk.Notebook()
         self.__notebook.set_show_tabs(False)
         self.__notebook.set_show_border(False)
         self.__notebook.set_scrollable(False)
         self.__notebook.popup_disable()
-        self.__notebook.set_size_request(734, 240)
+        #self.__notebook.set_size_request(734, 240)
 
         self.__info_page = self.__construct_info_page()
         self.__notebook.append_page(self.__info_page, None)
@@ -81,7 +130,7 @@
         self.__notebook.append_page(self.__progress_page, None)
         self.__progress_page.show()
 
-        vbox.add(self.__notebook)
+        vbox.pack_start(self.__notebook, False, False, 0)
         self.__notebook.show()
 
         self.__action_area = Gtk.HButtonBox()
@@ -97,8 +146,7 @@
         self.__action_area.add(self.__cancel_button)
         self.__cancel_button.show()
 
-        self.__main_button = Gtk.Button.new_with_mnemonic(
-            'I_nstall Ubuntu One')
+        self.__main_button = Gtk.Button.new_with_mnemonic('I_nstall')
         self.__main_button.set_image(Gtk.Image.new_from_stock(
                 Gtk.STOCK_OK, Gtk.IconSize.BUTTON))
         self.__main_button.connect('clicked', lambda x: self.emit(
@@ -107,6 +155,12 @@
         self.__main_button.grab_focus()
         self.__main_button.show()
 
+        self.__lm_button = Gtk.LinkButton.new_with_label(
+            'https://one.ubuntu.com/', 'Learn more')
+        self.__action_area.add(self.__lm_button)
+        self.__action_area.set_child_secondary(self.__lm_button, True)
+        self.__lm_button.show()
+
         self.connect('destroy', self.destroyed)
         self.connect('response', self.__got_response)
         self.connect('delete-event', lambda x, y: self.emit(
@@ -124,6 +178,11 @@
         if os.path.exists(path):
             return os.path.abspath(path)
 
+        path = os.path.join(os.getcwd(), os.path.pardir, os.path.pardir,
+                            'data', filename)
+        if os.path.exists(path):
+            return os.path.abspath(path)
+
         for folder in GLib.get_system_data_dirs():
             path = os.path.join(folder, 'ubuntuone-installer', filename)
             if os.path.exists(path):
@@ -141,20 +200,101 @@
 
     def __construct_info_page(self):
         """Build the initial info page."""
-        page = Gtk.VBox()
-        page.set_border_width(24)
+        page = Gtk.HBox()
+        page.set_border_width(12)
+        page.set_spacing(12)
         page.show()
 
-        label = Gtk.Label(
-            u'<big><b>{}</b></big>\n\n {}\n {}\n {}'.format(
-                u'The personal cloud that brings your digital life together',
-                u'•  Synchronize files across devices\n',
-                u'•  Access files from anywhere\n',
-                (u'•  Add Music Streaming for unlimited'
-                 u' music on the go')))
-        label.set_use_markup(True)
-        label.set_alignment(0.0, 0.0)
-        page.add(label)
+        # Get the width of a larger character in pixels
+        layout = page.create_pango_layout(u'W')
+        (width, height) = layout.get_size()
+        width = width / Pango.SCALE
+        height = height / Pango.SCALE
+
+        table = Gtk.Table(3, 5, False)
+        table.set_row_spacings(12)
+        table.set_col_spacings(12)
+        page.pack_start(table, True, True, 24)
+        table.show()
+
+        label = Gtk.Label(u'<big>{}</big>'.format(u'Sync'))
+        label.set_use_markup(True)
+        table.attach_defaults(label, 0, 1, 0, 1)
+        label.show()
+
+        image = Gtk.Image()
+        table.attach_defaults(image, 0, 1, 1, 2)
+        image.show()
+        path = self.__find_data_file('sync.png')
+        if path:
+            image.set_from_file(path)
+
+        # Get the width in chars to set max for description labels
+        width_chars = (image.get_pixbuf().get_width() / width) * 2.5
+
+        label = Gtk.Label(u'<small>{}</small>'.format(
+                (u'Sync files across your devices.')))
+        label.set_max_width_chars(width_chars)
+        label.set_width_chars(width_chars)
+        label.set_use_markup(True)
+        label.set_line_wrap(True)
+        label.set_alignment(0.5, 0.0)
+        label.set_justify(Gtk.Justification.CENTER)
+        table.attach_defaults(label, 0, 1, 2, 3)
+        label.show()
+
+        separator = VSeparator()
+        table.attach_defaults(separator, 1, 2, 0, 3)
+        separator.show()
+
+        label = Gtk.Label(u'<big>{}</big>'.format(u'Stream'))
+        label.set_use_markup(True)
+        table.attach_defaults(label, 2, 3, 0, 1)
+        label.show()
+
+        image = Gtk.Image()
+        table.attach_defaults(image, 2, 3, 1, 2)
+        image.show()
+        path = self.__find_data_file('stream.png')
+        if path:
+            image.set_from_file(path)
+
+        label = Gtk.Label(u'<small>{}</small>'.format(
+                (u'Stream your music on the move and offline.')))
+        label.set_max_width_chars(width_chars)
+        label.set_width_chars(width_chars)
+        label.set_use_markup(True)
+        label.set_line_wrap(True)
+        label.set_alignment(0.5, 0.0)
+        label.set_justify(Gtk.Justification.CENTER)
+        table.attach_defaults(label, 2, 3, 2, 3)
+        label.show()
+
+        separator = VSeparator()
+        table.attach_defaults(separator, 3, 4, 0, 3)
+        separator.show()
+
+        label = Gtk.Label(u'<big>{}</big>'.format(u'Share'))
+        label.set_use_markup(True)
+        table.attach_defaults(label, 4, 5, 0, 1)
+        label.show()
+
+        image = Gtk.Image()
+        table.attach_defaults(image, 4, 5, 1, 2)
+        image.show()
+        path = self.__find_data_file('share.png')
+        if path:
+            image.set_from_file(path)
+
+        label = Gtk.Label(u'<small>{}</small>'.format(
+                (u'Share with colleagues, friends, and family.')))
+        label.set_max_width_chars(width_chars)
+        label.set_width_chars(width_chars)
+        label.set_use_markup(True)
+        label.set_line_wrap(True)
+        label.set_alignment(0.5, 0.0)
+        label.set_justify(Gtk.Justification.CENTER)
+        table.attach_defaults(label, 4, 5, 2, 3)
         label.show()
 
         return page