This commit is contained in:
Kovid Goyal 2017-07-03 19:40:01 +05:30
parent 5d967e3ba6
commit 8f640edc1e
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 8 additions and 9 deletions

View File

@ -45,6 +45,7 @@ class TableItem(QTableWidgetItem):
return self.sort_idx < other.sort_idx
return 0
IN_WIDGET_ITEMS = 0
IN_WIDGET_BOOKS = 1
IN_WIDGET_LOCK = 2
@ -322,7 +323,6 @@ class Quickview(QDialog, Ui_Quickview):
if self.last_search is not None:
self.gui.search.set_search_string(self.last_search)
def book_was_changed(self, mi):
'''
Called when book information is changed in the library view. Make that
@ -580,6 +580,7 @@ class Quickview(QDialog, Ui_Quickview):
self._close()
QDialog.reject(self)
def get_qv_field_list(fm, use_defaults=False):
from calibre.gui2.ui import get_gui
db = get_gui().current_db
@ -590,9 +591,7 @@ def get_qv_field_list(fm, use_defaults=False):
fieldlist = list(src['qv_display_fields'])
names = frozenset([x[0] for x in fieldlist])
for field in fm.displayable_field_keys():
if (field != 'comments'
and fm[field]['datatype'] != 'comments'
and field not in names):
if (field != 'comments' and fm[field]['datatype'] != 'comments' and field not in names):
fieldlist.append((field, False))
available = frozenset(fm.displayable_field_keys())
return [(f, d) for f, d in fieldlist if f in available]

View File

@ -211,6 +211,7 @@ class IdLinksEditor(Dialog):
self.table.removeRow(r)
# }}}
class DisplayedFields(QAbstractListModel): # {{{
def __init__(self, db, parent=None):
@ -388,7 +389,6 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
r('qv_retkey_changes_column', gprefs)
r('qv_show_on_startup', gprefs)
r('cover_flow_queue_length', config, restart_required=True)
r('cover_browser_reflections', gprefs)
r('cover_browser_title_template', db.prefs)
@ -644,7 +644,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
self.changed_signal.emit()
self.update_font_display()
self.display_model.restore_defaults()
self.qv_display_model.restore_defaults();
self.qv_display_model.restore_defaults()
self.edit_rules.clear()
self.icon_rules.clear()
self.grid_rules.clear()