tMerge pull request #2601 from bauerj/installwizard-back - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 4721e21df08450dbdbd1dc4de0959cb3594f9422
DIR parent 23108ba5c2d2cd362a69512e56338b149e0646cf
HTML Author: ThomasV <thomasv@electrum.org>
Date: Mon, 24 Jul 2017 18:15:25 +0200
Merge pull request #2601 from bauerj/installwizard-back
Fix "Back" button in installwizard
Diffstat:
M gui/qt/installwizard.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
---
DIR diff --git a/gui/qt/installwizard.py b/gui/qt/installwizard.py
t@@ -109,6 +109,7 @@ class InstallWizard(QDialog, MessageBoxMixin, BaseWizard):
self.title = QLabel()
self.main_widget = QWidget()
self.back_button = QPushButton(_("Back"), self)
+ self.back_button.setText(_('Back') if self.can_go_back() else _('Cancel'))
self.next_button = QPushButton(_("Next"), self)
self.next_button.setDefault(True)
self.logo = QLabel()
t@@ -211,8 +212,8 @@ class InstallWizard(QDialog, MessageBoxMixin, BaseWizard):
while True:
if self.storage.file_exists() and not self.storage.is_encrypted():
break
- if not self.loop.exec_():
- return
+ if self.loop.exec_() != 2: # 2 = next
+ self.close()
if not self.storage.file_exists():
break
if self.storage.file_exists() and self.storage.is_encrypted():