Merge lp:~agateau/ubiquity/rework-prepare-step into lp:ubiquity

[Aurélien Gâteau]

This branch improves the "Prepare" step of Ubiquity KDE frontend.

=== modified file 'gui/qt/stepPrepare.ui'
--- gui/qt/stepPrepare.ui	2011-08-09 08:20:30 +0000
+++ gui/qt/stepPrepare.ui	2013-02-27 21:04:24 +0000
@@ -13,48 +13,104 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="1" column="0">
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="prepare_heading_label">
+     <property name="text">
+      <string>Preparing to install ${RELEASE}</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer_3">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>24</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
     <widget class="QLabel" name="prepare_best_results">
      <property name="text">
-      <string>&lt;b&gt;For best results, please ensure:&lt;/b&gt;</string>
-     </property>
-     <property name="textFormat">
-      <enum>Qt::RichText</enum>
+      <string>For best results, please ensure:</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="0">
+   <item>
     <layout class="QVBoxLayout" name="vbox1"/>
    </item>
-   <item row="3" column="0">
+   <item>
+    <spacer name="verticalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>24</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
     <widget class="QLabel" name="prepare_foss_disclaimer">
      <property name="text">
       <string>&lt;qt&gt;${RELEASE} aims to be free and open-source software.&lt;br /&gt;However, this is not always possible.&lt;/span&gt;&lt;/qt&gt;</string>
      </property>
-     <property name="textFormat">
-      <enum>Qt::RichText</enum>
-     </property>
      <property name="wordWrap">
       <bool>true</bool>
      </property>
     </widget>
    </item>
-   <item row="4" column="0">
+   <item>
     <widget class="QCheckBox" name="prepare_nonfree_software">
      <property name="text">
       <string>Please offer me non-open-source software if it is needed for a better experience</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="0">
+   <item>
+    <spacer name="verticalSpacer_4">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>24</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
     <widget class="QCheckBox" name="prepare_download_updates">
      <property name="text">
       <string>Download updates while installing</string>
      </property>
     </widget>
    </item>
-   <item row="6" column="0">
+   <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -67,13 +123,6 @@
      </property>
     </spacer>
    </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="prepare_heading_label">
-     <property name="text">
-      <string>Preparing to install ${RELEASE}</string>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources/>

=== modified file 'ubiquity/plugins/ubi-prepare.py'
--- ubiquity/plugins/ubi-prepare.py	2013-02-19 11:33:07 +0000
+++ ubiquity/plugins/ubi-prepare.py	2013-02-27 21:04:24 +0000
@@ -204,8 +204,7 @@
     def plugin_translate(self, lang):
         PreparePageBase.plugin_translate(self, lang)
         # gtk does the ${RELEASE} replace for the title in gtk_ui but we do
-        # it per plugin because our title widget is per plugin.  Also add
-        # Bold here (not sure how the gtk side keeps that formatting).
+        # it per plugin because our title widget is per plugin
         release = misc.get_release()
         widgets = (
             self.page.prepare_heading_label,
@@ -216,7 +215,6 @@
             text = widget.text()
             text = text.replace('${RELEASE}', release.name)
             text = text.replace('Ubuntu', 'Kubuntu')
-            text = "<b>" + text + "</b>"
             widget.setText(text)
 
 

=== modified file 'ubiquity/qtwidgets.py'
--- ubiquity/qtwidgets.py	2013-02-19 11:33:07 +0000
+++ ubiquity/qtwidgets.py	2013-02-27 21:04:24 +0000
@@ -2,37 +2,35 @@
 
 import sys
 
-from PyQt4.QtCore import Qt
-from PyQt4.QtGui import QFrame, QHBoxLayout, QLabel, QPalette, QPixmap
-
-
-class StateBox(QFrame):
+from PyQt4.QtGui import QWidget, QHBoxLayout, QLabel, QPixmap
+
+
+class StateBox(QWidget):
     def __init__(self, parent, text=''):
-        QFrame.__init__(self, parent)
-        self.setFrameStyle(QFrame.StyledPanel | QFrame.Sunken)
-        self.setAutoFillBackground(True)
-        palette = self.palette()
-        palette.setColor(QPalette.Window, Qt.white)
-        self.setPalette(palette)
+        QWidget.__init__(self, parent)
+
+        self.label = QLabel(text, self)
+        self.image = QLabel(self)
+
         layout = QHBoxLayout(self)
-        self.setLayout(layout)
-        self.image = QLabel(self)
-        self.image.setPixmap(QPixmap(
-            "/usr/share/icons/oxygen/32x32/actions/dialog-ok.png"))
+        layout.setContentsMargins(12, 0, 0, 0)
+        layout.setSpacing(0)
         layout.addWidget(self.image)
-        self.label = QLabel(text, self)
         layout.addWidget(self.label)
         layout.addStretch()
-        self.status = True
+
+        self.set_state(True)
 
     def set_state(self, state):
         self.status = state
         if state:
-            self.image.setPixmap(QPixmap(
-                "/usr/share/icons/oxygen/32x32/actions/dialog-ok.png"))
+            # A tickmark
+            name = "dialog-ok-apply.png"
         else:
-            self.image.setPixmap(QPixmap(
-                "/usr/share/icons/oxygen/32x32/actions/dialog-cancel.png"))
+            # A cross
+            name = "edit-delete.png"
+        name = "/usr/share/icons/oxygen/22x22/actions/" + name
+        self.image.setPixmap(QPixmap(name))
 
     def get_state(self):
         return self.status