tMerge branch 'master' of git://github.com/spesmilo/electrum - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 702924a07efe142fac5cbfe443dcf549b72f2cf3
DIR parent b6c6b694f7e26e73cf3d9a16277e76b2f8bc8d1e
HTML Author: ThomasV <thomasv@electrum.org>
Date: Tue, 19 Jan 2016 15:57:19 +0100
Merge branch 'master' of git://github.com/spesmilo/electrum
Diffstat:
M plugins/trezor/plugin.py | 4 ++--
M plugins/trezor/qt_generic.py | 31 ++++++++++++++++---------------
2 files changed, 18 insertions(+), 17 deletions(-)
---
DIR diff --git a/plugins/trezor/plugin.py b/plugins/trezor/plugin.py
t@@ -274,9 +274,9 @@ class TrezorCompatiblePlugin(BasePlugin, ThreadJob):
) % self.device
methods = [
+ # Must be short as QT doesn't word-wrap radio button text
_("Let the device generate a completely new seed randomly"),
- _("Recover from an existing %s seed you have previously written "
- "down" % self.device),
+ _("Recover from a seed you have previously written down"),
_("Upload a BIP39 mnemonic to generate the seed"),
_("Upload a master private key")
]
DIR diff --git a/plugins/trezor/qt_generic.py b/plugins/trezor/qt_generic.py
t@@ -481,21 +481,22 @@ class SettingsDialog(WindowModalDialog):
settings_glayout.addWidget(pin_msg, 3, 1, 1, -1)
# Settings tab - Homescreen
- homescreen_layout = QHBoxLayout()
- homescreen_label = QLabel(_("Homescreen"))
- homescreen_change_button = QPushButton(_("Change..."))
- homescreen_clear_button = QPushButton(_("Reset"))
- homescreen_change_button.clicked.connect(change_homescreen)
- homescreen_clear_button.clicked.connect(clear_homescreen)
- homescreen_msg = QLabel(_("You can set the homescreen on your device "
- "to personalize it. You must choose a "
- "%d x %d monochrome black and white image.")
- % (hs_rows, hs_cols))
- homescreen_msg.setWordWrap(True)
- settings_glayout.addWidget(homescreen_label, 4, 0)
- settings_glayout.addWidget(homescreen_change_button, 4, 1)
- settings_glayout.addWidget(homescreen_clear_button, 4, 2)
- settings_glayout.addWidget(homescreen_msg, 5, 1, 1, -1)
+ if plugin.device != 'KeepKey': # Not yet supported by KK firmware
+ homescreen_layout = QHBoxLayout()
+ homescreen_label = QLabel(_("Homescreen"))
+ homescreen_change_button = QPushButton(_("Change..."))
+ homescreen_clear_button = QPushButton(_("Reset"))
+ homescreen_change_button.clicked.connect(change_homescreen)
+ homescreen_clear_button.clicked.connect(clear_homescreen)
+ homescreen_msg = QLabel(_("You can set the homescreen on your "
+ "device to personalize it. You must "
+ "choose a %d x %d monochrome black and "
+ "white image.") % (hs_rows, hs_cols))
+ homescreen_msg.setWordWrap(True)
+ settings_glayout.addWidget(homescreen_label, 4, 0)
+ settings_glayout.addWidget(homescreen_change_button, 4, 1)
+ settings_glayout.addWidget(homescreen_clear_button, 4, 2)
+ settings_glayout.addWidget(homescreen_msg, 5, 1, 1, -1)
# Settings tab - Session Timeout
if wallet: