Merge lp:~agateau/ubiquity/slideshow-fixes into lp:ubiquity

[Aurélien Gâteau]

This branch fixes integration of the webview responsible for showing the slideshow in the KDE frontend of ubiquity

=== modified file 'gui/qt/app.ui'
--- gui/qt/app.ui	2013-02-26 15:50:04 +0000
+++ gui/qt/app.ui	2013-03-01 13:42:24 +0000
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>505</width>
-    <height>534</height>
+    <width>850</width>
+    <height>533</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -30,9 +30,9 @@
        </sizepolicy>
       </property>
       <property name="currentIndex">
-       <number>0</number>
+       <number>1</number>
       </property>
-      <widget class="QWidget" name="page_7">
+      <widget class="QWidget" name="setup_page">
        <layout class="QVBoxLayout" name="verticalLayout_2">
         <property name="margin">
          <number>0</number>
@@ -64,21 +64,33 @@
         </item>
        </layout>
       </widget>
-      <widget class="QWidget" name="page_8">
+      <widget class="QWidget" name="install_page">
        <layout class="QVBoxLayout" name="verticalLayout_8">
+        <property name="margin">
+         <number>0</number>
+        </property>
         <item>
-         <widget class="QWidget" name="content_widget_2" native="true">
+         <widget class="QWebView" name="webview">
           <property name="sizePolicy">
-           <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+           <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
-          <layout class="QVBoxLayout" name="verticalLayout_7">
-           <property name="leftMargin">
-            <number>0</number>
-           </property>
-          </layout>
+          <property name="minimumSize">
+           <size>
+            <width>700</width>
+            <height>420</height>
+           </size>
+          </property>
+          <property name="contextMenuPolicy">
+           <enum>Qt::NoContextMenu</enum>
+          </property>
+          <property name="url">
+           <url>
+            <string>about:blank</string>
+           </url>
+          </property>
          </widget>
         </item>
        </layout>
@@ -326,6 +338,13 @@
    </layout>
   </widget>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QWebView</class>
+   <extends>QWidget</extends>
+   <header>QtWebKit/QWebView</header>
+  </customwidget>
+ </customwidgets>
  <tabstops>
   <tabstop>next</tabstop>
   <tabstop>back</tabstop>

=== modified file 'ubiquity/frontend/kde_ui.py'
--- ubiquity/frontend/kde_ui.py	2013-03-01 13:42:24 +0000
+++ ubiquity/frontend/kde_ui.py	2013-03-01 13:42:24 +0000
@@ -39,7 +39,7 @@
 # kde gui specifics
 import sip
 sip.setapi("QVariant", 1)
-from PyQt4 import QtCore, QtGui, uic
+from PyQt4 import QtCore, QtGui, QtWebKit, uic
 
 from ubiquity import filteredcommand, i18n, misc
 from ubiquity.components import partman_commit, install, plugininstall
@@ -279,6 +279,7 @@
             self.ui.install_process_label.hide()
             self.breadcrumb_install.hide()
 
+        self.ui.pageMode.setCurrentWidget(self.ui.setup_page)
         self.update_back_button()
         self.update_next_button(install=False)
         self.ui.quit.setIcon(QtGui.QIcon.fromTheme("dialog-close"))
@@ -400,6 +401,13 @@
             # itself and show content
             self.ui.show()
 
+        if 'UBIQUITY_TEST_SLIDESHOW' in os.environ:
+            # Quick way to test slideshow without going through the whole
+            # install
+            self._update_breadcrumbs('__install')
+            self.start_slideshow()
+            self.run_main_loop()
+
         while(self.pagesindex < self.pageslen):
             if self.current_page is None:
                 break
@@ -514,9 +522,9 @@
                     page.breadcrumb.setState(Breadcrumb.TODO)
 
         if active_page_name == '__install':
-            page.breadcrumb.setState(Breadcrumb.CURRENT)
+            self.breadcrumb_install.setState(Breadcrumb.CURRENT)
         else:
-            page.breadcrumb.setState(Breadcrumb.TODO)
+            self.breadcrumb_install.setState(Breadcrumb.TODO)
 
     def start_slideshow(self):
         slideshow_dir = '/usr/share/ubiquity-slideshow'
@@ -537,28 +545,22 @@
 
         slides = 'file://%s#%s' % (slideshow_main, parameters_encoded)
 
-        from PyQt4.QtWebKit import QWebView
-        from PyQt4.QtWebKit import QWebPage
-
         def openLink(qUrl):
             QtGui.QDesktopServices.openUrl(qUrl)
 
-        webView = QWebView()
+        self.ui.navigation.hide()
+        self.ui.pageMode.setCurrentWidget(self.ui.install_page)
+        webView = self.ui.webview
         webView.linkClicked.connect(openLink)
-        webView.setContextMenuPolicy(QtCore.Qt.NoContextMenu)
-        webView.page().setLinkDelegationPolicy(QWebPage.DelegateExternalLinks)
+        webView.page().setLinkDelegationPolicy(
+            QtWebKit.QWebPage.DelegateExternalLinks)
         webView.page().mainFrame().setScrollBarPolicy(
             QtCore.Qt.Horizontal, QtCore.Qt.ScrollBarAlwaysOff)
         webView.page().mainFrame().setScrollBarPolicy(
             QtCore.Qt.Vertical, QtCore.Qt.ScrollBarAlwaysOff)
-        webView.setFixedSize(700, 420)
+
         webView.load(QtCore.QUrl(slides))
 
-        self.ui.navigation.hide()
-        self.ui.pageMode.setCurrentIndex(1)
-        self.ui.pageMode.widget(1).layout().addWidget(webView)
-        webView.show()
-
     def set_layout_direction(self, lang=None):
         if not lang:
             lang = self.locale