Merge lp:~agateau/ubiquity/kde-fix-slideshow-not-starting into lp:ubiquity

[Aurélien Gâteau]

This branch fixes the slideshow not starting. It now starts and resizes properly.

=== modified file 'gui/qt/app.ui'
--- gui/qt/app.ui	2013-03-08 12:42:26 +0000
+++ gui/qt/app.ui	2013-03-14 18:35:31 +0000
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>850</width>
-    <height>533</height>
+    <width>505</width>
+    <height>534</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -69,30 +69,6 @@
         <property name="margin">
          <number>0</number>
         </property>
-        <item>
-         <widget class="QWebView" name="webview">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <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>
       </widget>
      </widget>
@@ -351,13 +327,6 @@
    </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-12 12:56:02 +0000
+++ ubiquity/frontend/kde_ui.py	2013-03-14 18:35:31 +0000
@@ -39,7 +39,7 @@
 # kde gui specifics
 import sip
 sip.setapi("QVariant", 1)
-from PyQt4 import QtCore, QtGui, QtWebKit, uic
+from PyQt4 import QtCore, QtGui, uic
 
 from ubiquity import filteredcommand, i18n, misc
 from ubiquity.components import partman_commit, install, plugininstall
@@ -545,22 +545,31 @@
 
         slides = 'file://%s#%s' % (slideshow_main, parameters_encoded)
 
+        # HACK! For some reason, if the QWebView is created from the .ui file,
+        # the slideshow does not start (but it starts if one runs
+        # UBIQUITY_TEST_SLIDESHOW=1 ubiquity !). Creating it from the code
+        # works. I have no idea why.
+        from PyQt4.QtWebKit import QWebView
+        from PyQt4.QtWebKit import QWebPage
+
         def openLink(qUrl):
             QtGui.QDesktopServices.openUrl(qUrl)
 
-        self.ui.navigation.hide()
-        self.ui.pageMode.setCurrentWidget(self.ui.install_page)
-        webView = self.ui.webview
+        webView = QWebView()
+        webView.setMinimumSize(700, 420)
         webView.linkClicked.connect(openLink)
-        webView.page().setLinkDelegationPolicy(
-            QtWebKit.QWebPage.DelegateExternalLinks)
+        webView.setContextMenuPolicy(QtCore.Qt.NoContextMenu)
+        webView.page().setLinkDelegationPolicy(QWebPage.DelegateExternalLinks)
         webView.page().mainFrame().setScrollBarPolicy(
             QtCore.Qt.Horizontal, QtCore.Qt.ScrollBarAlwaysOff)
         webView.page().mainFrame().setScrollBarPolicy(
             QtCore.Qt.Vertical, QtCore.Qt.ScrollBarAlwaysOff)
-
         webView.load(QtCore.QUrl(slides))
 
+        self.ui.navigation.hide()
+        self.ui.install_page.layout().addWidget(webView)
+        self.ui.pageMode.setCurrentWidget(self.ui.install_page)
+
     def set_layout_direction(self, lang=None):
         if not lang:
             lang = self.locale