From 55da7276d3b3a4c7294c3e9fbedf6a57840120d0 Mon Sep 17 00:00:00 2001 From: SomberNight Date: Fri, 17 Mar 2023 15:49:58 +0000 Subject: [PATCH] qt export history/privkeys: put wallet name in path closes https://github.com/spesmilo/electrum/issues/8255 --- electrum/gui/qt/history_list.py | 2 +- electrum/gui/qt/main_window.py | 2 +- electrum/wallet.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/electrum/gui/qt/history_list.py b/electrum/gui/qt/history_list.py index ae0985ced..c274b997f 100644 --- a/electrum/gui/qt/history_list.py +++ b/electrum/gui/qt/history_list.py @@ -826,7 +826,7 @@ class HistoryList(MyTreeView, AcceptFileDragDrop): d = WindowModalDialog(self, _('Export History')) d.setMinimumSize(400, 200) vbox = QVBoxLayout(d) - defaultname = f'electrum-history.csv' + defaultname = f'electrum-history-{self.wallet.basename()}.csv' select_msg = _('Select file to export your wallet transactions to') hbox, filename_e, csv_button = filename_field(self, self.config, defaultname, select_msg) vbox.addLayout(hbox) diff --git a/electrum/gui/qt/main_window.py b/electrum/gui/qt/main_window.py index 42e20a89c..848fa2624 100644 --- a/electrum/gui/qt/main_window.py +++ b/electrum/gui/qt/main_window.py @@ -2251,7 +2251,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger, QtEventListener): e.setReadOnly(True) vbox.addWidget(e) - defaultname = 'electrum-private-keys.csv' + defaultname = f'electrum-private-keys-{self.wallet.basename()}.csv' select_msg = _('Select file to export your private keys to') hbox, filename_e, csv_button = filename_field(self, self.config, defaultname, select_msg) vbox.addLayout(hbox) diff --git a/electrum/wallet.py b/electrum/wallet.py index 441e1e6a7..b0db8b3e4 100644 --- a/electrum/wallet.py +++ b/electrum/wallet.py @@ -548,7 +548,7 @@ class Abstract_Wallet(ABC, Logger, EventListener): return [] def basename(self) -> str: - return self.storage.basename() if self.storage else 'no name' + return self.storage.basename() if self.storage else 'no_name' def test_addresses_sanity(self) -> None: addrs = self.get_receiving_addresses()