From 381a042206a28eb484995623e30078bc9e050498 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 20 Nov 2021 07:40:42 +0530 Subject: [PATCH] pyqt6 remove Qapplication::fontMetrics --- src/calibre/gui2/library/models.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index de9c841157..0a377f7803 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -14,10 +14,6 @@ import time import traceback from collections import defaultdict, namedtuple from itertools import groupby -from qt.core import ( - QAbstractTableModel, QApplication, QColor, QDateTime, QFont, QIcon, QImage, - QModelIndex, QPainter, QPixmap, Qt, pyqtSignal -) from calibre import ( fit_image, force_unicode, human_readable, isbytestring, prepare_string_for_xml, @@ -34,13 +30,15 @@ from calibre.library.coloring import color_row_key from calibre.library.save_to_disk import find_plugboard from calibre.ptempfile import PersistentTemporaryFile from calibre.utils.config import device_prefs, prefs, tweaks -from calibre.utils.date import ( - UNDEFINED_DATE, as_local_time, dt_factory, is_date_undefined, qt_to_dt -) +from calibre.utils.date import (UNDEFINED_DATE, as_local_time, dt_factory, + is_date_undefined, qt_to_dt) from calibre.utils.icu import sort_key from calibre.utils.localization import calibre_langcode_to_name from calibre.utils.search_query_parser import ParseException, SearchQueryParser from polyglot.builtins import iteritems, itervalues, string_or_bytes +from qt.core import (QAbstractTableModel, QApplication, QColor, QDateTime, + QFont, QFontMetrics, QIcon, QImage, QModelIndex, QPainter, + QPixmap, Qt, pyqtSignal) Counts = namedtuple('Counts', 'library_total total current') @@ -235,7 +233,7 @@ class BooksModel(QAbstractTableModel): # {{{ self.alignment_map = {} self.buffer_size = buffer self.metadata_backup = None - icon_height = (parent.fontMetrics() if hasattr(parent, 'fontMetrics') else QApplication.instance().fontMetrics()).lineSpacing() + icon_height = (parent.fontMetrics() if hasattr(parent, 'fontMetrics') else QFontMetrics(QApplication.font())).lineSpacing() self.bool_yes_icon = QIcon(I('ok.png')).pixmap(icon_height) self.bool_no_icon = QIcon(I('list_remove.png')).pixmap(icon_height) self.bool_blank_icon = QIcon(I('blank.png')).pixmap(icon_height)