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 2022-03-20 09:49:55 +05:30
commit 20ce4011ea
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/calibre/gui2/library/views.py
View File

@ -304,6 +304,7 @@ class BooksView(QTableView): # {{{
# {{{ Column Header setup # {{{ Column Header setup
self.can_add_columns = True self.can_add_columns = True
self.was_restored = False self.was_restored = False
self.allow_save_state = True
self.column_header = HeaderView(Qt.Orientation.Horizontal, self) self.column_header = HeaderView(Qt.Orientation.Horizontal, self)
self.pin_view.column_header = HeaderView(Qt.Orientation.Horizontal, self.pin_view) self.pin_view.column_header = HeaderView(Qt.Orientation.Horizontal, self.pin_view)
self.setHorizontalHeader(self.column_header) self.setHorizontalHeader(self.column_header)
@ -692,7 +693,7 @@ class BooksView(QTableView): # {{{
def save_state(self): def save_state(self):
# Only save if we have been initialized (set_database called) # Only save if we have been initialized (set_database called)
if len(self.column_map) > 0 and self.was_restored: if len(self.column_map) > 0 and self.was_restored and self.allow_save_state:
state = self.get_state() state = self.get_state()
self.write_state(state) self.write_state(state)
if self.is_library_view: if self.is_library_view:
@ -742,7 +743,10 @@ class BooksView(QTableView): # {{{
if col in cmap: if col in cmap:
pmap[pos] = col pmap[pos] = col
need_save_state = False need_save_state = False
self.column_header.blockSignals(True) # Resetting column positions triggers a save state. There can be a lot
# of these. Batch them up and do it at the end.
# Can't use blockSignals() because that prevents needed processing somewhere
self.allow_save_state = False
for pos in sorted(pmap.keys()): for pos in sorted(pmap.keys()):
col = pmap[pos] col = pmap[pos]
idx = cmap[col] idx = cmap[col]
@ -750,7 +754,7 @@ class BooksView(QTableView): # {{{
if current_pos != pos: if current_pos != pos:
need_save_state = True need_save_state = True
h.moveSection(current_pos, pos) h.moveSection(current_pos, pos)
self.column_header.blockSignals(False) self.allow_save_state = True
if need_save_state and save_state: if need_save_state and save_state:
self.save_state() self.save_state()
# Because of a bug in Qt 5 we have to ensure that the header is actually # Because of a bug in Qt 5 we have to ensure that the header is actually