Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-07 18:24:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #2017316 [Error when renaming tag in Tags Manager](https://bugs.launchpad.net/calibre/+bug/2017316)

Browse Source
This commit is contained in:
Kovid Goyal 2023-04-22 07:29:21 +05:30
parent 4deb2384c2
commit d5dbb3c63a
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/calibre/gui2/dialogs/tag_list_editor.py
View File

@ -107,6 +107,12 @@ class CountTableWidgetItem(QTableWidgetItem):
return self._count < other._count return self._count < other._count
def was_item(tag=''):
item = QTableWidgetItem()
item.setFlags(item.flags() & ~(Qt.ItemFlag.ItemIsSelectable|Qt.ItemFlag.ItemIsEditable))
item.setData(Qt.ItemDataRole.DisplayRole, tag)
return item
class EditColumnDelegate(QItemDelegate): class EditColumnDelegate(QItemDelegate):
editing_finished = pyqtSignal(int) editing_finished = pyqtSignal(int)
editing_started = pyqtSignal(int) editing_started = pyqtSignal(int)
@ -466,11 +472,8 @@ class TagListEditor(QDialog, Ui_TagListEditor):
item.setFlags(item.flags() & ~(Qt.ItemFlag.ItemIsSelectable|Qt.ItemFlag.ItemIsEditable)) item.setFlags(item.flags() & ~(Qt.ItemFlag.ItemIsSelectable|Qt.ItemFlag.ItemIsEditable))
self.table.setItem(row, 1, item) self.table.setItem(row, 1, item)
item = QTableWidgetItem() was = tag if _id in self.to_rename or _id in self.to_delete else ''
item.setFlags(item.flags() & ~(Qt.ItemFlag.ItemIsSelectable|Qt.ItemFlag.ItemIsEditable)) self.table.setItem(row, 2, was_item(was))
if _id in self.to_rename or _id in self.to_delete:
item.setData(Qt.ItemDataRole.DisplayRole, tag)
self.table.setItem(row, 2, item)
item = QTableWidgetItem() item = QTableWidgetItem()
if self.link_map is None: if self.link_map is None:
@ -591,6 +594,9 @@ class TagListEditor(QDialog, Ui_TagListEditor):
id_ = int(item.data(Qt.ItemDataRole.UserRole)) id_ = int(item.data(Qt.ItemDataRole.UserRole))
self.to_rename[id_] = new_text self.to_rename[id_] = new_text
orig = self.table.item(item.row(), 2) orig = self.table.item(item.row(), 2)
if orig is None:
orig = was_item()
self.table.setItem(item.row(), 2, orig)
item.setText(new_text) item.setText(new_text)
orig.setData(Qt.ItemDataRole.DisplayRole, item.initial_text()) orig.setData(Qt.ItemDataRole.DisplayRole, item.initial_text())
self.table.blockSignals(False) self.table.blockSignals(False)