Merge lp:~diegosarmentero/ubuntuone-windows-installer/titles-on-pages into lp:ubuntuone-windows-installer

[Diego Sarmentero]

Move all the Titles and Subtitles into the Wizard Pages

Move all the Titles and Subtitles into the Wizard Pages

[Diego Sarmentero (diegosarmentero)]

Both of the revisions says merge, but the first one is:
"Add Title and Subtitle labels into the UI to avoid the resizing of the SideWidget"

[John Lenton (chipaca)]

are the changes to 'bin/ubuntuone-installer-qt' kosher?

[Diego Sarmentero (diegosarmentero)]

That changes are really from Roberto's branch, but his branch is already merge with mine because they are related.
I'm waiting for his branch to be approved to merge mine.

[John Lenton (chipaca)]

On Tue, 02 Aug 2011 14:24:34 -0000, Diego Sarmentero <email address hidden> wrote:
> That changes are really from Roberto's branch, but his branch is already merge with mine because they are related.
> I'm waiting for his branch to be approved to merge mine.

that's what the 'prerequisite branch' field is for in merge
proposals :)

[lp:~diegosarmentero/ubuntuone-windows-installer/titles-on-pages]

26. By Diego Sarmentero on 2011-08-02

adding word wrap mode to title and subtitles.

27. By Diego Sarmentero on 2011-08-03

Installer modified to allow the pages to work with setTitle and setSubTitle.

28. By Diego Sarmentero on 2011-08-03

tests modified to use the new setTitle and setSubtitle

29. By Diego Sarmentero on 2011-08-04

modifying ui to add a header in all the pages dinamically.

30. By Diego Sarmentero on 2011-08-04

merge

31. By Diego Sarmentero on 2011-08-04

removing __init__ with just super.

32. By Diego Sarmentero on 2011-08-05

reverting changes in setup_account.py

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

=== modified file 'data/qt/choose_sign_in.ui'
--- data/qt/choose_sign_in.ui	2011-07-27 15:17:31 +0000
+++ data/qt/choose_sign_in.ui	2011-08-05 13:50:36 +0000
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>541</width>
-    <height>365</height>
+    <width>432</width>
+    <height>387</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -15,22 +15,6 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Preferred</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>10</width>
-       <height>30</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
       <spacer name="horizontalSpacer_3">

=== modified file 'data/qt/local_folders.ui'
--- data/qt/local_folders.ui	2011-07-31 12:09:11 +0000
+++ data/qt/local_folders.ui	2011-08-05 13:50:36 +0000
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>460</width>
+    <width>519</width>
     <height>536</height>
    </rect>
   </property>

=== modified file 'data/qt/setup_account.ui'
--- data/qt/setup_account.ui	2011-07-28 18:24:58 +0000
+++ data/qt/setup_account.ui	2011-08-05 13:50:36 +0000
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>569</width>
+    <width>575</width>
     <height>521</height>
    </rect>
   </property>
@@ -15,7 +15,7 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="rightMargin">
-    <number>0</number>
+    <number>6</number>
    </property>
    <item>
     <layout class="QGridLayout" name="gridLayout" columnminimumwidth="300,250">

=== modified file 'data/qt/ubuntuone.qss'
--- data/qt/ubuntuone.qss	2011-07-28 18:24:58 +0000
+++ data/qt/ubuntuone.qss	2011-08-05 13:50:36 +0000
@@ -122,3 +122,7 @@
 QFrame#frm_box > QLabel{
     font-size: 24px;
 }
+
+QLabel#title_label{
+    font-size: 20px;
+}

=== modified file 'ubuntuone_installer/gui/qt/gui.py'
--- ubuntuone_installer/gui/qt/gui.py	2011-08-02 21:01:10 +0000
+++ ubuntuone_installer/gui/qt/gui.py	2011-08-05 13:50:36 +0000
@@ -28,6 +28,7 @@
 from PyQt4 import QtGui, QtCore
 
 from ubuntu_sso.qt.gui import (
+    SSOWizardPage,
     EmailVerificationPage,
     ErrorPage,
     ForgottenPasswordPage,
@@ -95,14 +96,12 @@
 # pylint: enable=C0103
 
 
-class LicensePage(QtGui.QWizardPage):
+class LicensePage(SSOWizardPage):
     """Wizard Page that displays the license info and links to the GPL."""
 
     def __init__(self, parent=None):
-        super(LicensePage, self).__init__(parent)
-        self.ui = license_ui.Ui_Form()
-        self.ui.setupUi(self)
-        self._next_id = None
+        super(LicensePage, self).__init__(license_ui.Ui_Form(), None, parent)
+        self.header.setVisible(False)
 
     # Invalid names of Qt-inherited methods
     # pylint: disable=C0103
@@ -155,17 +154,9 @@
         return self._next_id
 
 
-class SignInPage(QtGui.QWizardPage):
+class SignInPage(SSOWizardPage):
     """Wizard Page that lets the user Sign into Ubuntu One."""
 
-    def __init__(self, ui=None, controller=None, parent=None):
-        super(SignInPage, self).__init__(parent)
-        self.ui = ui
-        self.ui.setupUi(self)
-        self.controller = controller
-        self.controller.setupUi(self)
-        self.next = -1
-
     # Invalid names of Qt-inherited methods
     # pylint: disable=C0103
 
@@ -192,17 +183,9 @@
         return self.next
 
 
-class CurrentUserSignInPage(QtGui.QWizardPage):
+class CurrentUserSignInPage(SSOWizardPage):
     """Wizard Page that lets a current user Sign into Ubuntu One."""
 
-    def __init__(self, ui=None, controller=None, parent=None):
-        super(CurrentUserSignInPage, self).__init__(parent)
-        self.ui = ui
-        self.ui.setupUi(self)
-        self.controller = controller
-        self.controller.setupUi(self)
-        self.next = -1
-
     # Invalid names of Qt-inherited methods
     # pylint: disable=C0103
 
@@ -228,17 +211,9 @@
             self.ui.sign_in_button)
 
 
-class SuccessPage(QtGui.QWizardPage):
+class SuccessPage(SSOWizardPage):
     """Shown after SSO login, before setup."""
 
-    def __init__(self, ui=None, controller=None, parent=None):
-        super(SuccessPage, self).__init__(parent)
-        self.ui = ui
-        self.ui.setupUi(self)
-        self.controller = controller
-        self.controller.setupUi(self)
-        self.next = -1
-
     # Invalid names of Qt-inherited methods
     # pylint: disable=C0103
 
@@ -256,13 +231,12 @@
         return self.next
 
 
-class CongratulationsPage(QtGui.QWizardPage):
+class CongratulationsPage(SSOWizardPage):
     """Final page of the wizard."""
 
     def __init__(self, parent=None):
-        super(CongratulationsPage, self).__init__(parent)
-        self.ui = congratulations_ui.Ui_Form()
-        self.ui.setupUi(self)
+        super(CongratulationsPage, self).__init__(
+            congratulations_ui.Ui_Form(), None, parent)
         self.setFinalPage(True)
 
     # Invalid names of Qt-inherited methods
@@ -324,8 +298,7 @@
 
         self.setWindowTitle(APP_NAME)
         self.setMinimumHeight(630)
-        self.setMinimumWidth(820)
-        self.setTitleFormat(QtCore.Qt.RichText)
+        self.setMinimumWidth(800)
         self.setWizardStyle(self.ModernStyle)
         self.close_callback = close_callback
 

=== modified file 'ubuntuone_installer/gui/qt/local_folders.py'
--- ubuntuone_installer/gui/qt/local_folders.py	2011-07-31 12:08:39 +0000
+++ ubuntuone_installer/gui/qt/local_folders.py	2011-08-05 13:50:36 +0000
@@ -28,6 +28,8 @@
 
 from ubuntuone.controlpanel.gui import humanize
 
+from ubuntu_sso.qt.gui import SSOWizardPage
+
 from ubuntuone_installer.gui.qt.ui import local_folders_ui
 from ubuntuone_installer.gui import (
     LOCAL_FOLDERS_TITLE,
@@ -65,14 +67,14 @@
         self.queue.put([self.path_name, total_size])
 
 
-class LocalFoldersPage(QtGui.QWizardPage):
+class LocalFoldersPage(SSOWizardPage):
     """Wizard page to create UDFs in the Windows Installer."""
 
     def __init__(self, parent=None):
-        super(LocalFoldersPage, self).__init__(parent)
+        super(LocalFoldersPage, self).__init__(
+            local_folders_ui.Ui_Form(), None, parent)
         self.setTitle(LOCAL_FOLDERS_TITLE)
-        self.ui = local_folders_ui.Ui_Form()
-        self.ui.setupUi(self)
+        self.setSubTitle()
 
         header_view = self.ui.folder_list.header()
         header_view.setResizeMode(0, header_view.Stretch)

=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
--- ubuntuone_installer/gui/qt/tests/test_gui.py	2011-08-02 21:01:10 +0000
+++ ubuntuone_installer/gui/qt/tests/test_gui.py	2011-08-05 13:50:36 +0000
@@ -372,10 +372,6 @@
 
     def test_license_next(self):
         """Test what's the license page's nextID."""
-        self.assertEqual(self.ui.LICENSE_PAGE.nextId(), self.ui.SIGNIN_PAGE)
-
-    def test_license_next_with_creds(self):
-        """Test what's the license page's nextID."""
         self.ui.creds_cb("fakecreds")
         self.assertEqual(self.ui.LICENSE_PAGE.nextId(),
             self.ui.local_folders_page_id)