Merge branch 'master' of git://github.com/spesmilo/electrum
This commit is contained in:
commit
702924a07e
|
@ -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")
|
||||
]
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Reference in New Issue