AaronFiore/electrum
1
0
Fork 0
Code Activity

hw_wallet: show_error can now block optionally. trezor: use prev during recovery.

Browse Source
This commit is contained in:
SomberNight
2018-05-01 15:05:58 +02:00
parent ae24af9bc2
commit 66cfc3ea37
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/hw_wallet/cmdline.py
View File

@@ -32,7 +32,7 @@ class CmdLineHandler:
def show_message(self, msg, on_cancel=None):
print_msg(msg)
def show_error(self, msg):
def show_error(self, msg, blocking=False):
print_msg(msg)
def update_status(self, b):

12
plugins/hw_wallet/qt.py
View File

@@ -41,7 +41,7 @@ class QtHandlerBase(QObject, PrintError):
passphrase_signal = pyqtSignal(object, object)
message_signal = pyqtSignal(object, object)
error_signal = pyqtSignal(object)
error_signal = pyqtSignal(object, object)
word_signal = pyqtSignal(object)
clear_signal = pyqtSignal()
query_signal = pyqtSignal(object, object)
@@ -90,8 +90,10 @@ class QtHandlerBase(QObject, PrintError):
def show_message(self, msg, on_cancel=None):
self.message_signal.emit(msg, on_cancel)
def show_error(self, msg):
self.error_signal.emit(msg)
def show_error(self, msg, blocking=False):
self.done.clear()
self.error_signal.emit(msg, blocking)
self.done.wait()
def finished(self):
self.clear_signal.emit()
@@ -154,8 +156,10 @@ class QtHandlerBase(QObject, PrintError):
vbox.addLayout(Buttons(CancelButton(dialog)))
dialog.show()
def error_dialog(self, msg):
def error_dialog(self, msg, blocking):
self.win.show_error(msg, parent=self.top_level_window())
if blocking:
self.done.set()
def clear_dialog(self):
if self.dialog: