Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-31 14:33:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

More stupid PyQt enums

Browse Source
This commit is contained in:
Kovid Goyal 2020-12-20 11:37:31 +05:30
parent e78c388315
commit 3533f2f250
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/gui2/tweak_book/preview.py
View File

@ -746,10 +746,10 @@ class Preview(QWidget):
def apply_settings(self): def apply_settings(self):
s = self.view.settings() s = self.view.settings()
s.setFontSize(s.DefaultFontSize, tprefs['preview_base_font_size']) s.setFontSize(QWebEngineSettings.FontSize.DefaultFontSize, tprefs['preview_base_font_size'])
s.setFontSize(s.DefaultFixedFontSize, tprefs['preview_mono_font_size']) s.setFontSize(QWebEngineSettings.FontSize.DefaultFixedFontSize, tprefs['preview_mono_font_size'])
s.setFontSize(s.MinimumLogicalFontSize, tprefs['preview_minimum_font_size']) s.setFontSize(QWebEngineSettings.FontSize.MinimumLogicalFontSize, tprefs['preview_minimum_font_size'])
s.setFontSize(s.MinimumFontSize, 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'] sf, ssf, mf = tprefs['engine_preview_serif_family'], tprefs['engine_preview_sans_family'], tprefs['engine_preview_mono_family']
if sf: if sf:
s.setFontFamily(s.SerifFont, sf) s.setFontFamily(s.SerifFont, sf)

19
src/calibre/gui2/viewer/web_view.py
View File

@ -311,21 +311,24 @@ def apply_font_settings(page_or_view):
sf = fs.get('standard_font') or 'serif' sf = fs.get('standard_font') or 'serif'
sf = getattr(s, {'serif': 'SerifFont', 'sans': 'SansSerifFont', 'mono': 'FixedFont'}[sf]) sf = getattr(s, {'serif': 'SerifFont', 'sans': 'SansSerifFont', 'mono': 'FixedFont'}[sf])
s.setFontFamily(s.StandardFont, s.fontFamily(sf)) s.setFontFamily(s.StandardFont, s.fontFamily(sf))
old_minimum = s.fontSize(s.MinimumFontSize) old_minimum = s.fontSize(QWebEngineSettings.FontSize.MinimumFontSize)
old_base = s.fontSize(s.DefaultFontSize) old_base = s.fontSize(QWebEngineSettings.FontSize.DefaultFontSize)
old_fixed_base = s.fontSize(s.DefaultFixedFontSize) old_fixed_base = s.fontSize(QWebEngineSettings.FontSize.DefaultFixedFontSize)
mfs = fs.get('minimum_font_size') mfs = fs.get('minimum_font_size')
if mfs is None: if mfs is None:
s.resetFontSize(s.MinimumFontSize) s.resetFontSize(QWebEngineSettings.FontSize.MinimumFontSize)
else: else:
s.setFontSize(s.MinimumFontSize, mfs) s.setFontSize(QWebEngineSettings.FontSize.MinimumFontSize, mfs)
bfs = sd.get('base_font_size') bfs = sd.get('base_font_size')
if bfs is not None: if bfs is not None:
s.setFontSize(s.DefaultFontSize, bfs) s.setFontSize(QWebEngineSettings.FontSize.DefaultFontSize, bfs)
s.setFontSize(s.DefaultFixedFontSize, int(bfs * 13 / 16)) s.setFontSize(QWebEngineSettings.FontSize.DefaultFixedFontSize, int(bfs * 13 / 16))
font_size_changed = (old_minimum, old_base, old_fixed_base) != ( 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'): if font_size_changed and hasattr(page_or_view, 'execute_when_ready'):
page_or_view.execute_when_ready('viewer_font_size_changed') page_or_view.execute_when_ready('viewer_font_size_changed')