Merge lp:~ralsina/ubuntuone-windows-installer/fix_800381 into lp:ubuntuone-windows-installer

[Roberto Alsina]

Implement the page that lets the user choose between "sync now" / "sync later" / "sync selectively"

Implement the page that lets the user choose between "sync now" / "sync later" / "sync selectively"

This page contains three radio buttons, and the standard back / next buttons.

It should start the sync process (or not) according to user choice, and enable/disable the "sync in progress" indicator in the congratulations page in the same way.

Missing after this branch lands: actually starting or not the sync.

To test IRL (on Linux):

PYTHONPATH=. python bin/ubuntuone-installer-qt

click next, you get a screen with three options. If you choose the 1st or 3rd options and click next, you get a message about how it's syncing now.
If you choose "Sync Later" you don't get that message.

[lp:~ralsina/ubuntuone-windows-installer/fix_800381]

25. By Roberto Alsina on 2011-06-22

test fixes, use .ui instead of .page_ui

26. By Roberto Alsina on 2011-06-22

Style fixes

27. By Roberto Alsina on 2011-06-22

Use snake_case

[Natalia Bidart (nataliabidart)]

review: Approve

[Alejandro J. Cura (alecu)]

Nice branch! A couple of comments:

If I click on "Agree & Install", then on "Back", two buttons are gone from the dialog and only one remains.

Typo: "I want to choose want to sync"
                         ^
                       "what"

review: Needs Fixing

[lp:~ralsina/ubuntuone-windows-installer/fix_800381]

28. By Roberto Alsina on 2011-06-28

Merged current trunk so it's easier to merge back when it's ready

29. By Roberto Alsina on 2011-06-28

pep8 fix

30. By Roberto Alsina on 2011-06-28

Moved the SyncNowOrLaterPage to its own file

31. By Roberto Alsina on 2011-06-28

Fix a test broken by code I lost while merging

32. By Roberto Alsina on 2011-06-28

style fixes

[Alejandro J. Cura (alecu)]

This import is broken:
from ubuntuone_installer.gui.qt.sync_now_or_later import SyncNowOrLaterPage

it seems it should be:
from ubuntuone_installer.gui.qt.ui.sync_now_or_later import SyncNowOrLaterPage

review: Needs Fixing

[lp:~ralsina/ubuntuone-windows-installer/fix_800381]

33. By Roberto Alsina on 2011-06-29

add file I forgot to add before

[Roberto Alsina (ralsina)]

> This import is broken:
> from ubuntuone_installer.gui.qt.sync_now_or_later import SyncNowOrLaterPage
>
> it seems it should be:
> from ubuntuone_installer.gui.qt.ui.sync_now_or_later import SyncNowOrLaterPage

Argh, forgot to bzr add a file!

Fixed now.

[lp:~ralsina/ubuntuone-windows-installer/fix_800381]

34. By Roberto Alsina on 2011-06-29

style fixes

[Alejandro J. Cura (alecu)]

The code in the branch looks good, and run-tests.bat runs sucessfully.
My dev env is borked, so I'm not able to IRL test.

review: Approve

=== modified file 'data/qt/congratulations.ui'
--- data/qt/congratulations.ui	2011-06-21 20:46:27 +0000
+++ data/qt/congratulations.ui	2011-06-29 11:45:57 +0000
@@ -46,42 +46,50 @@
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QLabel" name="label_4">
-       <property name="text">
-        <string>IMAGE GOES HERE?</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <layout class="QVBoxLayout" name="verticalLayout">
-       <item>
-        <widget class="QLabel" name="label_5">
-         <property name="font">
-          <font>
-           <weight>75</weight>
-           <bold>true</bold>
-          </font>
-         </property>
-         <property name="text">
-          <string>Sync in progress...</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="label_6">
-         <property name="text">
-          <string>Your folders have started to sync in the background, launch the dahboard to get more information about the sync in progress</string>
-         </property>
-         <property name="wordWrap">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-    </layout>
+    <widget class="QWidget" name="progressContainer" native="true">
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <property name="spacing">
+       <number>0</number>
+      </property>
+      <property name="margin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QLabel" name="label_4">
+        <property name="text">
+         <string>IMAGE GOES HERE?</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QVBoxLayout" name="verticalLayout">
+        <item>
+         <widget class="QLabel" name="label_5">
+          <property name="font">
+           <font>
+            <weight>75</weight>
+            <bold>true</bold>
+           </font>
+          </property>
+          <property name="text">
+           <string>Sync in progress...</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="label_6">
+          <property name="text">
+           <string>Your folders have started to sync in the background, launch the dahboard to get more information about the sync in progress</string>
+          </property>
+          <property name="wordWrap">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
    </item>
    <item>
     <spacer name="verticalSpacer">

=== added file 'data/qt/sync_now_or_later.ui'
--- data/qt/sync_now_or_later.ui	1970-01-01 00:00:00 +0000
+++ data/qt/sync_now_or_later.ui	2011-06-29 11:45:57 +0000
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>426</width>
+    <height>387</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>24</number>
+   </property>
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="font">
+      <font>
+       <pointsize>14</pointsize>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>Syncing your computer with the cloud</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="label_9">
+     <property name="text">
+      <string>It seems that you have already some folders in the cloud. 
+Do you want to sync everything with this computer now?</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QRadioButton" name="sync_now">
+     <property name="text">
+      <string>Yes, sync all now</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QRadioButton" name="sync_later">
+     <property name="text">
+      <string>No, I'll do it later</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QRadioButton" name="sync_custom">
+     <property name="text">
+      <string>Yes, but I want to choose what to sync</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>54</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

=== modified file 'ubuntuone_installer/gui/qt/gui.py'
--- ubuntuone_installer/gui/qt/gui.py	2011-06-27 09:42:04 +0000
+++ ubuntuone_installer/gui/qt/gui.py	2011-06-29 11:45:57 +0000
@@ -72,6 +72,7 @@
     license_ui,
     congratulations_ui,
 )
+from ubuntuone_installer.gui.qt.sync_now_or_later import SyncNowOrLaterPage
 
 _ = gettext.gettext
 SIGN_IN = _("Sign In")
@@ -243,6 +244,11 @@
             QtGui.QWizard.Stretch,
             QtGui.QWizard.FinishButton,
             ])
+        if self.field("sync_now").toBool() \
+            or self.field("sync_custom").toBool():
+            self.ui.progressContainer.setVisible(True)
+        else:
+            self.ui.progressContainer.setVisible(False)
 
 
 class MainWindow(QtGui.QWizard):
@@ -253,7 +259,8 @@
 
     LICENSE_PAGE = 0
     SIGNIN_PAGE = 1
-    CONGRATULATIONS_PAGE = 2
+    SYNC_NOW_OR_LATER_PAGE = 2
+    CONGRATULATIONS_PAGE = 3
 
     # definition of the signals raised by the widget (for SSO)
     recoverableError = QtCore.pyqtSignal('QString', 'QString')
@@ -339,6 +346,7 @@
 
         # End of SSO pages
 
+        self.SYNC_NOW_OR_LATER_PAGE = self.addPage(SyncNowOrLaterPage())
         self.CONGRATULATIONS_PAGE = self.addPage(CongratulationsPage())
 
     # Invalid name "closeEvent"
@@ -355,13 +363,13 @@
         """Called on successful login."""
         self._next_id = self.SUCCESS_PAGE
         self.next()
-        self._next_id = self.CONGRATULATIONS_PAGE
+        self._next_id = self.SYNC_NOW_OR_LATER_PAGE
 
     def registration_success_slot(self):
         """Called on successful registration."""
         self._next_id = self.SUCCESS_PAGE
         self.next()
-        self._next_id = self.CONGRATULATIONS_PAGE
+        self._next_id = self.SYNC_NOW_OR_LATER_PAGE
 
     def done(self, result):
         """The main window is being closed, call any custom callback."""

=== added file 'ubuntuone_installer/gui/qt/sync_now_or_later.py'
--- ubuntuone_installer/gui/qt/sync_now_or_later.py	1970-01-01 00:00:00 +0000
+++ ubuntuone_installer/gui/qt/sync_now_or_later.py	2011-06-29 11:45:57 +0000
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+
+# Authors: Roberto Alsina <[e-mail]>
+#
+# Copyright 2011 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""The user interface for the Ubuntu One Installer."""
+
+from PyQt4 import QtGui
+
+from ubuntuone_installer.gui.qt.ui import sync_now_or_later_ui
+
+
+class SyncNowOrLaterPage(QtGui.QWizardPage):
+    """User can choose whether to sync now, later, or selectively"""
+
+    def __init__(self, parent=None):
+        QtGui.QWizardPage.__init__(self, parent)
+        self.ui = sync_now_or_later_ui.Ui_Form()
+        self.ui.setupUi(self)
+        self.registerField("sync_now", self.ui.sync_now)
+        self.registerField("sync_later", self.ui.sync_later)
+        self.registerField("sync_custom", self.ui.sync_custom)
+
+    # Invalid names of Qt-inherited methods
+    # pylint: disable=C0103
+
+    def initializePage(self):
+        """Setup UI details"""
+        self.wizard().setOption(QtGui.QWizard.HaveCustomButton1, False)
+        self.wizard().setOption(QtGui.QWizard.NoCancelButton, True)
+        self.wizard()._next_id = None

=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
--- ubuntuone_installer/gui/qt/tests/test_gui.py	2011-06-27 09:59:34 +0000
+++ ubuntuone_installer/gui/qt/tests/test_gui.py	2011-06-29 11:45:57 +0000
@@ -109,6 +109,39 @@
         self.ui.done(result=0)
         self.assertEqual(self._called, False)
 
+    def test_sync_now_shows_message(self):
+        """If the user selects 'Sync Now' the congrats page shows a message"""
+        congrats_page = self.ui.page(self.ui.CONGRATULATIONS_PAGE)
+        congrats_page.setField("sync_now", True)
+
+        # Show the congrats page
+        self.ui.setStartId(self.ui.CONGRATULATIONS_PAGE)
+        self.ui.restart()
+        self.ui.show()
+
+        # Check the properties have the right values
+        self.assertEqual(congrats_page.field("sync_later").toBool(),
+            False)
+        self.assertEqual(
+            congrats_page.ui.progressContainer.isVisible(), True)
+
+    def test_sync_later_hides_message(self):
+        """If the user selects 'Sync Later' the congrats page
+        hides a message"""
+        congrats_page = self.ui.page(self.ui.CONGRATULATIONS_PAGE)
+        congrats_page.setField("sync_later", True)
+
+        # Show the congrats page
+        self.ui.setStartId(self.ui.CONGRATULATIONS_PAGE)
+        self.ui.restart()
+        self.ui.show()
+
+        # Check the properties have the right values
+        self.assertEqual(congrats_page.field("sync_now").toBool(),
+            False)
+        self.assertEqual(
+            congrats_page.ui.progressContainer.isVisible(), False)
+
     def test_credential_parameters(self):
         """Test if the credentials are created the same way
         as in control panel."""