Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-08-07 09:01:38 -04:00
Code Issues Packages 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 d99b1bd628
commit 381a042206
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/calibre/gui2/library/models.py
View File

@ -14,10 +14,6 @@ import time
import traceback import traceback
from collections import defaultdict, namedtuple from collections import defaultdict, namedtuple
from itertools import groupby from itertools import groupby
from qt.core import (
QAbstractTableModel, QApplication, QColor, QDateTime, QFont, QIcon, QImage,
QModelIndex, QPainter, QPixmap, Qt, pyqtSignal
)
from calibre import ( from calibre import (
fit_image, force_unicode, human_readable, isbytestring, prepare_string_for_xml, 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.library.save_to_disk import find_plugboard
from calibre.ptempfile import PersistentTemporaryFile from calibre.ptempfile import PersistentTemporaryFile
from calibre.utils.config import device_prefs, prefs, tweaks from calibre.utils.config import device_prefs, prefs, tweaks
from calibre.utils.date import ( from calibre.utils.date import (UNDEFINED_DATE, as_local_time, dt_factory,
UNDEFINED_DATE, as_local_time, dt_factory, is_date_undefined, qt_to_dt is_date_undefined, qt_to_dt)
)
from calibre.utils.icu import sort_key from calibre.utils.icu import sort_key
from calibre.utils.localization import calibre_langcode_to_name from calibre.utils.localization import calibre_langcode_to_name
from calibre.utils.search_query_parser import ParseException, SearchQueryParser from calibre.utils.search_query_parser import ParseException, SearchQueryParser
from polyglot.builtins import iteritems, itervalues, string_or_bytes 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') Counts = namedtuple('Counts', 'library_total total current')
@ -235,7 +233,7 @@ class BooksModel(QAbstractTableModel): # {{{
self.alignment_map = {} self.alignment_map = {}
self.buffer_size = buffer self.buffer_size = buffer
self.metadata_backup = None 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_yes_icon = QIcon(I('ok.png')).pixmap(icon_height)
self.bool_no_icon = QIcon(I('list_remove.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) self.bool_blank_icon = QIcon(I('blank.png')).pixmap(icon_height)