From bf942b5259c10e7d0f312a341cef8dfefbb31d9c Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Wed, 27 Jan 2016 21:27:51 +0900 Subject: [PATCH 1/2] Trezor: another place needs client handler set --- lib/plugins.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/plugins.py b/lib/plugins.py index b528668a..9d806b52 100644 --- a/lib/plugins.py +++ b/lib/plugins.py @@ -358,6 +358,9 @@ class DeviceMgr(PrintError): client = self.client_lookup(wallet_id) if client: + # An unpaired client might have another wallet's handler + # from a prior scan. Replace to fix dialog parenting. + client.handler = wallet.handler return client for device in devices: @@ -374,8 +377,7 @@ class DeviceMgr(PrintError): if info: client = self.client_lookup(info.device.id_) if client and not client.features.bootloader_mode: - # An unpaired client might have another wallet's handler - # from a prior scan. Replace to fix dialog parenting. + # See comment above for same code client.handler = wallet.handler # This will trigger a PIN/passphrase entry request client_first_address = client.first_address(derivation) From 9fa8c4de276442190d58c91ad1930094dc3610f3 Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Wed, 27 Jan 2016 22:10:34 +0900 Subject: [PATCH 2/2] Installwizard: not app-modal on MacOSX Making a window with no parent window-modal on Mac makes it application-modal. This is different to behaviour under X, and we don't want that. Use QDialog instead. --- gui/qt/installwizard.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gui/qt/installwizard.py b/gui/qt/installwizard.py index e751233e..c4be82c9 100644 --- a/gui/qt/installwizard.py +++ b/gui/qt/installwizard.py @@ -64,11 +64,11 @@ class CosignWidget(QWidget): # WindowModalDialog must come first as it overrides show_error -class InstallWizard(WindowModalDialog, WizardBase): +class InstallWizard(QDialog, MessageBoxMixin, WizardBase): def __init__(self, config, app, plugins): - title = 'Electrum - ' + _('Install Wizard') - WindowModalDialog.__init__(self, None, title=title) + QDialog.__init__(self, None) + self.setWindowTitle('Electrum - ' + _('Install Wizard')) self.app = app self.config = config # Set for base base class