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 2016-04-04 06:44:39 +05:30
commit fb9b1c2885
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/calibre/gui2/preferences/columns.py
View File

@ -109,12 +109,12 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
self.opt_columns.resizeColumnsToContents() self.opt_columns.resizeColumnsToContents()
self.opt_columns.resizeRowsToContents() self.opt_columns.resizeRowsToContents()
def setup_row(self, field_metadata, row, col): def setup_row(self, field_metadata, row, col, oldkey=None):
item = QTableWidgetItem(col) item = QTableWidgetItem(col)
self.opt_columns.setItem(row, 1, item) self.opt_columns.setItem(row, 1, item)
if col.startswith('#'): if col.startswith('#'):
fm = self.custcols[col] fm = self.custcols[oldkey if oldkey is not None else col]
else: else:
fm = field_metadata[col] fm = field_metadata[col]
@ -127,7 +127,9 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
if fm['is_multiple']: if fm['is_multiple']:
dt = '*' + dt dt = '*' + dt
coltype = self.column_desc[dt] coltype = self.column_desc[dt]
item = QTableWidgetItem(coltype) coltype_info = (coltype if oldkey is None else
' ' + _('(lookup name was {0}) {1}'.format(oldkey, coltype)))
item = QTableWidgetItem(coltype_info)
self.opt_columns.setItem(row, 2, item) self.opt_columns.setItem(row, 2, item)
desc = fm['display'].get('description', "") desc = fm['display'].get('description', "")
@ -210,7 +212,8 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
CreateCustomColumn(self, row, key, model.orig_headers, ALL_COLUMNS) CreateCustomColumn(self, row, key, model.orig_headers, ALL_COLUMNS)
if self.cc_column_key is None: if self.cc_column_key is None:
return return
self.setup_row(self.field_metadata, row, self.cc_column_key) self.setup_row(self.field_metadata, row, self.cc_column_key,
None if self.cc_column_key == key else key)
self.changed_signal.emit() self.changed_signal.emit()
def apply_custom_column_changes(self): def apply_custom_column_changes(self):