Browse Source
qt history tab txn drag and drop: fix #5635
dependabot/pip/contrib/deterministic-build/ecdsa-0.13.3
SomberNight
6 years ago
No known key found for this signature in database
GPG Key ID: B33B5F232C6271E9
2 changed files with
6 additions and
3 deletions
-
electrum/gui/qt/history_list.py
-
electrum/gui/qt/main_window.py
|
|
@ -655,9 +655,12 @@ class HistoryList(MyTreeView, AcceptFileDragDrop): |
|
|
|
try: |
|
|
|
with open(fn) as f: |
|
|
|
tx = self.parent.tx_from_text(f.read()) |
|
|
|
self.parent.save_transaction_into_wallet(tx) |
|
|
|
except IOError as e: |
|
|
|
self.parent.show_error(e) |
|
|
|
return |
|
|
|
if not tx: |
|
|
|
return |
|
|
|
self.parent.save_transaction_into_wallet(tx) |
|
|
|
|
|
|
|
def export_history_dialog(self): |
|
|
|
d = WindowModalDialog(self, _('Export History')) |
|
|
|
|
|
@ -2652,7 +2652,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger): |
|
|
|
d = PasswordDialog(parent, msg) |
|
|
|
return d.run() |
|
|
|
|
|
|
|
def tx_from_text(self, txt): |
|
|
|
def tx_from_text(self, txt) -> Optional[Transaction]: |
|
|
|
from electrum.transaction import tx_from_str |
|
|
|
try: |
|
|
|
tx = tx_from_str(txt) |
|
|
@ -2685,7 +2685,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger): |
|
|
|
return |
|
|
|
self.show_transaction(tx) |
|
|
|
|
|
|
|
def read_tx_from_file(self): |
|
|
|
def read_tx_from_file(self) -> Optional[Transaction]: |
|
|
|
fileName = self.getOpenFileName(_("Select your transaction file"), "*.txn") |
|
|
|
if not fileName: |
|
|
|
return |
|
|
|