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

Changes to font selection

Browse Source
This commit is contained in:
Charles Haley 2021-03-21 16:16:39 +00:00
parent 7fe23d9e58
commit 180b55d4e5
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/calibre/gui2/dialogs/template_dialog.py
View File

@ -82,9 +82,15 @@ class TemplateHighlighter(QSyntaxHighlighter):
self.highlighted_paren = False self.highlighted_paren = False
def initializeFormats(self): def initializeFormats(self):
font = gprefs.get('gpm_template_editor_font', 'monospace') font_name = gprefs.get('gpm_template_editor_font', None)
size = gprefs['gpm_template_editor_font_size']
if font_name is None:
font = QFont()
font.setFixedPitch(True)
font.setPointSize(size)
font_name = font.family()
Config = self.Config Config = self.Config
Config["fontfamily"] = font Config["fontfamily"] = font_name
pal = QApplication.instance().palette() pal = QApplication.instance().palette()
for name, color, bold, italic in ( for name, color, bold, italic in (
("normal", None, False, False), ("normal", None, False, False),
@ -100,7 +106,7 @@ class TemplateHighlighter(QSyntaxHighlighter):
Config["%sfontitalic" % name] = italic Config["%sfontitalic" % name] = italic
baseFormat = QTextCharFormat() baseFormat = QTextCharFormat()
baseFormat.setFontFamily(Config["fontfamily"]) baseFormat.setFontFamily(Config["fontfamily"])
Config["fontsize"] = gprefs['gpm_template_editor_font_size'] Config["fontsize"] = size
baseFormat.setFontPointSize(Config["fontsize"]) baseFormat.setFontPointSize(Config["fontsize"])
for name in ("normal", "keyword", "builtin", "comment", for name in ("normal", "keyword", "builtin", "comment",
@ -421,19 +427,26 @@ class TemplateDialog(QDialog, Ui_TemplateDialog):
pass pass
def set_up_font_boxes(self): def set_up_font_boxes(self):
family = gprefs.get('gpm_template_editor_font', 'monospace') font_name = gprefs.get('gpm_template_editor_font', None)
size = gprefs['gpm_template_editor_font_size'] size = gprefs['gpm_template_editor_font_size']
font = QFont(family, pointSize=size) if font_name is None:
font = QFont()
font.setFixedPitch(True)
font.setPointSize(size)
else:
font = QFont(font_name, pointSize=size)
self.font_box.setWritingSystem(QFontDatabase.Latin) self.font_box.setWritingSystem(QFontDatabase.Latin)
self.font_box.setCurrentFont(font) self.font_box.setCurrentFont(font)
self.font_box.setEditable(False) self.font_box.setEditable(False)
gprefs['gpm_template_editor_font'] = unicode_type(font.family())
self.font_size_box.setValue(size)
self.font_box.currentFontChanged.connect(self.font_changed) self.font_box.currentFontChanged.connect(self.font_changed)
self.font_size_box.setValue(gprefs['gpm_template_editor_font_size'])
self.font_size_box.valueChanged.connect(self.font_size_changed) self.font_size_box.valueChanged.connect(self.font_size_changed)
self.highlighter.initializeFormats()
self.highlighter.rehighlight()
def font_changed(self, font): def font_changed(self, font):
fi = QFontInfo(font) fi = QFontInfo(font)
gprefs['gpm_template_editor_font_size'] = fi.pointSize()
gprefs['gpm_template_editor_font'] = unicode_type(fi.family()) gprefs['gpm_template_editor_font'] = unicode_type(fi.family())
self.highlighter.initializeFormats() self.highlighter.initializeFormats()
self.highlighter.rehighlight() self.highlighter.rehighlight()