cis-kuldeep/PyBitmessage-2021-04-27
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix previous commit (UI deleting optimisation)

Browse Source
This commit is contained in:
Peter Šurda 2018-01-28 09:16:37 +01:00
parent 0f61ed9f19
commit ff92cc30c8
Signed by untrusted user: PeterSurda
GPG Key ID: 0C5F50C0B5F37D87
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/bitmessageqt/__init__.py
View File

@ -2990,14 +2990,15 @@ class MyForm(settingsmixin.SMainWindow):
shifted = QtGui.QApplication.queryKeyboardModifiers() & QtCore.Qt.ShiftModifier shifted = QtGui.QApplication.queryKeyboardModifiers() & QtCore.Qt.ShiftModifier
tableWidget.setUpdatesEnabled(False); tableWidget.setUpdatesEnabled(False);
inventoryHashesToTrash = [] inventoryHashesToTrash = []
for row in tableWidget.selectedIndexes(): # ranges in reversed order
currentRow = row.row() for r in sorted(tableWidget.selectedRanges(), key=lambda r: r.topRow())[::-1]:
for i in range(r.bottomRow()-r.topRow()+1):
inventoryHashToTrash = str(tableWidget.item( inventoryHashToTrash = str(tableWidget.item(
currentRow, 3).data(QtCore.Qt.UserRole).toPyObject()) r.topRow()+i, 3).data(QtCore.Qt.UserRole).toPyObject())
if inventoryHashToTrash in inventoryHashesToTrash: if inventoryHashToTrash in inventoryHashesToTrash:
continue continue
inventoryHashesToTrash.append(inventoryHashToTrash) inventoryHashesToTrash.append(inventoryHashToTrash)
tableWidget.removeRow(currentRow) tableWidget.model().removeRows(r.topRow(), r.bottomRow()-r.topRow()+1)
idCount = len(inventoryHashesToTrash) idCount = len(inventoryHashesToTrash)
if folder == "trash" or shifted: if folder == "trash" or shifted:
sqlExecuteChunked('''DELETE FROM inbox WHERE msgid IN ({0})''', sqlExecuteChunked('''DELETE FROM inbox WHERE msgid IN ({0})''',
@ -3019,14 +3020,15 @@ class MyForm(settingsmixin.SMainWindow):
currentRow = 0 currentRow = 0
tableWidget.setUpdatesEnabled(False) tableWidget.setUpdatesEnabled(False)
inventoryHashesToTrash = [] inventoryHashesToTrash = []
for row in tableWidget.selectedIndexes(): # ranges in reversed order
currentRow = row.row() for r in sorted(tableWidget.selectedRanges(), key=lambda r: r.topRow())[::-1]:
for i in range(r.bottomRow()-r.topRow()+1):
inventoryHashToTrash = str(tableWidget.item( inventoryHashToTrash = str(tableWidget.item(
currentRow, 3).data(QtCore.Qt.UserRole).toPyObject()) r.topRow()+i, 3).data(QtCore.Qt.UserRole).toPyObject())
if inventoryHashToTrash in inventoryHashesToTrash: if inventoryHashToTrash in inventoryHashesToTrash:
continue continue
inventoryHashesToTrash.append(inventoryHashToTrash) inventoryHashesToTrash.append(inventoryHashToTrash)
tableWidget.removeRow(currentRow) tableWidget.model().removeRows(r.topRow(), r.bottomRow()-r.topRow()+1)
if currentRow == 0: if currentRow == 0:
tableWidget.selectRow(currentRow) tableWidget.selectRow(currentRow)
else: else: