AaronFiore/electrum
1
0
Fork 0
Code Activity

qt: don't store python tuple in a qt QVariant.

Browse Source 
This is an educated guess in fixing #10335, Qt can be very picky w.r.t. wrapping types,
and we have additional complexity in the PyQt/SIP layer.

as the address index is only used to facilitate sorting, convert address index tuple
to a sortable string instead.

This assumes uniformity in the length of address indexes.
This commit is contained in:
Sander van Grieken
2025-12-18 10:59:56 +01:00
parent 4cab0ceddd
commit f2e6243e19
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
electrum/gui/qt/address_list.py
View File

@@ -44,6 +44,7 @@ from ..messages import MSG_FREEZE_ADDRESS
if TYPE_CHECKING: if TYPE_CHECKING:
from .main_window import ElectrumWindow from .main_window import ElectrumWindow
from electrum.wallet import AddressIndexGeneric
class AddressUsageStateFilter(IntEnum): class AddressUsageStateFilter(IntEnum):
@@ -219,9 +220,9 @@ class AddressList(MyTreeView):
else: else:
address_item[self.Columns.TYPE].setText(_('receiving')) address_item[self.Columns.TYPE].setText(_('receiving'))
address_item[self.Columns.TYPE].setBackground(ColorScheme.GREEN.as_color(True)) address_item[self.Columns.TYPE].setBackground(ColorScheme.GREEN.as_color(True))
address_item[0].setData(address, self.ROLE_ADDRESS_STR) address_item[self.Columns.TYPE].setData(address, self.ROLE_ADDRESS_STR)
address_path = self.wallet.get_address_index(address) address_path = self.wallet.get_address_index(address)
address_item[self.Columns.TYPE].setData(address_path, self.ROLE_SORT_ORDER) address_item[self.Columns.TYPE].setData(self.address_index_as_sortable_key(address_path), self.ROLE_SORT_ORDER)
address_path_str = self.wallet.get_address_path_str(address) address_path_str = self.wallet.get_address_path_str(address)
if address_path_str is not None: if address_path_str is not None:
address_item[self.Columns.TYPE].setToolTip(address_path_str) address_item[self.Columns.TYPE].setToolTip(address_path_str)
@@ -243,6 +244,9 @@ class AddressList(MyTreeView):
# update counter # update counter
self.num_addr_label.setText(_("{} addresses").format(num_shown)) self.num_addr_label.setText(_("{} addresses").format(num_shown))
def address_index_as_sortable_key(self, address_index: 'AddressIndexGeneric'):
return address_index if isinstance(address_index, str) else ''.join(f'{i:08x}' for i in address_index)
def refresh_row(self, key, row): def refresh_row(self, key, row):
assert row is not None assert row is not None
address = key address = key