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

Merge from trunk

Browse Source
This commit is contained in:
Charles Haley 2011-05-23 20:57:00 +01:00
commit ffe8dcc77a
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/gui2/dialogs/template_line_editor.py
View File

@ -6,7 +6,7 @@ __copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
__docformat__ = 'restructuredtext en' __docformat__ = 'restructuredtext en'
from PyQt4.Qt import (QLineEdit, QDialog, QGridLayout, QLabel, from PyQt4.Qt import (QLineEdit, QDialog, QGridLayout, QLabel,
QDialogButtonBox, QColor, QTimer, QComboBox) QDialogButtonBox, QColor, QComboBox, QIcon)
from calibre.gui2.dialogs.template_dialog import TemplateDialog from calibre.gui2.dialogs.template_dialog import TemplateDialog
from calibre.gui2.complete import MultiCompleteComboBox from calibre.gui2.complete import MultiCompleteComboBox
@ -57,6 +57,8 @@ class TagWizard(QDialog):
def __init__(self, parent, tags, txt): def __init__(self, parent, tags, txt):
QDialog.__init__(self, parent) QDialog.__init__(self, parent)
self.setWindowTitle(_('Tag Wizard'))
self.setWindowIcon(QIcon(I('wizard.png')))
self.tags = tags self.tags = tags
l = QGridLayout() l = QGridLayout()
@ -125,4 +127,4 @@ class TagWizard(QDialog):
if t and c: if t and c:
res += '#' + t + ':|:' + c + '\n' res += '#' + t + ':|:' + c + '\n'
self.template += res self.template += res
self.accept() self.accept()

2
src/calibre/gui2/widgets.py
View File

@ -833,7 +833,7 @@ class PythonHighlighter(QSyntaxHighlighter):
Config["tabwidth"] = settings.value("tabwidth", Config["tabwidth"] = settings.value("tabwidth",
QVariant(4)).toInt()[0] QVariant(4)).toInt()[0]
Config["fontfamily"] = settings.value("fontfamily", Config["fontfamily"] = settings.value("fontfamily",
QVariant("Bitstream Vera Sans Mono")).toString() QVariant("monospace")).toString()
Config["fontsize"] = settings.value("fontsize", Config["fontsize"] = settings.value("fontsize",
QVariant(10)).toInt()[0] QVariant(10)).toInt()[0]
for name, color, bold, italic in ( for name, color, bold, italic in (