Merge lp:~apachelogger/ubiquity/fix-squished-text into lp:ubiquity

[Harald Sitter]

=== modified file 'debian/changelog'
--- debian/changelog	2015-09-23 16:24:49 +0000
+++ debian/changelog	2015-09-29 13:01:12 +0000
@@ -1,3 +1,34 @@
+ubiquity (2.21.32) wily; urgency=medium
+
+  * Resolve a spacing issue in the KDE ui.
+    - Move vertial spacer for branding logo from designer file to code
+    - Adjust spacing policies of the lefthand pane to do what we need:
+      + the header layout doesn't expand anymore
+      + the steps layout expands horizontally and verticall and additionally
+        enforces its sizeHint as minimum.
+      + the unused footer layout no longer expands horizontally but sticks to
+        its minimum
+    - Push branding logo to smaller size
+      + The logo is now packed into a layout where it is spaced from left and
+        right to cause an undefined shrinking as per Qt's choice. This
+        effectively reduces the sizes of the logo both in width and height (as
+        height is bound to width). This in turn brings the overall size down
+        enough to not cause size expansion beyond "resonable" measures.
+        (Reasonable being just big enough to be good looking but small enough
+         to not push down on the labels in the steps widget. Latter has an
+         unknown cause, but when the logo is too big it starts pushing on the
+         labels, disregarding the entire sizepolicy of all involved widgets.
+         If the logo is small enough this doesn't happen which either may be
+         because there is a hardcoded height somewhere or the joint minimal
+         size of all steps' pages is heigh enough to allow for this to happen.
+         This overall layout problem has been there for years and only became
+         visible now because we have a somewhat heigh widget below the steps
+         layout. Ultimately this issue is going to get resolved if/when
+         ubiquity gets ported to QML which is substantially more suited to
+         building UIs like this with right scaling.)
+
+ -- Harald Sitter <[e-mail]>  Tue, 29 Sep 2015 14:37:29 +0200
+
 ubiquity (2.21.31) wily; urgency=medium
 
   [ Iain Lane ]

=== modified file 'gui/qt/app.ui'
--- gui/qt/app.ui	2015-09-08 16:15:47 +0000
+++ gui/qt/app.ui	2015-09-29 13:01:12 +0000
@@ -119,7 +119,7 @@
     <item row="0" column="0" rowspan="2">
      <widget class="QWidget" name="sidebar_widget" native="true">
       <property name="sizePolicy">
-       <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+       <sizepolicy hsizetype="Fixed" vsizetype="MinimumExpanding">
         <horstretch>0</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
@@ -191,7 +191,7 @@
        <item>
         <widget class="QWidget" name="steps_widget" native="true">
          <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+          <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -207,22 +207,9 @@
         </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">
+          <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>

=== modified file 'ubiquity/frontend/kde_ui.py'
--- ubiquity/frontend/kde_ui.py	2015-09-09 08:59:38 +0000
+++ ubiquity/frontend/kde_ui.py	2015-09-29 13:01:12 +0000
@@ -182,9 +182,27 @@
 
         self.ui = UbiquityUI()
 
+        # Branding logo is spaced from left and right to cause it to shrink
+        # an undefined amount. This reduces the risk of having the branding
+        # shrink the steps_widget and thus cause text to be cut off or.
+        # Above the branding there is also a spacer pushing down on the logo
+        # and up on the steps to make sure spacing between steps is not
+        # awkwardly huge.
         self.icon_widget = SquareSvgWidget(self.ui)
         self.icon_widget.load("/usr/share/ubiquity/qt/images/branding.svgz")
-        self.ui.sidebar_widget.layout().addWidget(self.icon_widget)
+        branding_layout = QtGui.QHBoxLayout()
+        branding_layout.addItem(QtGui.QSpacerItem(1, 1,
+                                                  QtGui.QSizePolicy.Expanding,
+                                                  QtGui.QSizePolicy.Minimum))
+        branding_layout.addWidget(self.icon_widget)
+        branding_layout.addItem(QtGui.QSpacerItem(1, 1,
+                                                  QtGui.QSizePolicy.Expanding,
+                                                  QtGui.QSizePolicy.Minimum))
+        branding_spacer = QtGui.QSpacerItem(1, 1,
+                                            QtGui.QSizePolicy.Minimum,
+                                            QtGui.QSizePolicy.Expanding)
+        self.ui.sidebar_widget.layout().addItem(branding_spacer)
+        self.ui.sidebar_widget.layout().addItem(branding_layout)
 
         # initially the steps widget is not visible
         # it becomes visible once the first step becomes active