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

Some fixes and improvements from un_pogaz

Browse Source
This commit is contained in:
Charles Haley 2022-10-10 19:02:00 +01:00
parent dfcdf7c131
commit f1f8c32975
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,7 +89,7 @@ class TemplateHighlighter(QSyntaxHighlighter):
r"|\$+#?[a-zA-Z]\w*", r"|\$+#?[a-zA-Z]\w*",
"identifier") "identifier")
a(r"^\bprogram\b", "keyword") a(r"^\bprogram\b:", "keyword")
a( a(
"|".join([r"\b%s\b" % keyword for keyword in self.KEYWORDS_GPM]), "|".join([r"\b%s\b" % keyword for keyword in self.KEYWORDS_GPM]),
"keyword") "keyword")
@ -102,7 +102,7 @@ class TemplateHighlighter(QSyntaxHighlighter):
a(r"""(?<!:)'[^']*'|"[^"]*\"""", "string") a(r"""(?<!:)'[^']*'|"[^"]*\"""", "string")
else: else:
a(r"^\bpython\b", "keyword") a(r"^\bpython\b:", "keyword")
a( a(
"|".join([r"\b%s\b" % keyword for keyword in self.KEYWORDS_PYTHON]), "|".join([r"\b%s\b" % keyword for keyword in self.KEYWORDS_PYTHON]),
@ -144,7 +144,7 @@ class TemplateHighlighter(QSyntaxHighlighter):
config = self.Config = {} config = self.Config = {}
config["fontfamily"] = font_name config["fontfamily"] = font_name
app_palette = QApplication.instance().palette() app_palette = QApplication.instance().palette()
all_formats = ( all_formats = (
# name, color, bold, italic # name, color, bold, italic
("normal", None, False, False), ("normal", None, False, False),
@ -159,7 +159,7 @@ class TemplateHighlighter(QSyntaxHighlighter):
("pyqt", None, False, False), ("pyqt", None, False, False),
("lparen", None, True, True), ("lparen", None, True, True),
("rparen", None, True, True)) ("rparen", None, True, True))
for name, color, bold, italic in all_formats: for name, color, bold, italic in all_formats:
config["%sfontcolor" % name] = color config["%sfontcolor" % name] = color
config["%sfontbold" % name] = bold config["%sfontbold" % name] = bold