Merge lp:~a1s/qbrz/fix-argument-types into lp:qbrz

[Aleksandr Smyshliaev]

Fix passing arguments of invalid type.

Current QBrz passes float arguments to some methods that accept only int. For example:

Traceback (most recent call last):
  File "/usr/lib/python3.10/site-packages/breezy/plugins/qbrz/lib/uifactory.py", line 32, in decorate
    r = f(*args, **kargs)
  File "/usr/lib/python3.10/site-packages/breezy/plugins/qbrz/lib/log.py", line 798, in show_diff_files
    self.log_list.show_diff(specific_files=paths, specific_file_ids=ids, ext_diff=ext_diff)
  File "/usr/lib/python3.10/site-packages/breezy/plugins/qbrz/lib/logwidget.py", line 508, in show_diff
    diff.show_diff(arg_provider, ext_diff=ext_diff,
  File "/usr/lib/python3.10/site-packages/breezy/plugins/qbrz/lib/diff.py", line 75, in show_diff
    window = DiffWindow(arg_provider, parent=parent_window)
  File "/usr/lib/python3.10/site-packages/breezy/plugins/qbrz/lib/diffwindow.py", line 138, in __init__
    self.diffview = SidebySideDiffView(self)
  File "/usr/lib/python3.10/site-packages/breezy/plugins/qbrz/lib/diffview.py", line 252, in __init__
    self.view = _SidebySideDiffView(parent)
  File "/usr/lib/python3.10/site-packages/breezy/plugins/qbrz/lib/diffview.py", line 408, in __init__
    titleFont.setPointSize(titleFont.pointSize() * 140 / 100)
TypeError: setPointSize(self, int): argument 1 has unexpected type 'float'

This change converts such arguments to integers for QTimer and QRect, and uses pointSizeF (which is float) instead of pointSize (integer) for QFont objects.

[Jelmer Vernooij (jelmer)]

review: Approve

[lp:~a1s/qbrz/fix-argument-types]

1643. By Aleksandr Smyshliaev on 2022-01-08

Fix syncing horizontal sliders in diffview

=== modified file 'lib/annotate.py'
--- lib/annotate.py	2021-01-06 10:46:29 +0000
+++ lib/annotate.py	2022-01-08 10:52:55 +0000
@@ -153,11 +153,11 @@
         text_margin = self.style().pixelMetric(QtWidgets.QStyle.PM_FocusFrameHMargin, None, self) + 1
 
         if 0: rect = QtCore.QRect
-        line_number_rect = QtCore.QRect(
+        line_number_rect = QtCore.QRect(*map(int, [
             rect.left() + text_margin,
             rect.top(),
             self.line_number_width - (2 * text_margin),
-            rect.height())
+            rect.height()]))
 
         painter.drawText(line_number_rect, QtCore.Qt.AlignRight, str(line_number))
 
@@ -169,21 +169,21 @@
                     font.setBold(True)
                     painter.setFont(font)
 
-                revno_rect = QtCore.QRect(
+                revno_rect = QtCore.QRect(*map(int, [
                     rect.left() + self.line_number_width + text_margin,
                     rect.top(),
                     self.revno_width - (2 * text_margin),
-                    rect.height())
+                    rect.height()]))
                 paint_revno(painter, revno_rect, str(self.get_revno(revid)), self.max_mainline_digits)
 
                 if revid in cached_revisions:
                     rev = cached_revisions[revid]
-                    author_rect = QtCore.QRect(
+                    author_rect = QtCore.QRect(*map(int, [
                         rect.left() + self.line_number_width
                                     + self.revno_width + text_margin,
                         rect.top(),
                         rect.right() - revno_rect.right() - (2 * text_margin),
-                        rect.height())
+                        rect.height()]))
                     author = get_apparent_author_name(rev)
                     if fm.width(author) > author_rect.width():
                         author= fm.elidedText(author, QtCore.Qt.ElideRight, author_rect.width())

=== modified file 'lib/config.py'
--- lib/config.py	2021-01-05 13:03:34 +0000
+++ lib/config.py	2022-01-08 10:52:55 +0000
@@ -176,7 +176,7 @@
                                           gettext("Command")])
         self.extDiffList.setItemDelegateForColumn(0,
             QRadioCheckItemDelegate(self.extDiffList))
-        self.extDiffList.itemChanged [QTreeWidgetItem, int].connect(self.extDiffListItemChanged)
+        self.extDiffList.itemChanged [QtWidgets.QTreeWidgetItem, int].connect(self.extDiffListItemChanged)
 
         addExtDiffButton = QtWidgets.QPushButton(gettext("Add"), diffWidget)
         addExtDiffButton.clicked.connect(self.addExtDiff)
@@ -205,9 +205,9 @@
             self.merge_tools_model = MergeToolsTableModel()
             self.merge_ui.tools.setModel(self.merge_tools_model)
 
-            self.merge_tools_model.dataChanged[QModelIndex, QModelIndex].connect(self.merge_tools_data_changed)
+            self.merge_tools_model.dataChanged[QtCore.QModelIndex, QtCore.QModelIndex].connect(self.merge_tools_data_changed)
 
-            self.merge_ui.tools.selectionModel().selectionChanged[QItemSelection, QItemSelection].connect(self.merge_tools_selectionChanged)
+            self.merge_ui.tools.selectionModel().selectionChanged[QtCore.QItemSelection, QtCore.QItemSelection].connect(self.merge_tools_selectionChanged)
 
             self.merge_ui.add.clicked.connect(self.merge_tools_add_clicked)
             self.merge_ui.remove.clicked.connect(self.merge_tools_remove_clicked)

=== modified file 'lib/decorators.py'
--- lib/decorators.py	2021-01-05 13:03:34 +0000
+++ lib/decorators.py	2022-01-08 10:52:55 +0000
@@ -59,7 +59,7 @@
         elapsed = (time.time() - self._last_scheduled_at) * 1000
         if elapsed < self.millisec:
             # Retry
-            QtCore.QTimer.singleShot(self.millisec - elapsed, self._exec)
+            QtCore.QTimer.singleShot(int(self.millisec - elapsed), self._exec)
             return
 
         last_executed_at = self._last_scheduled_at
@@ -72,7 +72,7 @@
             # One more call if there was another request when executing proc
             QtCore.QTimer.singleShot(self.millisec, self._exec)
             return
-        
+
         self._last_scheduled_at = 0
 
 def lazy_call(millisec, per_instance=False):

=== modified file 'lib/diffview.py'
--- lib/diffview.py	2021-01-06 15:04:27 +0000
+++ lib/diffview.py	2022-01-08 10:52:55 +0000
@@ -123,7 +123,7 @@
         pen.setWidth(2)
         painter.setPen(pen)
         for block_y in self.infoBlocks:
-            block_y = block_y - y
+            block_y = int(block_y - y)
             if block_y < top:
                 continue
             if block_y > bot:
@@ -132,8 +132,8 @@
 
         pen.setWidth(1)
         for y_top, y_bot, kind in self.changes:
-            y_top -= y
-            y_bot -= y
+            y_top = int(y_top - y)
+            y_bot = int(y_bot - y)
             if y_top < top and y_bot < top:
                 continue
             if y_top > bot and y_bot > bot:
@@ -405,12 +405,12 @@
         self.complete = False
 
         titleFont = QtGui.QFont(self.font())
-        titleFont.setPointSize(titleFont.pointSize() * 140 / 100)
+        titleFont.setPointSizeF(titleFont.pointSizeF() * 140 / 100)
         titleFont.setBold(True)
 
         self.monospacedFont = get_monospace_font()
         metadataFont = QtGui.QFont(self.font())
-        metadataFont.setPointSize(titleFont.pointSize() * 70 / 100)
+        metadataFont.setPointSizeF(titleFont.pointSizeF() * 70 / 100)
         metadataLabelFont = QtGui.QFont(metadataFont)
         metadataLabelFont.setBold(True)
 
@@ -786,7 +786,7 @@
         if m:
             value = slider2.minimum() + slider2.maximum() * (value - slider1.minimum()) / m
             self.ignoreUpdate = True
-            slider2.setValue(value)
+            slider2.setValue(int(value))
             self.ignoreUpdate = False
 
     def syncHorizontalSlider1(self, value):

=== modified file 'lib/logwidget.py'
--- lib/logwidget.py	2021-01-08 11:30:55 +0000
+++ lib/logwidget.py	2022-01-08 10:52:55 +0000
@@ -706,7 +706,7 @@
 
             finally:
                 painter.restore()
-                rect.adjust( (graphCols + 1.5) * boxsize, 0, 0, 0)
+                rect.adjust( int((graphCols + 1.5) * boxsize), 0, 0, 0)
 
             painter.save()
             x = 0

=== modified file 'lib/revtreeview.py'
--- lib/revtreeview.py	2021-01-05 16:26:04 +0000
+++ lib/revtreeview.py	2022-01-08 10:52:55 +0000
@@ -127,7 +127,7 @@
                 #    self.throbber.show()
                 #    self.load_revisions_throbber_shown = True
                 # Allow for more scrolling to happen.
-                self.delay(0.5)
+                self.delay(500)
 
             return False