tdon't exit in wizard (fixes #402) - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 5ae39b5ad13592afce03fdb95cb0dfd1fdb038bd
DIR parent 0a9ca37099a87bb93c7eb2815c62c8bee1123329
HTML Author: ThomasV <thomasv@gitorious>
Date: Tue, 12 Nov 2013 22:55:42 +0100
don't exit in wizard (fixes #402)
Diffstat:
M gui/qt/installwizard.py | 24 +++++++++++-------------
M gui/qt/main_window.py | 2 +-
2 files changed, 12 insertions(+), 14 deletions(-)
---
DIR diff --git a/gui/qt/installwizard.py b/gui/qt/installwizard.py
t@@ -236,13 +236,10 @@ class InstallWizard(QDialog):
def show_seed(self, wallet):
from seed_dialog import make_seed_dialog
-
vbox = make_seed_dialog(wallet.get_mnemonic(None), wallet.imported_keys)
vbox.addLayout(ok_cancel_buttons(self, _("Next")))
-
self.set_layout(vbox)
- if not self.exec_():
- exit()
+ return self.exec_()
def password_dialog(self, wallet):
t@@ -257,7 +254,8 @@ class InstallWizard(QDialog):
def run(self):
action = self.restore_or_create()
- if not action: exit()
+ if not action:
+ return
wallet = Wallet(self.storage)
gap = self.config.get('gap_limit', 5)
t@@ -267,15 +265,15 @@ class InstallWizard(QDialog):
if action == 'create':
wallet.init_seed(None)
- self.show_seed(wallet)
- if self.verify_seed(wallet):
- def create():
- wallet.save_seed()
- wallet.synchronize() # generate first addresses offline
- self.waiting_dialog(create)
- else:
+ if not self.show_seed(wallet):
return
-
+ if not self.verify_seed(wallet):
+ return
+ def create():
+ wallet.save_seed()
+ wallet.synchronize() # generate first addresses offline
+ self.waiting_dialog(create)
+
elif action == 'restore':
# ask for seed and gap.
seed = self.seed_dialog()
DIR diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
t@@ -345,7 +345,7 @@ class ElectrumWindow(QMainWindow):
wallet = wizard.run()
if wallet:
self.load_wallet(wallet)
-
+
def init_menubar(self):