Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-07 18:24:30 -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:43:30 +05:30
parent 49a38d23d1
commit 8a380d3496
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 11 additions and 11 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

@ -752,11 +752,11 @@ class Preview(QWidget):
s.setFontSize(QWebEngineSettings.FontSize.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(QWebEngineSettings.FontFamily.SerifFont, sf)
if ssf: if ssf:
s.setFontFamily(s.SansSerifFont, ssf) s.setFontFamily(QWebEngineSettings.FontFamily.SansSerifFont, ssf)
if mf: if mf:
s.setFontFamily(s.FixedFont, mf) s.setFontFamily(QWebEngineSettings.FontFamily.FixedFont, mf)
stdfnt = tprefs['preview_standard_font_family'] or 'serif' stdfnt = tprefs['preview_standard_font_family'] or 'serif'
stdfnt = getattr(s, {'serif': 'SerifFont', 'sans': 'SansSerifFont', 'mono': 'FixedFont'}[stdfnt]) stdfnt = getattr(s, {'serif': 'SerifFont', 'sans': 'SansSerifFont', 'mono': 'FixedFont'}[stdfnt])
s.setFontFamily(s.StandardFont, s.fontFamily(stdfnt)) s.setFontFamily(QWebEngineSettings.FontFamily.StandardFont, s.fontFamily(stdfnt))

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

@ -297,20 +297,20 @@ def apply_font_settings(page_or_view):
sd = vprefs['session_data'] sd = vprefs['session_data']
fs = sd.get('standalone_font_settings', {}) fs = sd.get('standalone_font_settings', {})
if fs.get('serif_family'): if fs.get('serif_family'):
s.setFontFamily(s.SerifFont, fs.get('serif_family')) s.setFontFamily(QWebEngineSettings.FontFamily.SerifFont, fs.get('serif_family'))
else: else:
s.resetFontFamily(s.SerifFont) s.resetFontFamily(QWebEngineSettings.FontFamily.SerifFont)
if fs.get('sans_family'): if fs.get('sans_family'):
s.setFontFamily(s.SansSerifFont, fs.get('sans_family')) s.setFontFamily(QWebEngineSettings.FontFamily.SansSerifFont, fs.get('sans_family'))
else: else:
s.resetFontFamily(s.SansSerifFont) s.resetFontFamily(QWebEngineSettings.FontFamily.SansSerifFont)
if fs.get('mono_family'): if fs.get('mono_family'):
s.setFontFamily(s.FixedFont, fs.get('mono_family')) s.setFontFamily(QWebEngineSettings.FontFamily.FixedFont, fs.get('mono_family'))
else: else:
s.resetFontFamily(s.SansSerifFont) s.resetFontFamily(QWebEngineSettings.FontFamily.SansSerifFont)
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(QWebEngineSettings.FontFamily.StandardFont, s.fontFamily(sf))
old_minimum = s.fontSize(QWebEngineSettings.FontSize.MinimumFontSize) old_minimum = s.fontSize(QWebEngineSettings.FontSize.MinimumFontSize)
old_base = s.fontSize(QWebEngineSettings.FontSize.DefaultFontSize) old_base = s.fontSize(QWebEngineSettings.FontSize.DefaultFontSize)
old_fixed_base = s.fontSize(QWebEngineSettings.FontSize.DefaultFixedFontSize) old_fixed_base = s.fontSize(QWebEngineSettings.FontSize.DefaultFixedFontSize)