AaronFiore/electrum
1
0
Fork 0
Code Activity

qt: SwapServerDialog: explicit columns

Browse Source
This commit is contained in:
SomberNight
2025-06-23 14:49:36 +00:00
parent 0c0a8b7c82
commit 6f5041443f
1 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
electrum/gui/qt/swap_dialog.py
View File

@@ -1,3 +1,4 @@
import enum
from typing import TYPE_CHECKING, Optional, Union, Tuple, Sequence from typing import TYPE_CHECKING, Optional, Union, Tuple, Sequence
from PyQt6.QtCore import pyqtSignal, Qt from PyQt6.QtCore import pyqtSignal, Qt
@@ -19,7 +20,7 @@ from .util import (WindowModalDialog, Buttons, OkButton, CancelButton,
from .util import qt_event_listener, QtEventListener from .util import qt_event_listener, QtEventListener
from .amountedit import BTCAmountEdit from .amountedit import BTCAmountEdit
from .fee_slider import FeeSlider, FeeComboBox from .fee_slider import FeeSlider, FeeComboBox
from .my_treeview import create_toolbar_with_menu from .my_treeview import create_toolbar_with_menu, MyTreeView
if TYPE_CHECKING: if TYPE_CHECKING:
from .main_window import ElectrumWindow from .main_window import ElectrumWindow
@@ -424,7 +425,22 @@ class SwapDialog(WindowModalDialog, QtEventListener):
class SwapServerDialog(WindowModalDialog, QtEventListener): class SwapServerDialog(WindowModalDialog, QtEventListener):
def __init__(self, window, servers): class Columns(MyTreeView.BaseColumnsEnum):
PUBKEY = enum.auto()
FEE = enum.auto()
MAX_FORWARD = enum.auto()
MAX_REVERSE = enum.auto()
LAST_SEEN = enum.auto()
headers = {
Columns.PUBKEY: _("Pubkey"),
Columns.FEE: _("Fee"),
Columns.MAX_FORWARD: _('Max Forward'),
Columns.MAX_REVERSE: _('Max Reverse'),
Columns.LAST_SEEN: _("Last seen"),
}
def __init__(self, window: 'ElectrumWindow', servers: Sequence['SwapOffer']):
WindowModalDialog.__init__(self, window, _('Choose Swap Provider')) WindowModalDialog.__init__(self, window, _('Choose Swap Provider'))
self.window = window self.window = window
self.config = window.config self.config = window.config
@@ -433,11 +449,11 @@ class SwapServerDialog(WindowModalDialog, QtEventListener):
_("Note that fees and liquidity may be updated frequently.") _("Note that fees and liquidity may be updated frequently.")
]) ])
self.servers_list = QTreeWidget() self.servers_list = QTreeWidget()
self.servers_list.setColumnCount(5) col_names = [self.headers[col_idx] for col_idx in sorted(self.headers.keys())]
self.servers_list.setHeaderLabels([_("Pubkey"), _("Fee"), _('Max Forward'), _('Max Reverse'), _("Last seen")]) self.servers_list.setHeaderLabels(col_names)
self.servers_list.header().setStretchLastSection(False) self.servers_list.header().setStretchLastSection(False)
for col_idx in range(5): for col_idx in range(len(self.Columns)):
sm = QHeaderView.ResizeMode.Stretch if col_idx == 0 else QHeaderView.ResizeMode.ResizeToContents sm = QHeaderView.ResizeMode.Stretch if col_idx == self.Columns.PUBKEY else QHeaderView.ResizeMode.ResizeToContents
self.servers_list.header().setSectionResizeMode(col_idx, sm) self.servers_list.header().setSectionResizeMode(col_idx, sm)
self.update_servers_list(servers) self.update_servers_list(servers)
vbox = QVBoxLayout() vbox = QVBoxLayout()
@@ -453,7 +469,7 @@ class SwapServerDialog(WindowModalDialog, QtEventListener):
if self.exec() != 1: if self.exec() != 1:
return None return None
if item := self.servers_list.currentItem(): if item := self.servers_list.currentItem():
return item.data(0, ROLE_NPUB) return item.data(self.Columns.PUBKEY, ROLE_NPUB)
return None return None
def update_servers_list(self, servers: Sequence['SwapOffer']): def update_servers_list(self, servers: Sequence['SwapOffer']):
@@ -461,13 +477,15 @@ class SwapServerDialog(WindowModalDialog, QtEventListener):
from electrum.util import age from electrum.util import age
items = [] items = []
for x in servers: for x in servers:
last_seen = age(x.timestamp) labels = [""] * len(self.Columns)
fee = f"{x.pairs.percentage}% + {x.pairs.mining_fee} sats" labels[self.Columns.PUBKEY] = x.server_pubkey
max_forward = self.window.format_amount(x.pairs.max_forward) + ' ' + self.window.base_unit() labels[self.Columns.FEE] = f"{x.pairs.percentage}% + {x.pairs.mining_fee} sats"
max_reverse = self.window.format_amount(x.pairs.max_reverse) + ' ' + self.window.base_unit() labels[self.Columns.MAX_FORWARD] = self.window.format_amount(x.pairs.max_forward) + ' ' + self.window.base_unit()
item = QTreeWidgetItem([x.server_pubkey, fee, max_forward, max_reverse, last_seen]) labels[self.Columns.MAX_REVERSE] = self.window.format_amount(x.pairs.max_reverse) + ' ' + self.window.base_unit()
item.setData(0, ROLE_NPUB, x.server_npub) labels[self.Columns.LAST_SEEN] = age(x.timestamp)
item.setIcon(0, self._pubkey_to_q_icon(x.server_pubkey)) item = QTreeWidgetItem(labels)
item.setData(self.Columns.PUBKEY, ROLE_NPUB, x.server_npub)
item.setIcon(self.Columns.PUBKEY, self._pubkey_to_q_icon(x.server_pubkey))
items.append(item) items.append(item)
self.servers_list.insertTopLevelItems(0, items) self.servers_list.insertTopLevelItems(0, items)