More message box cleanup
This commit is contained in:
parent
37a49752eb
commit
64887f7a74
|
@ -1,4 +1,4 @@
|
|||
from PyQt4.Qt import QMessageBox, QVBoxLayout, QLabel, QThread, SIGNAL, QGridLayout, QInputDialog, QPushButton
|
||||
from PyQt4.Qt import QVBoxLayout, QLabel, SIGNAL, QGridLayout, QInputDialog, QPushButton
|
||||
import PyQt4.QtCore as QtCore
|
||||
from electrum_gui.qt.util import *
|
||||
from electrum_gui.qt.main_window import StatusBarButton, ElectrumWindow
|
||||
|
@ -26,11 +26,11 @@ class Plugin(KeepKeyPlugin):
|
|||
try:
|
||||
self.get_client().ping('t')
|
||||
except BaseException as e:
|
||||
QMessageBox.information(window, _('Error'), _("KeepKey device not detected.\nContinuing in watching-only mode." + '\n\nReason:\n' + str(e)), _('OK'))
|
||||
window.show_error(_('KeepKey device not detected.\nContinuing in watching-only mode.\nReason:\n' + str(e)))
|
||||
self.wallet.force_watching_only = True
|
||||
return
|
||||
if self.wallet.addresses() and not self.wallet.check_proper_device():
|
||||
QMessageBox.information(window, _('Error'), _("This wallet does not match your KeepKey device"), _('OK'))
|
||||
window.show_error(_("This wallet does not match your KeepKey device"))
|
||||
self.wallet.force_watching_only = True
|
||||
|
||||
@hook
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
from PyQt4.Qt import QApplication, QMessageBox, QDialog, QInputDialog, QLineEdit, QVBoxLayout, QLabel, QThread, SIGNAL
|
||||
from PyQt4.Qt import QDialog, QInputDialog, QLineEdit, QVBoxLayout, QLabel, SIGNAL
|
||||
import PyQt4.QtCore as QtCore
|
||||
import threading
|
||||
|
||||
|
@ -16,10 +16,10 @@ class Plugin(LedgerPlugin):
|
|||
self.handler = BTChipQTHandler(window)
|
||||
if self.btchip_is_connected():
|
||||
if not self.wallet.check_proper_device():
|
||||
QMessageBox.information(window, _('Error'), _("This wallet does not match your Ledger device"), _('OK'))
|
||||
window.show_error(_("This wallet does not match your Ledger device"))
|
||||
self.wallet.force_watching_only = True
|
||||
else:
|
||||
QMessageBox.information(window, _('Error'), _("Ledger device not detected.\nContinuing in watching-only mode."), _('OK'))
|
||||
window.show_error(_("Ledger device not detected.\nContinuing in watching-only mode."))
|
||||
self.wallet.force_watching_only = True
|
||||
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
from PyQt4.Qt import QMessageBox, QVBoxLayout, QLabel, QThread, SIGNAL, QGridLayout, QInputDialog, QPushButton
|
||||
from PyQt4.Qt import QVBoxLayout, QLabel, SIGNAL, QGridLayout, QInputDialog, QPushButton
|
||||
import PyQt4.QtCore as QtCore
|
||||
from electrum_gui.qt.util import *
|
||||
from electrum_gui.qt.main_window import StatusBarButton, ElectrumWindow
|
||||
|
@ -100,11 +100,11 @@ class Plugin(TrezorPlugin):
|
|||
try:
|
||||
self.get_client().ping('t')
|
||||
except BaseException as e:
|
||||
QMessageBox.information(window, _('Error'), _("Trezor device not detected.\nContinuing in watching-only mode." + '\n\nReason:\n' + str(e)), _('OK'))
|
||||
window.show_error(_('Trezor device not detected.\nContinuing in watching-only mode.\nReason:\n' + str(e)))
|
||||
self.wallet.force_watching_only = True
|
||||
return
|
||||
if self.wallet.addresses() and not self.wallet.check_proper_device():
|
||||
QMessageBox.information(window, _('Error'), _("This wallet does not match your Trezor device"), _('OK'))
|
||||
window.show_error(_("This wallet does not match your Trezor device"))
|
||||
self.wallet.force_watching_only = True
|
||||
|
||||
@hook
|
||||
|
|
|
@ -267,5 +267,5 @@ class Plugin(TrustedCoinPlugin):
|
|||
server.auth(_id, otp)
|
||||
return True
|
||||
except:
|
||||
QMessageBox.information(window, _('Message'), _('Incorrect password'), _('OK'))
|
||||
window.show_message(_('Incorrect password'))
|
||||
pw.setText('')
|
||||
|
|
Loading…
Reference in New Issue