tfix wizard: remove vbox0, improve text - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 1919d5d63c64a06396b08c1fe6c594d616a1feb2
DIR parent 437eff7db992fcf0362c5e2e0d9b0d54ee98eced
HTML Author: ThomasV <thomasv@gitorious>
Date: Sun, 28 Jun 2015 08:52:16 +0200
fix wizard: remove vbox0, improve text
Diffstat:
M gui/qt/installwizard.py | 12 +++++-------
M gui/qt/main_window.py | 4 ++--
2 files changed, 7 insertions(+), 9 deletions(-)
---
DIR diff --git a/gui/qt/installwizard.py b/gui/qt/installwizard.py
t@@ -20,11 +20,10 @@ from amountedit import AmountEdit
from electrum.plugins import always_hook, run_hook
from electrum.mnemonic import prepare_seed
-MSG_ENTER_ANYTHING = _("Please enter a wallet seed, a master public key, a list of Bitcoin addresses, or a list of private keys")
-MSG_SHOW_MPK = _("This is your master public key")
+MSG_ENTER_ANYTHING = _("Please enter a seed phrase, a master key, a list of Bitcoin addresses, or a list of private keys")
+MSG_SHOW_MPK = _("Here is your master public key")
MSG_ENTER_MPK = _("Please enter your master public key")
-MSG_ENTER_COLD_MPK = _("Please enter the master public key of your cosigner wallet")
-MSG_ENTER_SEED_OR_MPK = _("Please enter a wallet seed, BIP32 private key, or master public key")
+MSG_ENTER_SEED_OR_MPK = _("Please enter a seed phrase or a master key (xpub or xprv)")
MSG_VERIFY_SEED = _("Your seed is important!") + "\n" + _("To make sure that you have properly saved your seed, please retype it here.")
t@@ -195,7 +194,8 @@ class InstallWizard(QDialog):
innerVbox.addLayout(vbox0)
entries = []
for i in range(n):
- vbox2, seed_e2 = seed_dialog.enter_seed_box(MSG_ENTER_COLD_MPK, self, 'cold')
+ msg = _("Please enter the master public key of cosigner") + ' %d'%(i+1)
+ vbox2, seed_e2 = seed_dialog.enter_seed_box(msg, self, 'cold')
innerVbox.addLayout(vbox2)
entries.append(seed_e2)
vbox.addStretch(1)
t@@ -224,7 +224,6 @@ class InstallWizard(QDialog):
innerVbox = QVBoxLayout()
w.setLayout(innerVbox)
- vbox0 = seed_dialog.show_seed_box(MSG_SHOW_MPK, xpub_hot, 'hot')
vbox1, seed_e1 = seed_dialog.enter_seed_box(MSG_ENTER_SEED_OR_MPK, self, 'hot')
innerVbox.addLayout(vbox1)
entries = [seed_e1]
t@@ -540,7 +539,6 @@ class InstallWizard(QDialog):
elif re.match('(\d+)of(\d+)', t):
n = int(re.match('(\d+)of(\d+)', t).group(2))
- print t, n
key_list = self.multi_seed_dialog(n - 1)
if not key_list:
return
DIR diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
t@@ -1660,8 +1660,8 @@ class ElectrumWindow(QMainWindow):
self.search_box.hide()
sb.addPermanentWidget(self.search_box)
- if (int(qtVersion[0]) >= 4 and int(qtVersion[2]) >= 7):
- sb.addPermanentWidget( StatusBarButton( QIcon(":icons/switchgui.png"), _("Switch to Lite Mode"), self.go_lite ) )
+ #if (int(qtVersion[0]) >= 4 and int(qtVersion[2]) >= 7):
+ # sb.addPermanentWidget( StatusBarButton( QIcon(":icons/switchgui.png"), _("Switch to Lite Mode"), self.go_lite ) )
self.lock_icon = QIcon()
self.password_button = StatusBarButton( self.lock_icon, _("Password"), self.change_password_dialog )