From 64887f7a744f94bc98effc3575364d0e2da62120 Mon Sep 17 00:00:00 2001
From: Neil Booth <kyuupichan@gmail.com>
Date: Wed, 23 Dec 2015 20:42:30 +0900
Subject: [PATCH] More message box cleanup

---
 plugins/keepkey/qt.py     | 6 +++---
 plugins/ledger/qt.py      | 6 +++---
 plugins/trezor/qt.py      | 6 +++---
 plugins/trustedcoin/qt.py | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/plugins/keepkey/qt.py b/plugins/keepkey/qt.py
index db842b577..07309fa7a 100644
--- a/plugins/keepkey/qt.py
+++ b/plugins/keepkey/qt.py
@@ -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
diff --git a/plugins/ledger/qt.py b/plugins/ledger/qt.py
index d05d22dfd..7ebd0f106 100644
--- a/plugins/ledger/qt.py
+++ b/plugins/ledger/qt.py
@@ -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
 
 
diff --git a/plugins/trezor/qt.py b/plugins/trezor/qt.py
index eb11f0620..bd9217e5a 100644
--- a/plugins/trezor/qt.py
+++ b/plugins/trezor/qt.py
@@ -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
diff --git a/plugins/trustedcoin/qt.py b/plugins/trustedcoin/qt.py
index cb460a246..7d2ba73fc 100644
--- a/plugins/trustedcoin/qt.py
+++ b/plugins/trustedcoin/qt.py
@@ -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('')