Merge lp:~agateau/ubiquity/kde-fix-broken-sidebar-layout-on-greeter into lp:ubiquity

[Aurélien Gâteau]

=== modified file 'gui/qt/app.ui'
--- gui/qt/app.ui	2014-04-16 09:52:59 +0000
+++ gui/qt/app.ui	2014-04-17 16:18:12 +0000
@@ -184,7 +184,7 @@
        <item>
         <widget class="QWidget" name="steps_widget" native="true">
          <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+          <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -196,20 +196,23 @@
           <property name="margin">
            <number>0</number>
           </property>
-          <item>
-           <widget class="QWidget" name="steps_filler_widget" native="true">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-           </widget>
-          </item>
          </layout>
         </widget>
        </item>
        <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
         <widget class="QFrame" name="sidebar_footer_frame">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
 
=== modified file 'gui/qt/breadcrumb_current.qss'
--- gui/qt/breadcrumb_current.qss	2013-02-28 06:42:46 +0000
+++ gui/qt/breadcrumb_current.qss	2014-04-17 16:18:12 +0000
@@ -1,4 +1,4 @@
-QFrame {
+QFrame[isBreadcrumb=true] {
     border-top-width: 10px;
     border-bottom-width: 10px;
     background-image: none;
@@ -7,7 +7,6 @@
 
 .QLabel {
     color: #333;
-    border-width: 0px;
     border-image: none;
 }
 
 
=== modified file 'ubiquity/frontend/kde_components/Breadcrumb.py'
--- ubiquity/frontend/kde_components/Breadcrumb.py	2013-03-07 18:24:39 +0000
+++ ubiquity/frontend/kde_components/Breadcrumb.py	2014-04-17 16:18:12 +0000
@@ -30,13 +30,17 @@
 __all__ = ["Breadcrumb"]
 
 
-class Breadcrumb(QtGui.QFrame):
+# HACK! Breadcrumb should not have to inherit from QLabel! Inheriting from
+# QFrame should be enough, but right now (Trusty) if I change Breadcrumb to
+# inherit from QFrame then _mainLabel is not given enough vertical space and
+# its text gets cropped at the bottom.
+class Breadcrumb(QtGui.QLabel):
     TODO = 0
     CURRENT = 1
     DONE = 2
 
     def __init__(self, parent=None):
-        QtGui.QFrame.__init__(self, parent)
+        super(Breadcrumb, self).__init__(parent)
         self.setProperty("isBreadcrumb", True)
 
         self._tickLabel = QtGui.QLabel()
 
=== modified file 'ubiquity/frontend/kde_ui.py'
--- ubiquity/frontend/kde_ui.py	2014-03-06 06:42:00 +0000
+++ ubiquity/frontend/kde_ui.py	2014-04-17 16:18:12 +0000
@@ -315,8 +315,7 @@
         widget = Breadcrumb()
         widget.setObjectName(name)
         layout = self.ui.steps_widget.layout()
-        # "- 1" to insert before the bottom spacer
-        layout.insertWidget(layout.count() - 1, widget)
+        layout.addWidget(widget)
         return widget
 
     def _apply_stylesheet(self):