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

Fix re-ordering of columns causing split book splitter state not being restored on restart

Browse Source
This commit is contained in:
Kovid Goyal 2018-02-14 23:38:40 +05:30
parent 7af5f558fe
commit 76351b204a
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/calibre/gui2/pin_columns.py
View File

@ -17,6 +17,7 @@ class PinTableView(QTableView):
self.books_view = books_view self.books_view = books_view
self.verticalHeader().close() self.verticalHeader().close()
self.splitter = None self.splitter = None
self.disable_save_state = False
@property @property
def column_map(self): def column_map(self):
@ -49,6 +50,7 @@ class PinTableView(QTableView):
return old_state return old_state
def apply_state(self, state): def apply_state(self, state):
self.disable_save_state = True # moveSection() can cause save_state() to be called
h = self.column_header h = self.column_header
cmap = {} cmap = {}
hidden = state.get('hidden_columns', []) hidden = state.get('hidden_columns', [])
@ -89,6 +91,7 @@ class PinTableView(QTableView):
if not h.isSectionHidden(i) and h.sectionSize(i) < 3: if not h.isSectionHidden(i) and h.sectionSize(i) < 3:
sz = h.sectionSizeHint(i) sz = h.sectionSizeHint(i)
h.resizeSection(i, sz) h.resizeSection(i, sz)
self.disable_save_state = False
def get_state(self): def get_state(self):
h = self.column_header h = self.column_header
@ -107,7 +110,7 @@ class PinTableView(QTableView):
def save_state(self): def save_state(self):
db = getattr(self.model(), 'db', None) db = getattr(self.model(), 'db', None)
if db is not None: if db is not None and not self.disable_save_state:
state = self.get_state() state = self.get_state()
db.new_api.set_pref('books view split pane state', state) db.new_api.set_pref('books view split pane state', state)
if self.splitter is not None: if self.splitter is not None:
@ -117,10 +120,10 @@ class PinTableView(QTableView):
db = getattr(self.model(), 'db', None) db = getattr(self.model(), 'db', None)
if db is not None: if db is not None:
state = db.prefs.get('books view split pane state', None) state = db.prefs.get('books view split pane state', None)
if state:
self.apply_state(state)
if self.splitter is not None: if self.splitter is not None:
self.splitter.restore_state() self.splitter.restore_state()
if state:
self.apply_state(state)
class PinContainer(QSplitter): class PinContainer(QSplitter):