Merge from trunk

src/calibre/gui2/dialogs/template_line_editor.py

@@ -6,7 +6,7 @@
 __docformat__ = 'restructuredtext en'
 
 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.complete import MultiCompleteComboBox
@@ -57,6 +57,8 @@ class TagWizard(QDialog):
 
     def __init__(self, parent, tags, txt):
         QDialog.__init__(self, parent)
+        self.setWindowTitle(_('Tag Wizard'))
+        self.setWindowIcon(QIcon(I('wizard.png')))
 
         self.tags = tags
         l = QGridLayout()
@@ -125,4 +127,4 @@ def accepted(self):
             if t and c:
                 res += '#' + t + ':|:' + c  + '\n'
         self.template += res
-        self.accept()
+        self.accept()

src/calibre/gui2/widgets.py

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