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

[Roberto Alsina]

Implements the first page of the wizard (license information), including a "print" button.

Implements the first page of the wizard (license information), including a "print" button.

To test:

On linux, run

PYTHONPATH=. python bin/ubuntuone-installer-qt

Clicking print should give you a standard printing dialog, which you should be able to use to print to a PDF file (or to a real printer)

If you "finish" or "cancel" the wizard, the app is stuck (that's a bug for another branch)

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

23. By Roberto Alsina on 2011-06-21

Open links on external browser

[dobey (dobey)]

review: Approve

[Alejandro J. Cura (alecu)]

review: Approve

=== modified file 'data/qt/license.ui'
--- data/qt/license.ui	2011-06-21 16:06:01 +0000
+++ data/qt/license.ui	2011-06-21 18:47:23 +0000
@@ -29,49 +29,14 @@
 <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"></p>
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;As free software, this programme is distributed without warranty. See the GNU General Public License for more details at &lt;/span&gt;&lt;a href=&quot;http://www.gnu.org/licenses&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.gnu.org/licenses&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
+     <property name="openExternalLinks">
+      <bool>true</bool>
+     </property>
+     <property name="openLinks">
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QPushButton" name="agree">
-       <property name="text">
-        <string>Disagree &amp;&amp; Cancel</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="printButton">
-       <property name="text">
-        <string>Print</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="disagree">
-       <property name="text">
-        <string>Agree &amp;&amp; Install</string>
-       </property>
-       <property name="default">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
   </layout>
  </widget>
  <resources/>
 
=== modified file 'ubuntuone_installer/gui/qt/__init__.py'
--- ubuntuone_installer/gui/qt/__init__.py	2011-06-21 16:36:01 +0000
+++ ubuntuone_installer/gui/qt/__init__.py	2011-06-21 18:47:23 +0000
@@ -18,5 +18,3 @@
 
 """The Qt graphical interface for the Ubuntu One Installer."""
 
-from PyQt4 import QtGui, QtCore
-
 
=== modified file 'ubuntuone_installer/gui/qt/gui.py'
--- ubuntuone_installer/gui/qt/gui.py	2011-06-21 16:36:01 +0000
+++ ubuntuone_installer/gui/qt/gui.py	2011-06-21 18:47:23 +0000
@@ -23,11 +23,59 @@
 from PyQt4 import QtGui
 
 from ubuntuone_installer.logger import setup_logging
-
+from ubuntuone_installer.gui.qt.ui import license_ui
+
+import gettext
+
+_ = gettext.gettext
 
 logger = setup_logging('qt.gui')
 
 
+class LicensePage(QtGui.QWizardPage):
+    """Wizard Page that displays the license info and links to the GPL"""
+
+    # Invalid constant names and Qt-inherited methods
+    # pylint: disable=C0103
+    
+    LICENSE_PAGE = 0
+    
+    def __init__(self, parent=None):
+        QtGui.QWizardPage.__init__(self, parent)
+        self.ui = license_ui.Ui_Form()
+        self.ui.setupUi(self)
+
+    def initializePage(self):
+        """Setup UI details"""
+
+        # We need custom buttons
+        self.wizard().setButtonText(QtGui.QWizard.CustomButton1, _("&Print"))
+        self.wizard().setOption(QtGui.QWizard.HaveCustomButton1, True)
+
+        # 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"))        
+        self.wizard().customButtonClicked.connect(self.printDocument)
+        
+    def printDocument(self, button_id):
+        """Print the document displayed in textBrowser"""
+        
+        if button_id == QtGui.QWizard.CustomButton1:
+            document = self.ui.textBrowser.document()
+            printer = QtGui.QPrinter(QtGui.QPrinter.HighResolution)
+
+            dialog = QtGui.QPrintDialog(printer, self)
+            
+            dialog.setWindowTitle(_("Send to printer"))
+            if dialog.exec_() != QtGui.QDialog.Accepted:
+                return
+            printer.setFullPage(True)
+            printer.setPageSize(QtGui.QPrinter.A4)
+            document.print_(printer)
+        
+
 class MainWindow(QtGui.QWizard):
     """The Main Window of the Installer wizard."""
 
@@ -36,6 +84,16 @@
         QtGui.QWizard.__init__(self)
         self.close_callback = close_callback
 
+        self.setOption(self.NoBackButtonOnStartPage, True)
+
+        # PyQt doesn't support the (int, page) version of addPage
+        # Add the pages in the right order
+        
+        # pylint: disable=C0103
+        self.LICENSE_PAGE = self.addPage(LicensePage())
+        # Dummy page to have a "Next"
+        self.addPage(QtGui.QWizardPage())
+
     # Invalid name "closeEvent"
     # pylint: disable=C0103
 
 
=== added directory 'ubuntuone_installer/gui/qt/ui'
=== added file 'ubuntuone_installer/gui/qt/ui/__init__.py'
--- ubuntuone_installer/gui/qt/ui/__init__.py	1970-01-01 00:00:00 +0000
+++ ubuntuone_installer/gui/qt/ui/__init__.py	2011-06-21 18:47:23 +0000
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+
+# Authors: Alejandro J. Cura <[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 Qt graphical interface for the Ubuntu One Installer."""