Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-01-06 09:54:28 +01:00
Code Issues Projects Releases Wiki Activity

pyqt6 remove Qapplication::fontMetrics

Browse source
This commit is contained in:
Kovid Goyal 2021-11-20 07:40:42 +05:30
parent 2900c855cd
commit 2cf2f2df8f
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/calibre/gui2/library/models.py
View file

@ -14,18 +14,14 @@
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,
strftime
)
from calibre import (fit_image, force_unicode, human_readable, isbytestring,
prepare_string_for_xml, strftime)
from calibre.constants import DEBUG, config_dir, filesystem_encoding
from calibre.db.search import CONTAINS_MATCH, EQUALS_MATCH, REGEXP_MATCH, _match
from calibre.ebooks.metadata import authors_to_string, fmt_sidx, string_to_authors
from calibre.db.search import (CONTAINS_MATCH, EQUALS_MATCH, REGEXP_MATCH,
_match)
from calibre.ebooks.metadata import (authors_to_string, fmt_sidx,
string_to_authors)
from calibre.ebooks.metadata.book.formatter import SafeFormat
from calibre.gui2 import error_dialog
from calibre.gui2.library import DEFAULT_SORT
@ -34,13 +30,15 @@
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')
@ -224,7 +222,7 @@ def __init__(self, parent=None, buffer=40):
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)