BTCPrivate
/
-WIP-electrum-btcp
mirror of https://github.com/BTCPrivate/-WIP-electrum-btcp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/spesmilo/electrum

This commit is contained in:
ThomasV 2016-01-19 15:57:19 +01:00
parent b6c6b694f7 13420f6917
commit 702924a07e
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/trezor/plugin.py
View File

@ -274,9 +274,9 @@ class TrezorCompatiblePlugin(BasePlugin, ThreadJob):
) % self.device ) % self.device
methods = [ methods = [
# Must be short as QT doesn't word-wrap radio button text
_("Let the device generate a completely new seed randomly"), _("Let the device generate a completely new seed randomly"),
_("Recover from an existing %s seed you have previously written " _("Recover from a seed you have previously written down"),
"down" % self.device),
_("Upload a BIP39 mnemonic to generate the seed"), _("Upload a BIP39 mnemonic to generate the seed"),
_("Upload a master private key") _("Upload a master private key")
] ]

31
plugins/trezor/qt_generic.py
View File

@ -481,21 +481,22 @@ class SettingsDialog(WindowModalDialog):
settings_glayout.addWidget(pin_msg, 3, 1, 1, -1) settings_glayout.addWidget(pin_msg, 3, 1, 1, -1)
# Settings tab - Homescreen # Settings tab - Homescreen
homescreen_layout = QHBoxLayout() if plugin.device != 'KeepKey': # Not yet supported by KK firmware
homescreen_label = QLabel(_("Homescreen")) homescreen_layout = QHBoxLayout()
homescreen_change_button = QPushButton(_("Change...")) homescreen_label = QLabel(_("Homescreen"))
homescreen_clear_button = QPushButton(_("Reset")) homescreen_change_button = QPushButton(_("Change..."))
homescreen_change_button.clicked.connect(change_homescreen) homescreen_clear_button = QPushButton(_("Reset"))
homescreen_clear_button.clicked.connect(clear_homescreen) homescreen_change_button.clicked.connect(change_homescreen)
homescreen_msg = QLabel(_("You can set the homescreen on your device " homescreen_clear_button.clicked.connect(clear_homescreen)
"to personalize it. You must choose a " homescreen_msg = QLabel(_("You can set the homescreen on your "
"%d x %d monochrome black and white image.") "device to personalize it. You must "
% (hs_rows, hs_cols)) "choose a %d x %d monochrome black and "
homescreen_msg.setWordWrap(True) "white image.") % (hs_rows, hs_cols))
settings_glayout.addWidget(homescreen_label, 4, 0) homescreen_msg.setWordWrap(True)
settings_glayout.addWidget(homescreen_change_button, 4, 1) settings_glayout.addWidget(homescreen_label, 4, 0)
settings_glayout.addWidget(homescreen_clear_button, 4, 2) settings_glayout.addWidget(homescreen_change_button, 4, 1)
settings_glayout.addWidget(homescreen_msg, 5, 1, 1, -1) settings_glayout.addWidget(homescreen_clear_button, 4, 2)
settings_glayout.addWidget(homescreen_msg, 5, 1, 1, -1)
# Settings tab - Session Timeout # Settings tab - Session Timeout
if wallet: if wallet: