From 3533f2f2507b06497b2c373c1a42483fbc1767c2 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 20 Dec 2020 11:37:31 +0530 Subject: [PATCH] More stupid PyQt enums --- src/calibre/gui2/tweak_book/preview.py | 8 ++++---- src/calibre/gui2/viewer/web_view.py | 19 +++++++++++-------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/calibre/gui2/tweak_book/preview.py b/src/calibre/gui2/tweak_book/preview.py index 62819da82e..d04e978220 100644 --- a/src/calibre/gui2/tweak_book/preview.py +++ b/src/calibre/gui2/tweak_book/preview.py @@ -746,10 +746,10 @@ class Preview(QWidget): def apply_settings(self): s = self.view.settings() - s.setFontSize(s.DefaultFontSize, tprefs['preview_base_font_size']) - s.setFontSize(s.DefaultFixedFontSize, tprefs['preview_mono_font_size']) - s.setFontSize(s.MinimumLogicalFontSize, tprefs['preview_minimum_font_size']) - s.setFontSize(s.MinimumFontSize, tprefs['preview_minimum_font_size']) + s.setFontSize(QWebEngineSettings.FontSize.DefaultFontSize, tprefs['preview_base_font_size']) + s.setFontSize(QWebEngineSettings.FontSize.DefaultFixedFontSize, tprefs['preview_mono_font_size']) + s.setFontSize(QWebEngineSettings.FontSize.MinimumLogicalFontSize, tprefs['preview_minimum_font_size']) + s.setFontSize(QWebEngineSettings.FontSize.MinimumFontSize, tprefs['preview_minimum_font_size']) sf, ssf, mf = tprefs['engine_preview_serif_family'], tprefs['engine_preview_sans_family'], tprefs['engine_preview_mono_family'] if sf: s.setFontFamily(s.SerifFont, sf) diff --git a/src/calibre/gui2/viewer/web_view.py b/src/calibre/gui2/viewer/web_view.py index d815fcbc34..97a4df74aa 100644 --- a/src/calibre/gui2/viewer/web_view.py +++ b/src/calibre/gui2/viewer/web_view.py @@ -311,21 +311,24 @@ def apply_font_settings(page_or_view): sf = fs.get('standard_font') or 'serif' sf = getattr(s, {'serif': 'SerifFont', 'sans': 'SansSerifFont', 'mono': 'FixedFont'}[sf]) s.setFontFamily(s.StandardFont, s.fontFamily(sf)) - old_minimum = s.fontSize(s.MinimumFontSize) - old_base = s.fontSize(s.DefaultFontSize) - old_fixed_base = s.fontSize(s.DefaultFixedFontSize) + old_minimum = s.fontSize(QWebEngineSettings.FontSize.MinimumFontSize) + old_base = s.fontSize(QWebEngineSettings.FontSize.DefaultFontSize) + old_fixed_base = s.fontSize(QWebEngineSettings.FontSize.DefaultFixedFontSize) mfs = fs.get('minimum_font_size') if mfs is None: - s.resetFontSize(s.MinimumFontSize) + s.resetFontSize(QWebEngineSettings.FontSize.MinimumFontSize) else: - s.setFontSize(s.MinimumFontSize, mfs) + s.setFontSize(QWebEngineSettings.FontSize.MinimumFontSize, mfs) bfs = sd.get('base_font_size') if bfs is not None: - s.setFontSize(s.DefaultFontSize, bfs) - s.setFontSize(s.DefaultFixedFontSize, int(bfs * 13 / 16)) + s.setFontSize(QWebEngineSettings.FontSize.DefaultFontSize, bfs) + s.setFontSize(QWebEngineSettings.FontSize.DefaultFixedFontSize, int(bfs * 13 / 16)) font_size_changed = (old_minimum, old_base, old_fixed_base) != ( - s.fontSize(s.MinimumFontSize), s.fontSize(s.DefaultFontSize), s.fontSize(s.DefaultFixedFontSize)) + s.fontSize(QWebEngineSettings.FontSize.MinimumFontSize), + s.fontSize(QWebEngineSettings.FontSize.DefaultFontSize), + s.fontSize(QWebEngineSettings.FontSize.DefaultFixedFontSize) + ) if font_size_changed and hasattr(page_or_view, 'execute_when_ready'): page_or_view.execute_when_ready('viewer_font_size_changed')