From 7685758360a50d5601597560a10ddfe56585ed93 Mon Sep 17 00:00:00 2001 From: Fredrick Brennan Date: Mon, 19 Oct 2015 13:27:15 +0800 Subject: [PATCH] Make it so uncopyable seed only affects wizard Previously it also affected the menu item Wallet->Seed, which is not the expected or desired behavior. --- gui/qt/installwizard.py | 2 +- gui/qt/seed_dialog.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gui/qt/installwizard.py b/gui/qt/installwizard.py index 0118f651d..52ac93f3b 100644 --- a/gui/qt/installwizard.py +++ b/gui/qt/installwizard.py @@ -416,7 +416,7 @@ class InstallWizard(QDialog): return True def show_seed(self, seed, sid): - vbox = seed_dialog.show_seed_box_msg(seed, sid) + vbox = seed_dialog.show_seed_box_msg(seed, sid, paranoid=True) vbox.addLayout(Buttons(CancelButton(self), OkButton(self, _("Next")))) self.set_layout(vbox) return self.exec_() diff --git a/gui/qt/seed_dialog.py b/gui/qt/seed_dialog.py index 41fd68519..d97359edf 100644 --- a/gui/qt/seed_dialog.py +++ b/gui/qt/seed_dialog.py @@ -47,9 +47,9 @@ def icon_filename(sid): return ":icons/seed.png" -def show_seed_box_msg(seedphrase, sid=None): +def show_seed_box_msg(seedphrase, sid=None, paranoid=False): msg = _("Your wallet generation seed is") + ":" - vbox = show_seed_box(msg, seedphrase, sid) + vbox = show_seed_box(msg, seedphrase, sid, paranoid=paranoid) save_msg = _("Please save these %d words on paper (order is important).")%len(seedphrase.split()) + " " msg2 = save_msg + " " \ + _("This seed will allow you to recover your wallet in case of computer failure.") + "
" \ @@ -60,11 +60,11 @@ def show_seed_box_msg(seedphrase, sid=None): vbox.addStretch(1) return vbox -def show_seed_box(msg, seed, sid): - vbox, seed_e = enter_seed_box(msg, None, sid=sid, text=seed) +def show_seed_box(msg, seed, sid, paranoid=False): + vbox, seed_e = enter_seed_box(msg, None, sid=sid, text=seed, paranoid=paranoid) return vbox -def enter_seed_box(msg, window, sid=None, text=None): +def enter_seed_box(msg, window, sid=None, text=None, paranoid=False): vbox = QVBoxLayout() logo = QLabel() logo.setPixmap(QPixmap(icon_filename(sid)).scaledToWidth(56)) @@ -75,7 +75,7 @@ def enter_seed_box(msg, window, sid=None, text=None): seed_e = ScanQRTextEdit() seed_e.setTabChangesFocus(True) else: - seed_e = ShowQRTextEdit(text=text, paranoid=True) + seed_e = ShowQRTextEdit(text=text, paranoid=paranoid) seed_e.setMaximumHeight(130) vbox.addWidget(label) grid = QGridLayout()