Merge ~fritzdaswiesel/ubuntu/+source/ubiquity:fritzdaswiesel_bug1963697 into ubuntu/+source/ubiquity:ubuntu/devel

[Patrick T. Lehmann]

Bugfix for Ubiquity bug #1963697
Kubuntu installer scripts reported crashes due to unexpected types. The reason is the ICON_SIZE which, for some reason, was an odd number. Thus dividing it by 2 results in a float number.

With this patch applied, I successfully went through all default steps of the installer and got Kubuntu Jammy's current daily build installed on my VM.

[Julian Andres Klode (juliank)]

The bug report states this has already been fixed, if the issue remains, please open a new bug report and merge.

review: Disapprove

Unmerged commits

e854536... by Patrick T. Lehmann on 2022-03-16

Bugfix for Ubiquity bug #1963697
Kubuntu installer scripts reported crashes due to unexpected
types. The reason is the ICON_SIZE which, for some reason, was
an odd number. Thus dividing it by 2 results in a float number.

With this patch applied, I went successfully through all default
steps if the installer and got Kubuntu Jammy's daily build
running on my VM.

diff --git a/ubiquity/frontend/kde_components/Keyboard.py b/ubiquity/frontend/kde_components/Keyboard.py
index 822dc2f..08768fe 100644
--- a/ubiquity/frontend/kde_components/Keyboard.py
+++ b/ubiquity/frontend/kde_components/Keyboard.py
@@ -94,7 +94,7 @@ class Keyboard(QWidget):
     def resizeEvent(self, re):
         self.space = 6
         self.usable_width = self.width() - 2
-        self.key_w = (self.usable_width - 14 * self.space) / 15
+        self.key_w = int((self.usable_width - 14 * self.space) / 15)
 
         self.setMinimumHeight(self.key_w * 4 + self.space * 5)
 
diff --git a/ubiquity/frontend/kde_components/PartitionBar.py b/ubiquity/frontend/kde_components/PartitionBar.py
index fc6e698..39be383 100644
--- a/ubiquity/frontend/kde_components/PartitionBar.py
+++ b/ubiquity/frontend/kde_components/PartitionBar.py
@@ -164,7 +164,7 @@ class PartitionsBar(QtWidgets.QWidget):
                 QtCore.Qt.TextSingleLine, text)
             painter.drawText(
                 x + 18,
-                labelY + v_off + textSize.height() / 2, text)
+                labelY + v_off + int(textSize.height() / 2), text)
             v_off += textSize.height()
             painter.setFont(infoFont)
             painter.setPen(QtGui.QColor(PartitionsBar.InfoColor))
diff --git a/ubiquity/frontend/kde_components/Timezone.py b/ubiquity/frontend/kde_components/Timezone.py
index ea62f3d..05bbb7b 100644
--- a/ubiquity/frontend/kde_components/Timezone.py
+++ b/ubiquity/frontend/kde_components/Timezone.py
@@ -126,9 +126,9 @@ class TimezoneMap(QtWidgets.QWidget):
 
     def heightForWidth(self, w):
         size = self.pixmap.size()
-        if w > size.width():
+        if int(w) > size.width():
             w = size.width()
-        return w * size.height() / size.width()
+        return int(w * size.height() / size.width())
 
     def paintEvent(self, unused_paintEvent):
         painter = QtGui.QPainter(self)
diff --git a/ubiquity/frontend/kde_components/nmwidgets.py b/ubiquity/frontend/kde_components/nmwidgets.py
index 9edd7f3..edf300d 100644
--- a/ubiquity/frontend/kde_components/nmwidgets.py
+++ b/ubiquity/frontend/kde_components/nmwidgets.py
@@ -205,7 +205,7 @@ class QtNetworkStore(QtGui.QStandardItemModel, NetworkStore):
             pixes.append(draw_level_pix(level))
 
         secure_icon = QtGui.QIcon.fromTheme("emblem-locked")
-        secure_pix = secure_icon.pixmap(ICON_SIZE / 2, ICON_SIZE / 2)
+        secure_pix = secure_icon.pixmap(int(ICON_SIZE / 2), int(ICON_SIZE / 2))
         for level in range(5):
             pix2 = QtGui.QPixmap(pixes[level])
             painter = QtGui.QPainter(pix2)