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

Revert "Fix another error in the manage category editor when setting was"

Browse Source 
This reverts commit 89391da7b7074b42aad7c440e97ac76cfd18175a.
This commit is contained in:
Charles Haley 2023-04-22 12:58:30 +01:00
parent cf520a0884
commit 2aef0e6232
1 changed files with 7 additions and 9 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

@ -593,8 +593,12 @@ class TagListEditor(QDialog, Ui_TagListEditor):
for item in items: for item in items:
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
self.set_was_from_item(item) 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())
self.table.blockSignals(False) self.table.blockSignals(False)
def undo_edit(self): def undo_edit(self):
@ -713,7 +717,8 @@ class TagListEditor(QDialog, Ui_TagListEditor):
self.to_delete.add(id_) self.to_delete.add(id_)
item.set_is_deleted(True) item.set_is_deleted(True)
row = item.row() row = item.row()
self.set_was_from_item(item) orig = self.table.item(row, 2)
orig.setData(Qt.ItemDataRole.DisplayRole, item.initial_text())
link = self.table.item(row, 3) link = self.table.item(row, 3)
link.setFlags(link.flags() & ~(Qt.ItemFlag.ItemIsSelectable|Qt.ItemFlag.ItemIsEditable)) link.setFlags(link.flags() & ~(Qt.ItemFlag.ItemIsSelectable|Qt.ItemFlag.ItemIsEditable))
link.setIcon(QIcon.ic('trash.png')) link.setIcon(QIcon.ic('trash.png'))
@ -723,13 +728,6 @@ class TagListEditor(QDialog, Ui_TagListEditor):
if row >= 0: if row >= 0:
self.table.scrollToItem(self.table.item(row, 0)) self.table.scrollToItem(self.table.item(row, 0))
def set_was_from_item(self, item):
orig = self.table.item(item.row(), 2)
if orig is None:
orig = was_item()
self.table.setItem(item.row(), 2, orig)
orig.setData(Qt.ItemDataRole.DisplayRole, item.initial_text())
def record_sort(self, section): def record_sort(self, section):
# Note what sort was done so we can redo it when the table is rebuilt # Note what sort was done so we can redo it when the table is rebuilt
sort_name = self.sort_names[section] sort_name = self.sort_names[section]