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-09-19 14:53:32 +05:30
commit f0a347b1b5
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,8 +93,12 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
self.restore_geometry() self.restore_geometry()
self.opt_columns.cellDoubleClicked.connect(self.row_double_clicked)
self.opt_columns.blockSignals(False) self.opt_columns.blockSignals(False)
def row_double_clicked(self, r, c):
self.edit_custcol()
def restore_geometry(self): def restore_geometry(self):
geom = gprefs.get('custcol-prefs-table-geometry', None) geom = gprefs.get('custcol-prefs-table-geometry', None)
if geom is not None and len(geom) == self.opt_columns.columnCount(): if geom is not None and len(geom) == self.opt_columns.columnCount():
@ -111,7 +115,10 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
self.opt_columns.resizeRowsToContents() self.opt_columns.resizeRowsToContents()
def setup_row(self, field_metadata, row, col, oldkey=None): def setup_row(self, field_metadata, row, col, oldkey=None):
flags = Qt.ItemIsEnabled | Qt.ItemIsSelectable
item = QTableWidgetItem(col) item = QTableWidgetItem(col)
item.setFlags(flags)
self.opt_columns.setItem(row, 1, item) self.opt_columns.setItem(row, 1, item)
if col.startswith('#'): if col.startswith('#'):
@ -134,20 +141,23 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
coltype = self.column_desc[dt] coltype = self.column_desc[dt]
coltype_info = (coltype if oldkey is None else coltype_info = (coltype if oldkey is None else
' ' + _('(lookup name was {0}) {1}'.format(oldkey, coltype))) ' ' + _('(lookup name was {0}) {1}'.format(oldkey, coltype)))
item = QTableWidgetItem(coltype_info) item = QTableWidgetItem(coltype_info)
item.setFlags(flags)
self.opt_columns.setItem(row, 2, item) self.opt_columns.setItem(row, 2, item)
desc = fm['display'].get('description', "") desc = fm['display'].get('description', "")
item = QTableWidgetItem(desc) item = QTableWidgetItem(desc)
item.setFlags(flags)
self.opt_columns.setItem(row, 3, item) self.opt_columns.setItem(row, 3, item)
item = QTableWidgetItem(fm['name']) item = QTableWidgetItem(fm['name'])
item.setData(Qt.UserRole, (col)) item.setData(Qt.UserRole, (col))
item.setFlags(flags)
self.opt_columns.setItem(row, 0, item) self.opt_columns.setItem(row, 0, item)
if col.startswith('#'): if col.startswith('#'):
item.setData(Qt.DecorationRole, (QIcon(I('column.png')))) item.setData(Qt.DecorationRole, (QIcon(I('column.png'))))
flags = Qt.ItemIsEnabled|Qt.ItemIsSelectable
if col != 'ondevice': if col != 'ondevice':
flags |= Qt.ItemIsUserCheckable flags |= Qt.ItemIsUserCheckable
item.setFlags(flags) item.setFlags(flags)

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

@ -135,6 +135,7 @@ class CreateCustomColumn(QDialog):
c = parent.custcols[col] c = parent.custcols[col]
self.column_name_box.setText(c['label']) self.column_name_box.setText(c['label'])
self.column_heading_box.setText(c['name']) self.column_heading_box.setText(c['name'])
self.column_heading_box.setFocus()
ct = c['datatype'] ct = c['datatype']
if c['is_multiple']: if c['is_multiple']:
ct = '*' + ct ct = '*' + ct