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

[Roberto Alsina]

Bring the TOS page up to spec.

Bring the TOS page up to spec.

It only does that in part:

* Set the right buttons
* Add print button for TOS

The rest of the spec is implented in bug #804569

* Add a label with a link to the TOS on the web
* Smaller margins around the embedded browser

The spec: https://launchpadlibrarian.net/74418482/tos_wireframe.png
The product (includes proposed fix from bug #804569): https://launchpadlibrarian.net/74420219/implemented_tos_page.png

To test IRL (Windows):

In one terminal, start ubuntu-sso-client

set PYTHONPATH=.
python bin\windows-ubuntu-sso-login

In another terminal, start ubuntuone-windows-installer

set PYTHONPATH=..\ubuntuone-client;..\ubuntuone-control-panel;..\ubuntu-sso-client;.
python bin\ubuntuone-installer-qt

You should have a working print button, and the button order should be:

[Print] [-----------------------] [Disagree & Cancel] [Back]

You should see the correct TOS for Ubuntu One, and all the buttons should work.

[Alejandro J. Cura (alecu)]

Code looks good. Also tested IRL, works fine.

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

Voting does not meet specified criteria. Required: Approve >= 1, Disapprove == 0, Needs Fixing == 0, Needs Information == 0, Resubmit == 0, Pending == 0. Got: 1 Approve, 1 Pending.

[Roberto Alsina (ralsina)]

+1 we are switching to 1-approve in the installer.

review: Approve

=== modified file 'ubuntuone_installer/gui/qt/gui.py'
--- ubuntuone_installer/gui/qt/gui.py	2011-07-01 21:08:26 +0000
+++ ubuntuone_installer/gui/qt/gui.py	2011-07-04 20:12:35 +0000
@@ -32,7 +32,6 @@
     ErrorPage,
     ForgottenPasswordPage,
     ResetPasswordPage,
-    TosPage,
 )
 from ubuntu_sso.qt.choose_sign_in_ui import \
     Ui_ChooseSignInPage
@@ -74,6 +73,7 @@
 from ubuntuone_installer.gui.qt.local_folders import LocalFoldersPage
 from ubuntuone_installer.gui.qt.sync_now_or_later import SyncNowOrLaterPage
 from ubuntuone_installer.gui.qt.setup_account import SetupAccountPage
+from ubuntuone_installer.gui.qt.tos import TosPage
 
 _ = gettext.gettext
 SIGN_IN = _("Sign in to Ubuntu One")
@@ -317,7 +317,8 @@
             self.setup_controller,
             parent=self)
         self.tos = TosPage(Ui_TosPage(),
-            TosController(tos_url=TC_URL),
+            TosController(tos_url=TC_URL,
+                title=_("Ubuntu One Terms of Service")),
             parent=self)
         self.email_verification = EmailVerificationPage(
                                                 Ui_EmailVerificationPage(),
 
=== added file 'ubuntuone_installer/gui/qt/tos.py'
--- ubuntuone_installer/gui/qt/tos.py	1970-01-01 00:00:00 +0000
+++ ubuntuone_installer/gui/qt/tos.py	2011-07-04 20:12:35 +0000
@@ -0,0 +1,61 @@
+# -*- 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/>.
+
+"""Widget to view the Terms Of Service."""
+
+import gettext
+
+from PyQt4 import QtGui
+
+import ubuntu_sso.qt.gui as sso_gui
+
+_ = gettext.gettext
+
+
+class TosPage(sso_gui.TosPage):
+    def initializePage(self):
+        """Setup UI details."""
+        # Set the right texts and connections for buttons
+        self.setButtonText(QtGui.QWizard.NextButton, _("Agree && Install"))
+        self.setButtonText(QtGui.QWizard.CancelButton,
+            _("Disagree && Cancel"))
+        self.setButtonText(QtGui.QWizard.CustomButton1, _("&Print"))
+
+        # This is just to catch an exception thrown when nothing
+        # is connected to the signal. It's not an exceptional
+        # condition at all.
+        try:
+            self.wizard().customButtonClicked.disconnect()
+        except TypeError:
+            pass
+
+        self.wizard().customButtonClicked.connect(self.print_document)
+
+        self.wizard().setButtonLayout([
+            QtGui.QWizard.CustomButton1,
+            QtGui.QWizard.Stretch,
+            QtGui.QWizard.CancelButton,
+            QtGui.QWizard.BackButton,
+            ])
+
+    def print_document(self, button_id):
+        """Print the document displayed in textBrowser."""
+        if button_id == QtGui.QWizard.CustomButton1:
+            self.previewer = QtGui.QPrintPreviewDialog(
+                paintRequested=self.ui.terms_webkit.print_)
+            self.previewer.exec_()