From d7b947e30f02c1d9d080a70d5e345d7a27c13e00 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Thu, 4 Sep 2014 19:13:43 +0200 Subject: [PATCH] revert previous commit, and fix utf8 qr code --- gui/qt/qrtextedit.py | 6 +++++- gui/qt/seed_dialog.py | 4 ---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gui/qt/qrtextedit.py b/gui/qt/qrtextedit.py index 98a23a71..6f4720ab 100644 --- a/gui/qt/qrtextedit.py +++ b/gui/qt/qrtextedit.py @@ -31,7 +31,11 @@ class QRTextEdit(QPlainTextEdit): def qr_show(self): from qrcodewidget import QRDialog - QRDialog(str(self.toPlainText())).exec_() + try: + s = unicode(self.toPlainText()) + except: + s = str(self.toPlainText()) + QRDialog(s).exec_() def qr_input(self): from electrum import qrscanner diff --git a/gui/qt/seed_dialog.py b/gui/qt/seed_dialog.py index 57603238..b99ae59d 100644 --- a/gui/qt/seed_dialog.py +++ b/gui/qt/seed_dialog.py @@ -72,8 +72,6 @@ def show_seed_box(seed, sid=None): + _("If you ever need to recover your wallet from seed, you will need both this seed and your cold seed.") + " " \ label1 = QLabel(msg+ ":") - from itertools import izip_longest - seed = '\n'.join(map(lambda x: ' '.join(x), izip_longest(*(iter(seed.split()),) * 5, fillvalue=''))) seed_text = QRTextEdit(seed) seed_text.setReadOnly(True) seed_text.setMaximumHeight(130) @@ -90,8 +88,6 @@ def show_seed_box(seed, sid=None): grid.addWidget(logo, 0, 0) grid.addWidget(label1, 0, 1) grid.addWidget(seed_text, 1, 0, 1, 2) - #qrw = QRCodeWidget(seed) - #grid.addWidget(qrw, 0, 2, 2, 1) vbox = QVBoxLayout() vbox.addLayout(grid) vbox.addWidget(label2)