Merge lp:~agateau/ubiquity/kde-fix-cropped-greeter-buttons into lp:ubiquity

[Aurélien Gâteau]

[Rohan Garg (rohangarg)]

Looks alright to me

=== modified file 'gui/qt/stepLanguage.ui'
--- gui/qt/stepLanguage.ui	2013-07-08 14:45:24 +0000
+++ gui/qt/stepLanguage.ui	2014-02-27 15:50:49 +0000
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>672</width>
-    <height>507</height>
+    <height>430</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -20,17 +20,23 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0" colspan="5">
-    <widget class="QLabel" name="welcome_heading_label">
-     <property name="text">
-      <string>Welcome</string>
-     </property>
-    </widget>
+   <item row="12" column="2">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>0</height>
+      </size>
+     </property>
+    </spacer>
    </item>
-   <item row="10" column="0" colspan="5">
-    <widget class="QLabel" name="oem_id_label">
+   <item row="9" column="0" colspan="5">
+    <widget class="QLabel" name="release_notes_label">
      <property name="text">
-      <string>You are installing in system manufacturer mode. Please enter a unique name for this batch of systems. This name will be saved on the installed system and can be used to help with bug reports.</string>
+      <string>If you have Internet access, read the release notes for information on problems that may affect you.</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
@@ -47,6 +53,19 @@
      </property>
     </widget>
    </item>
+   <item row="4" column="0" colspan="2">
+    <spacer name="horizontalSpacer_4">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>294</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
    <item row="2" column="0" rowspan="2" colspan="5">
     <widget class="QLabel" name="select_language_label">
      <property name="sizePolicy">
@@ -63,35 +82,6 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="0" colspan="2">
-    <spacer name="horizontalSpacer_4">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>294</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="11" column="0" colspan="2">
-    <widget class="QLineEdit" name="oem_id_entry"/>
-   </item>
-   <item row="4" column="3" colspan="2">
-    <spacer name="horizontalSpacer_3">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>293</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
    <item row="4" column="2">
     <widget class="QComboBox" name="language_combobox">
      <property name="editable">
@@ -135,29 +125,19 @@
      </property>
     </spacer>
    </item>
-   <item row="12" column="2">
-    <spacer name="verticalSpacer">
+   <item row="4" column="3" colspan="2">
+    <spacer name="horizontalSpacer_3">
      <property name="orientation">
-      <enum>Qt::Vertical</enum>
+      <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
-       <width>20</width>
-       <height>40</height>
+       <width>293</width>
+       <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
-   <item row="9" column="0" colspan="5">
-    <widget class="QLabel" name="release_notes_label">
-     <property name="text">
-      <string>If you have Internet access, read the release notes for information on problems that may affect you.</string>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
    <item row="6" column="0" colspan="5">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
@@ -259,6 +239,51 @@
      </property>
     </spacer>
    </item>
+   <item row="0" column="0" colspan="5">
+    <widget class="QLabel" name="welcome_heading_label">
+     <property name="text">
+      <string>Welcome</string>
+     </property>
+    </widget>
+   </item>
+   <item row="10" column="0" colspan="5">
+    <widget class="QWidget" name="oem_widget" native="true">
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <property name="margin">
+       <number>0</number>
+      </property>
+      <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>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QLabel" name="oem_id_label">
+        <property name="text">
+         <string>You are installing in system manufacturer mode. Please enter a unique name for this batch of systems. This name will be saved on the installed system and can be used to help with bug reports.</string>
+        </property>
+        <property name="wordWrap">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLineEdit" name="oem_id_entry"/>
+      </item>
+     </layout>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>

=== modified file 'ubiquity/plugins/ubi-language.py'
--- ubiquity/plugins/ubi-language.py	2013-07-23 13:26:23 +0000
+++ ubiquity/plugins/ubi-language.py	2014-02-27 15:50:49 +0000
@@ -404,14 +404,16 @@
             self.combobox.currentIndexChanged[str].connect(
                 self.on_language_selection_changed)
             if not self.controller.oem_config:
-                self.page.oem_id_label.hide()
-                self.page.oem_id_entry.hide()
+                self.page.oem_widget.hide()
 
             def init_big_button(button, image_name):
                 pix = QPixmap('/usr/share/ubiquity/qt/images/' + image_name)
                 icon = QIcon(pix)
                 button.setIcon(icon)
                 button.setIconSize(pix.size())
+                # Set a fixed height to ensure the button text is not cropped
+                # when the window is resized
+                button.setFixedHeight(button.sizeHint().height())
 
             def inst(*args):
                 self.page.try_ubuntu.setEnabled(False)