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

QHeaderView.restoreState() leads to a broken table view when restoring data from different Qt major versions

Browse Source
This commit is contained in:
Kovid Goyal 2014-04-26 09:34:21 +05:30
parent 7dea39ec30
commit 7e9d8e1c5d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/calibre/gui2/tweak_book/spell.py
View File

@ -16,7 +16,8 @@ from PyQt5.Qt import (
QStackedLayout, QLabel, QVBoxLayout, QWidget, QPushButton, QIcon, QMenu, QStackedLayout, QLabel, QVBoxLayout, QWidget, QPushButton, QIcon, QMenu,
QDialogButtonBox, QLineEdit, QDialog, QToolButton, QFormLayout, QHBoxLayout, QDialogButtonBox, QLineEdit, QDialog, QToolButton, QFormLayout, QHBoxLayout,
pyqtSignal, QAbstractTableModel, QModelIndex, QTimer, QTableView, QCheckBox, pyqtSignal, QAbstractTableModel, QModelIndex, QTimer, QTableView, QCheckBox,
QComboBox, QListWidget, QListWidgetItem, QInputDialog, QPlainTextEdit, QKeySequence) QComboBox, QListWidget, QListWidgetItem, QInputDialog, QPlainTextEdit, QKeySequence,
QT_VERSION_STR)
from calibre.constants import __appname__, plugins from calibre.constants import __appname__, plugins
from calibre.ebooks.oeb.polish.spell import replace_word, get_all_words, merge_locations, get_checkable_file_names from calibre.ebooks.oeb.polish.spell import replace_word, get_all_words, merge_locations, get_checkable_file_names
@ -879,6 +880,7 @@ class SpellCheck(Dialog):
self.setAttribute(Qt.WA_DeleteOnClose, False) self.setAttribute(Qt.WA_DeleteOnClose, False)
def setup_ui(self): def setup_ui(self):
self.state_name = 'spell-check-table-state-' + QT_VERSION_STR.partition('.')[0]
set_no_activate_on_click = plugins['progress_indicator'][0].set_no_activate_on_click set_no_activate_on_click = plugins['progress_indicator'][0].set_no_activate_on_click
self.setWindowIcon(QIcon(I('spell-check.png'))) self.setWindowIcon(QIcon(I('spell-check.png')))
self.l = l = QVBoxLayout(self) self.l = l = QVBoxLayout(self)
@ -925,7 +927,7 @@ class SpellCheck(Dialog):
w.activated.connect(self.word_activated) w.activated.connect(self.word_activated)
w.change_to.connect(self.change_to) w.change_to.connect(self.change_to)
w.currentChanged = self.current_word_changed w.currentChanged = self.current_word_changed
state = tprefs.get('spell-check-table-state', None) state = tprefs.get(self.state_name, None)
hh = self.words_view.horizontalHeader() hh = self.words_view.horizontalHeader()
h.addWidget(w) h.addWidget(w)
self.words_model = m = WordsModel(self) self.words_model = m = WordsModel(self)
@ -1230,11 +1232,11 @@ class SpellCheck(Dialog):
QTimer.singleShot(0, self.refresh) QTimer.singleShot(0, self.refresh)
def accept(self): def accept(self):
tprefs['spell-check-table-state'] = bytearray(self.words_view.horizontalHeader().saveState()) tprefs[self.state_name] = bytearray(self.words_view.horizontalHeader().saveState())
Dialog.accept(self) Dialog.accept(self)
def reject(self): def reject(self):
tprefs['spell-check-table-state'] = bytearray(self.words_view.horizontalHeader().saveState()) tprefs[self.state_name] = bytearray(self.words_view.horizontalHeader().saveState())
Dialog.reject(self) Dialog.reject(self)
@classmethod @classmethod