Edit Book: Allow creation of custom color schemes for the editor (Preferences->Editor settings)

src/calibre/gui2/tweak_book/editor/themes.py

@@ -294,6 +294,8 @@ def builtin_theme_names():
 def all_theme_names():
     return builtin_theme_names() + custom_theme_names()
 
+# Custom theme creation/editing {{{
+
 class CreateNewTheme(Dialog):
 
     def __init__(self, parent=None):
@@ -610,8 +612,12 @@ class ThemeEditor(Dialog):
             p.label.setMinimumWidth(maxw), p.label.setMaximumWidth(maxw)
         self.preview.apply_theme(read_custom_theme(data))
 
+    @property
+    def theme_name(self):
+        return unicode(self.theme.currentText())
+
     def changed(self):
-        name = unicode(self.theme.currentText())
+        name = self.theme_name
         data = self.update_theme(name)
         self.preview.apply_theme(read_custom_theme(data))
 
@@ -633,7 +639,7 @@ class ThemeEditor(Dialog):
             self.show_theme()
 
     def remove_theme(self):
-        name = unicode(self.theme.currentText())
+        name = self.theme_name
         if name:
             tprefs['custom_themes'].pop(name, None)
             tprefs['custom_themes'] = tprefs['custom_themes']
@@ -648,6 +654,7 @@ class ThemeEditor(Dialog):
     def sizeHint(self):
         g = QApplication.instance().desktop().availableGeometry(self.parent() or self)
         return QSize(min(1500, g.width() - 25), 650)
+# }}}
 
 if __name__ == '__main__':
     app = QApplication([])

src/calibre/gui2/tweak_book/preferences.py

@@ -15,11 +15,11 @@ from PyQt4.Qt import (
     QDialog, QGridLayout, QStackedWidget, QDialogButtonBox, QListWidget,
     QListWidgetItem, QIcon, QWidget, QSize, QFormLayout, Qt, QSpinBox,
     QCheckBox, pyqtSignal, QDoubleSpinBox, QComboBox, QLabel, QFont,
-    QFontComboBox, QPushButton, QSizePolicy)
+    QFontComboBox, QPushButton, QSizePolicy, QHBoxLayout)
 
 from calibre.gui2.keyboard import ShortcutConfig
 from calibre.gui2.tweak_book import tprefs
-from calibre.gui2.tweak_book.editor.themes import default_theme, THEMES
+from calibre.gui2.tweak_book.editor.themes import default_theme, all_theme_names, ThemeEditor
 from calibre.gui2.tweak_book.spell import ManageDictionaries
 from calibre.gui2.font_family_chooser import FontFamilyChooser
 
@@ -64,7 +64,7 @@ class BasicSettings(QWidget):  # {{{
         prefs = prefs or tprefs
         widget = QComboBox(self)
         widget.currentIndexChanged[int].connect(self.emit_changed)
-        for key, human in choices.iteritems():
+        for key, human in sorted(choices.iteritems(), key=lambda (key, human): human or key):
             widget.addItem(human or key, key)
 
         def getter(w):
@@ -161,11 +161,14 @@ class EditorSettings(BasicSettings):
         fs.setMinimum(8), fs.setSuffix(' pt'), fs.setMaximum(50)
         l.addRow(_('Editor font &size:'), fs)
 
-        auto_theme = _('Automatic (%s)') % default_theme()
+        choices = self.theme_choices()
-        choices = {k:k for k in THEMES}
-        choices['auto'] = auto_theme
         theme = self.choices_widget('editor_theme', choices, 'auto', 'auto')
-        l.addRow(_('&Color scheme:'), theme)
+        self.custom_theme_button = b = QPushButton(_('Create/edit &custom color schemes'))
+        b.clicked.connect(self.custom_theme)
+        h = QHBoxLayout()
+        h.addWidget(theme), h.addWidget(b)
+        l.addRow(_('&Color scheme:'), h)
+        l.labelForField(h).setBuddy(theme)
 
         tw = self('editor_tab_stop_width')
         tw.setMinimum(2), tw.setSuffix(_(' characters')), tw.setMaximum(20)
@@ -211,6 +214,24 @@ class EditorSettings(BasicSettings):
         d.exec_()
         self.dictionaries_changed = True
 
+    def theme_choices(self):
+        choices = {k:k for k in all_theme_names()}
+        choices['auto'] = _('Automatic (%s)') % default_theme()
+        return choices
+
+    def custom_theme(self):
+        d = ThemeEditor(parent=self)
+        d.exec_()
+        choices = self.theme_choices()
+        s = self.settings['editor_theme']
+        current_val = s.getter(s.widget)
+        s.widget.clear()
+        for key, human in sorted(choices.iteritems(), key=lambda (key, human): human or key):
+            s.widget.addItem(human or key, key)
+        s.setter(s.widget, current_val)
+        if d.theme_name:
+            s.setter(s.widget, d.theme_name)
+
 class IntegrationSettings(BasicSettings):
 
     def __init__(self, parent=None):