AaronFiore/electrum
1
0
Fork 0
Code Activity

qt history tab txn drag and drop: fix #5635

Browse Source
This commit is contained in:
SomberNight
2019-09-13 14:12:40 +02:00
parent 1ecbafb920
commit 1f305bba39
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
electrum/gui/qt/history_list.py
View File

@@ -655,9 +655,12 @@ class HistoryList(MyTreeView, AcceptFileDragDrop):
try: try:
with open(fn) as f: with open(fn) as f:
tx = self.parent.tx_from_text(f.read()) tx = self.parent.tx_from_text(f.read())
self.parent.save_transaction_into_wallet(tx)
except IOError as e: except IOError as e:
self.parent.show_error(e) self.parent.show_error(e)
return
if not tx:
return
self.parent.save_transaction_into_wallet(tx)
def export_history_dialog(self): def export_history_dialog(self):
d = WindowModalDialog(self, _('Export History')) d = WindowModalDialog(self, _('Export History'))

4
electrum/gui/qt/main_window.py
View File

@@ -2652,7 +2652,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
d = PasswordDialog(parent, msg) d = PasswordDialog(parent, msg)
return d.run() return d.run()
def tx_from_text(self, txt): def tx_from_text(self, txt) -> Optional[Transaction]:
from electrum.transaction import tx_from_str from electrum.transaction import tx_from_str
try: try:
tx = tx_from_str(txt) tx = tx_from_str(txt)
@@ -2685,7 +2685,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
return return
self.show_transaction(tx) 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") fileName = self.getOpenFileName(_("Select your transaction file"), "*.txn")
if not fileName: if not fileName:
return return