Merge lp:~dobey/ubuntuone-installer/install-pages into lp:ubuntuone-installer

[dobey]

Add the header image, and infrastructure for installing the Ubuntu One packages
Handle doing all the install work and updating the progress bar
Launch the control panel when installation is finished

[Eric Casteleijn (thisfred)]

Looks good

review: Approve

[Roberto Alsina (ralsina)]

review: Approve

=== added directory 'data'
=== added file 'data/header.png'
Binary files data/header.png	1970-01-01 00:00:00 +0000 and data/header.png	2011-08-03 18:07:09 +0000 differ
=== modified file 'ubuntuone/installer/gui.py'
--- ubuntuone/installer/gui.py	2011-07-29 14:31:29 +0000
+++ ubuntuone/installer/gui.py	2011-08-03 18:07:09 +0000
@@ -15,51 +15,216 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 """The GUI of the Ubuntu One Installer."""
 
-from gi.repository import Gtk
-
-
-class Window(Gtk.Dialog):
+import aptdaemon.gtk3widgets as aptgtk
+import aptdaemon.client as aptclient
+import os
+
+from gi.repository import Gtk, GObject, GLib, Gdk
+
+# Some shenanigans to deal with pyflakes complaining
+inline_callbacks = None
+try:
+    from defer import inline_callbacks
+except ImportError:
+    from aptdaemon.defer import inline_callbacks as old_callbacks
+
+if inline_callbacks is None:
+    inline_callbacks = old_callbacks
+
+
+class Window(Gtk.Window):
     """The main dialog to use."""
 
+    __gsignals__ = {'response': (GObject.SIGNAL_RUN_LAST,
+                                 GObject.TYPE_NONE,
+                                 (GObject.TYPE_INT,)),
+                    }
+
     def __init__(self):
-        Gtk.Dialog.__init__(self)
+        Gtk.Window.__init__(self)
         self.set_title('Ubuntu One')
-        self.set_default_size(800, 480)
-        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.get_content_area().add(self.notebook)
-        self.add_buttons(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
-                         "Install", Gtk.ResponseType.OK)
-
-        self.set_default_response(Gtk.ResponseType.OK)
-        # No functionality yet.
-        self.get_widget_for_response(Gtk.ResponseType.OK).set_sensitive(False)
+        self.set_type_hint(Gdk.WindowTypeHint.DIALOG)
+        self.set_position(Gtk.WindowPosition.CENTER)
+
+        vbox = Gtk.VBox()
+        self.add(vbox)
+        vbox.show()
+
+        self.__header = Gtk.Image()
+        self.__header.set_size_request(734, 162)
+        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.__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.__info_page = self.__construct_info_page()
+        self.__notebook.append_page(self.__info_page, None)
+        self.__info_page.show()
+
+        # Our progressbar widget
+        self.__apt_progress = aptgtk.AptProgressBar()
+
+        self.__progress_page = self.__construct_progress_page()
+        self.__notebook.append_page(self.__progress_page, None)
+        self.__progress_page.show()
+
+        vbox.add(self.__notebook)
+        self.__notebook.show()
+
+        self.__action_area = Gtk.HButtonBox()
+        self.__action_area.set_border_width(12)
+        self.__action_area.set_spacing(12)
+        self.__action_area.set_layout(Gtk.ButtonBoxStyle.END)
+        vbox.pack_end(self.__action_area, False, True, 0)
+        self.__action_area.show()
+
+        self.__cancel_button = Gtk.Button.new_from_stock(Gtk.STOCK_CANCEL)
+        self.__cancel_button.connect('clicked', lambda x: self.emit(
+                'response', Gtk.ResponseType.CANCEL))
+        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.set_image(Gtk.Image.new_from_stock(
+                Gtk.STOCK_OK, Gtk.IconSize.BUTTON))
+        self.__main_button.connect('clicked', lambda x: self.emit(
+                'response', Gtk.ResponseType.OK))
+        self.__action_area.add(self.__main_button)
+        self.__main_button.grab_focus()
+        self.__main_button.show()
 
         self.connect('destroy', self.destroyed)
-        self.connect('response', self.__response)
-        self.notebook.connect('switch-page', self.__page_switched)
-
-    def __page_switched(self, notebook, page, page_num):
-        """Handle the notebook page changing."""
-
-    def __response(self, dialog, response):
+        self.connect('response', self.__got_response)
+        self.connect('delete-event', lambda x, y: self.emit(
+                        'response', Gtk.ResponseType.DELETE_EVENT))
+
+        self.client = aptclient.AptClient()
+
+    def __find_data_file(self, filename):
+        """Find the full path for the specified data file."""
+        path = os.path.join(os.getcwd(), 'data', filename)
+        if os.path.exists(path):
+            return path
+
+        path = os.path.join(os.getcwd(), 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):
+                return path
+
+    def __got_response(self, dialog, response):
         """Handle the dialog response actions."""
         if response in [Gtk.ResponseType.CANCEL,
                         Gtk.ResponseType.DELETE_EVENT]:
             self.destroy()
             Gtk.main_quit()
             return
-
-        self.notebook.next_page()
+        elif response == Gtk.ResponseType.OK:
+            self.__do_install()
+
+    def __construct_info_page(self):
+        """Build the initial info page."""
+        page = Gtk.VBox()
+        page.set_border_width(12)
+        page.show()
+
+        label = Gtk.Label('')
+        page.add(label)
+        label.show()
+
+        return page
+
+    def __construct_progress_page(self):
+        """Build the install progress page."""
+        page = Gtk.VBox()
+        page.set_border_width(12)
+        page.show()
+
+        page.pack_start(self.__apt_progress, True, False, 0)
+        self.__apt_progress.show()
+
+        return page
+
+    def __get_series(self):
+        """Get the series we're running on."""
+        return 'natty'
+
+    def __got_error(self, error):
+        """Got an error trying to set up Ubuntu One."""
+        Gtk.main_quit()
+
+    @inline_callbacks
+    def __install_u1(self, *args, **kwargs):
+        """Install the packages."""
+        self.__apt_progress.set_fraction(0.0)
+
+        def finished(*args, **kwargs):
+            GLib.spawn_command_line_async('ubuntuone-control-panel-gtk')
+            Gtk.main_quit()
+
+        transaction = yield self.client.install_packages(
+            package_names=['ubuntuone-control-panel-gtk',
+                           ])
+        transaction.connect('finished', finished)
+        self.__apt_progress.set_transaction(transaction)
+        transaction.run()
+
+    @inline_callbacks
+    def __update_cache(self, *args, **kwargs):
+        """Update the cache."""
+        self.__apt_progress.set_fraction(0.0)
+        transaction = yield self.client.update_cache(
+            sources_list='ubuntuone-stable-ppa.list')
+        transaction.connect('finished', self.__install_u1)
+        self.__apt_progress.set_transaction(transaction)
+        transaction.run()
+
+    @inline_callbacks
+    def __add_stable_ppa(self):
+        """Add the Ubuntu One 'stable' PPA to apt."""
+        transaction = yield self.client.add_repository(
+            src_type='deb',
+            uri='http://ppa.launchpad.net/ubuntuone/stable/ubuntu',
+            dist=self.__get_series(),
+            comps=['main'],
+            comment='added by Ubuntu One installer',
+            sourcesfile='ubuntuone-stable-ppa.list')
+        transaction.connect('finished', self.__update_cache)
+        self.__apt_progress.set_transaction(transaction)
+        transaction.run()
+
+    def __do_install(self):
+        """Do the install."""
+        # Hide the buttons
+        self.__cancel_button.hide()
+        self.__main_button.hide()
+
+        # Switch to the progress page
+        self.__notebook.set_current_page(1)
+
+        self.__add_stable_ppa()
 
     @property
     def active_page(self):
         """Get the active page."""
-        return self.notebook.get_current_page()
+        return self.__notebook.get_current_page()
+
+    def response(self, response):
+        """Emit the response signal with the value response."""
+        self.emit('response', int(response))
 
     def run(self):
         """Show the dialog and do what's necessary."""

=== modified file 'ubuntuone/installer/tests/test_gui.py'
--- ubuntuone/installer/tests/test_gui.py	2011-07-29 14:31:29 +0000
+++ ubuntuone/installer/tests/test_gui.py	2011-08-03 18:07:09 +0000
@@ -15,13 +15,12 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 """Tests for the GUI of the Ubuntu One Installer."""
 
-import unittest
-
 from gi.repository import Gtk
+from ubuntuone.devtools.testcase import DBusTestCase
 from ubuntuone.installer import gui
 
 
-class GUITestCase(unittest.TestCase):
+class GUITestCase(DBusTestCase):
     """Main class tests."""
 
     def setUp(self):
@@ -32,12 +31,21 @@
     def tearDown(self):
         self.dlg.destroy()
 
-    def test_response(self):
+    def test_response_cancel(self):
         """Test the response callback."""
-        self.dlg.response(Gtk.ResponseType.CLOSE)
+        self.dlg.response(Gtk.ResponseType.CANCEL)
 
     def test_page_switched(self):
         """Test the page switching."""
-        self.assertEquals(self.dlg.active_page, -1)
-        self.dlg.response(Gtk.ResponseType.OK)
-        self.assertEquals(self.dlg.active_page, -1)
+        #self.assertEquals(self.dlg.active_page, 0)
+        self.dlg.response(Gtk.ResponseType.OK)
+        self.assertEquals(self.dlg.active_page, 1)
+
+    def test_initial_page(self):
+        """Test the initial info page."""
+        self.assertEquals(self.dlg.active_page, 0)
+
+    def test_progress_page(self):
+        """Test the install progresss page."""
+        self.dlg.response(Gtk.ResponseType.OK)
+        self.assertEquals(self.dlg.active_page, 1)