From c2d8be261a0fba9618579c9c26dcc2a2697c3463 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 19 Dec 2020 14:00:56 +0530 Subject: [PATCH] More stupid PyQt enums --- src/calibre/gui2/library/views.py | 4 ++-- src/calibre/gui2/viewer/highlights.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py index f0de60d02d..ee65647791 100644 --- a/src/calibre/gui2/library/views.py +++ b/src/calibre/gui2/library/views.py @@ -97,11 +97,11 @@ class HeaderView(QHeaderView): # {{{ opt.fontMetrics = self.fm model = self.parent().model() style = self.style() - margin = 2 * style.pixelMetric(style.PM_HeaderMargin, None, self) + margin = 2 * style.pixelMetric(QStyle.PixelMetric.PM_HeaderMargin, None, self) if self.isSortIndicatorShown() and self.sortIndicatorSection() == logical_index: opt.sortIndicator = QStyleOptionHeader.SortIndicator.SortDown if \ self.sortIndicatorOrder() == Qt.SortOrder.AscendingOrder else QStyleOptionHeader.SortIndicator.SortUp - margin += style.pixelMetric(style.PM_HeaderMarkSize, None, self) + margin += style.pixelMetric(QStyle.PixelMetric.PM_HeaderMarkSize, None, self) opt.text = unicode_type(model.headerData(logical_index, opt.orientation, Qt.ItemDataRole.DisplayRole) or '') if self.textElideMode() != Qt.TextElideMode.ElideNone: opt.text = opt.fontMetrics.elidedText(opt.text, Qt.TextElideMode.ElideRight, rect.width() - margin) diff --git a/src/calibre/gui2/viewer/highlights.py b/src/calibre/gui2/viewer/highlights.py index a1ffb0f4ba..1e9bdd8bde 100644 --- a/src/calibre/gui2/viewer/highlights.py +++ b/src/calibre/gui2/viewer/highlights.py @@ -188,7 +188,7 @@ class Highlights(QTreeWidget): def load(self, highlights): s = self.style() - icon_size = s.pixelMetric(s.PM_SmallIconSize, None, self) + icon_size = s.pixelMetric(QStyle.PixelMetric.PM_SmallIconSize, None, self) dpr = self.devicePixelRatioF() is_dark = is_dark_theme() self.clear()