tcall choose_device when button is clicked - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 997dd17933feb5c5ac2afd2fada7d4af0674f444
DIR parent 71d52d6349cd2a57ded3fb7859cc0c7452c5644c
HTML Author: ThomasV <thomasv@electrum.org>
Date: Tue, 27 Sep 2016 12:11:19 +0200
call choose_device when button is clicked
Diffstat:
M plugins/hw_wallet/qt.py | 15 ++++++++++++++-
M plugins/trezor/qt_generic.py | 12 ------------
2 files changed, 14 insertions(+), 13 deletions(-)
---
DIR diff --git a/plugins/hw_wallet/qt.py b/plugins/hw_wallet/qt.py
t@@ -172,6 +172,7 @@ class QtHandlerBase(QObject, PrintError):
from electrum.plugins import hook
+from electrum.util import UserCancelled
from electrum_gui.qt.main_window import StatusBarButton
class QtPluginBase(object):
t@@ -194,5 +195,17 @@ class QtPluginBase(object):
# Trigger a pairing
keystore.thread.add(partial(self.get_client, keystore))
+ def choose_device(self, window, keystore):
+ '''This dialog box should be usable even if the user has
+ forgotten their PIN or it is in bootloader mode.'''
+ device_id = self.device_manager().xpub_id(keystore.xpub)
+ if not device_id:
+ try:
+ info = self.device_manager().select_device(self, keystore.handler, keystore)
+ except UserCancelled:
+ return
+ device_id = info.device.id_
+ return device_id
+
def show_settings_dialog(self, window, keystore):
- pass
+ device_id = self.choose_device(window, keystore)
DIR diff --git a/plugins/trezor/qt_generic.py b/plugins/trezor/qt_generic.py
t@@ -201,18 +201,6 @@ class QtPlugin(QtPluginBase):
if device_id:
SettingsDialog(window, self, keystore, device_id).exec_()
- def choose_device(self, window, keystore):
- '''This dialog box should be usable even if the user has
- forgotten their PIN or it is in bootloader mode.'''
- device_id = self.device_manager().xpub_id(keystore.xpub)
- if not device_id:
- try:
- info = self.device_manager().select_device(self, keystore.handler, keystore)
- except UserCancelled:
- return
- device_id = info.device.id_
- return device_id
-
def request_trezor_init_settings(self, wizard, method, device):
vbox = QVBoxLayout()
next_enabled = True