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 branch 'master' of https://github.com/cbhaley/calibre

Browse Source
This commit is contained in:
Kovid Goyal 2014-04-04 16:18:38 +05:30
commit a7d4fa16f0
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/gui2/preferences/create_custom_column.py
View File

@ -84,10 +84,15 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn):
for t in self.column_types: for t in self.column_types:
self.column_type_box.addItem(self.column_types[t]['text']) self.column_type_box.addItem(self.column_types[t]['text'])
self.column_type_box.currentIndexChanged.connect(self.datatype_changed) self.column_type_box.currentIndexChanged.connect(self.datatype_changed)
all_colors = [unicode(s) for s in list(QColor.colorNames())]
self.enum_colors_label.setToolTip('<p>' + ', '.join(all_colors) + '</p>')
if not self.editing_col: if not self.editing_col:
self.datatype_changed() self.datatype_changed()
self.exec_() self.exec_()
return return
self.setWindowTitle(_('Edit a custom column')) self.setWindowTitle(_('Edit a custom column'))
self.heading_label.setText(_('Edit a custom column')) self.heading_label.setText(_('Edit a custom column'))
self.shortcuts.setVisible(False) self.shortcuts.setVisible(False)
@ -141,9 +146,6 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn):
elif ct == '*text': elif ct == '*text':
self.is_names.setChecked(c['display'].get('is_names', False)) self.is_names.setChecked(c['display'].get('is_names', False))
all_colors = [unicode(s) for s in list(QColor.colorNames())]
self.enum_colors_label.setToolTip('<p>' + ', '.join(all_colors) + '</p>')
self.composite_contains_html.setToolTip('<p>' + self.composite_contains_html.setToolTip('<p>' +
_('If checked, this column will be displayed as HTML in ' _('If checked, this column will be displayed as HTML in '
'book details and the content server. This can be used to ' 'book details and the content server. This can be used to '