AaronFiore/electrum
1
0
Fork 0
Code Activity

contact/invoice import: better exception handling.

Browse Source 
see #3904
This commit is contained in:
SomberNight
2018-02-14 19:42:35 +01:00
parent 7f04c30567
commit 909c063eb1
5 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gui/qt/contact_list.py
View File

@@ -26,7 +26,7 @@ import webbrowser
from electrum.i18n import _
from electrum.bitcoin import is_address
from electrum.util import block_explorer_URL
from electrum.util import block_explorer_URL, FileImportFailed
from electrum.plugins import run_hook
from PyQt5.QtGui import *
from PyQt5.QtCore import *
@@ -57,7 +57,10 @@ class ContactList(MyTreeWidget):
filename, __ = QFileDialog.getOpenFileName(self.parent, "Select your wallet file", wallet_folder)
if not filename:
return
self.parent.contacts.import_file(filename)
try:
self.parent.contacts.import_file(filename)
except FileImportFailed as e:
self.parent.show_message(str(e))
self.on_update()
def create_menu(self, position):

7
gui/qt/invoice_list.py
View File

@@ -25,7 +25,7 @@
from .util import *
from electrum.i18n import _
from electrum.util import format_time
from electrum.util import format_time, FileImportFailed
class InvoiceList(MyTreeWidget):
@@ -61,7 +61,10 @@ class InvoiceList(MyTreeWidget):
filename, __ = QFileDialog.getOpenFileName(self.parent, "Select your wallet file", wallet_folder)
if not filename:
return
self.parent.invoices.import_file(filename)
try:
self.parent.invoices.import_file(filename)
except FileImportFailed as e:
self.parent.show_message(str(e))
self.on_update()
def create_menu(self, position):