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

Merge from trunk

Browse Source
This commit is contained in:
Charles Haley 2011-05-23 17:03:24 +01:00
commit c98e9a80f0
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

@ -6,7 +6,7 @@ __license__ = 'GPL v3'
import json import json
from PyQt4.Qt import (Qt, QDialog, QDialogButtonBox, QSyntaxHighlighter, from PyQt4.Qt import (Qt, QDialog, QDialogButtonBox, QSyntaxHighlighter,
QRegExp, QSettings, QVariant, QApplication, QRegExp, QApplication,
QTextCharFormat, QFont, QColor, QCursor) QTextCharFormat, QFont, QColor, QCursor)
from calibre.gui2.dialogs.template_dialog_ui import Ui_TemplateDialog from calibre.gui2.dialogs.template_dialog_ui import Ui_TemplateDialog
@ -67,8 +67,8 @@ class TemplateHighlighter(QSyntaxHighlighter):
def initializeFormats(self): def initializeFormats(self):
Config = self.Config Config = self.Config
Config["fontfamily"] = "Bitstream Vera Sans Mono" Config["fontfamily"] = "monospace"
Config["fontsize"] = 10 #Config["fontsize"] = 10
for name, color, bold, italic in ( for name, color, bold, italic in (
("normal", "#000000", False, False), ("normal", "#000000", False, False),
("keyword", "#000080", True, False), ("keyword", "#000080", True, False),
@ -84,7 +84,7 @@ class TemplateHighlighter(QSyntaxHighlighter):
baseFormat = QTextCharFormat() baseFormat = QTextCharFormat()
baseFormat.setFontFamily(Config["fontfamily"]) baseFormat.setFontFamily(Config["fontfamily"])
baseFormat.setFontPointSize(Config["fontsize"]) #baseFormat.setFontPointSize(Config["fontsize"])
for name in ("normal", "keyword", "builtin", "comment", for name in ("normal", "keyword", "builtin", "comment",
"string", "number", "lparen", "rparen"): "string", "number", "lparen", "rparen"):