SomberNight
3 years ago
No known key found for this signature in database
GPG Key ID: B33B5F232C6271E9
3 changed files with
7 additions and
6 deletions
-
electrum/gui/qt/main_window.py
-
electrum/keystore.py
-
electrum/plugin.py
|
|
@ -2153,6 +2153,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger): |
|
|
|
def query_choice(self, msg, choices): |
|
|
|
# Needed by QtHandler for hardware wallets |
|
|
|
dialog = WindowModalDialog(self.top_level_window(), title='Question') |
|
|
|
dialog.setMinimumWidth(400) |
|
|
|
clayout = ChoicesLayout(msg, choices) |
|
|
|
vbox = QVBoxLayout(dialog) |
|
|
|
vbox.addLayout(clayout.layout()) |
|
|
|
|
|
@ -797,7 +797,7 @@ class Hardware_KeyStore(Xpub, KeyStore): |
|
|
|
# handler. The handler is per-window and preserved across |
|
|
|
# device reconnects |
|
|
|
self.xpub = d.get('xpub') |
|
|
|
self.label = d.get('label') |
|
|
|
self.label = d.get('label') # type: Optional[str] |
|
|
|
self.soft_device_id = d.get('soft_device_id') # type: Optional[str] |
|
|
|
self.handler = None # type: Optional[HardwareHandlerBase] |
|
|
|
run_hook('init_keystore', self) |
|
|
|
|
|
@ -671,12 +671,12 @@ class DeviceMgr(ThreadJob): |
|
|
|
if not allow_user_interaction: |
|
|
|
raise CannotAutoSelectDevice() |
|
|
|
# ask user to select device manually |
|
|
|
msg = "" |
|
|
|
if keystore.label and keystore.label not in PLACEHOLDER_HW_CLIENT_LABELS: |
|
|
|
msg += _( |
|
|
|
"""Could not automatically pair with device """ |
|
|
|
"""for keystore labelled "{}".\n""").format(keystore.label) |
|
|
|
msg = ( |
|
|
|
_("Could not automatically pair with device for given keystore.") + "\n" |
|
|
|
+ f"(keystore label: {keystore.label!r}, " |
|
|
|
+ f"bip32 root fingerprint: {keystore.get_root_fingerprint()!r})\n\n") |
|
|
|
msg += _("Please select which {} device to use:").format(plugin.device) |
|
|
|
msg += "\n(" + _("Or click cancel to skip this keystore instead.") + ")" |
|
|
|
descriptions = ["{label} ({maybe_model}{init}, {transport})" |
|
|
|
.format(label=info.label or _("An unnamed {}").format(info.plugin_name), |
|
|
|
init=(_("initialized") if info.initialized else _("wiped")), |
|
|
|