From 5ffd26402e274ded65a8c81d2e13fd594844eb20 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Thu, 11 Jun 2015 09:36:19 +0200 Subject: [PATCH] separate load_wallet hook for installwizard --- gui/qt/installwizard.py | 2 +- plugins/trezor.py | 4 ++++ plugins/trustedcoin.py | 5 +++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gui/qt/installwizard.py b/gui/qt/installwizard.py index 5a02b1f6..30234da8 100644 --- a/gui/qt/installwizard.py +++ b/gui/qt/installwizard.py @@ -347,7 +347,7 @@ class InstallWizard(QDialog): password = None # load wallet in plugins - run_hook('load_wallet', wallet, self) + always_hook('installwizard_load_wallet', wallet, self) while action is not None: util.print_error("installwizard:", wallet, action) diff --git a/plugins/trezor.py b/plugins/trezor.py index 77574cc9..8ed0b0c3 100644 --- a/plugins/trezor.py +++ b/plugins/trezor.py @@ -117,6 +117,10 @@ class Plugin(BasePlugin): QMessageBox.information(self.window, _('Error'), _("Trezor device not detected.\nContinuing in watching-only mode."), _('OK')) self.wallet.force_watching_only = True + @hook + def installwizard_load_wallet(self, wallet, window): + self.load_wallet(wallet, window) + @hook def installwizard_restore(self, wizard, storage): if storage.get('wallet_type') != 'trezor': diff --git a/plugins/trustedcoin.py b/plugins/trustedcoin.py index 810c32af..004ded7f 100644 --- a/plugins/trustedcoin.py +++ b/plugins/trustedcoin.py @@ -333,6 +333,11 @@ class Plugin(BasePlugin): t.setDaemon(True) t.start() + @hook + def installwizard_load_wallet(self, wallet, window): + self.wallet = wallet + self.window = window + @hook def close_wallet(self): self.window.statusBar().removeWidget(self.trustedcoin_button)