AaronFiore/electrum
1
0
Fork 0
Code Activity

Install wizard: simplify create_or_restore

Browse Source 
- Use ChoiceLayout to organize the layouts
- Do wallet filtering in wizard.py as it's GUI independent.
- Only pass the descriptions.
This commit is contained in:
Neil Booth
2016-01-10 22:57:31 +09:00
parent 85b48191da
commit 384b8cd5f2
2 changed files with 29 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/wizard.py
View File

@@ -19,7 +19,7 @@
from electrum import WalletStorage
from electrum.plugins import run_hook
from util import PrintError
from wallet import Wallet
from wallet import Wallet, wallet_types
from i18n import _
MSG_GENERATING_WAIT = _("Electrum is generating your addresses, please wait...")
@@ -64,10 +64,10 @@ class WizardBase(PrintError):
raise NotImplementedError
def query_create_or_restore(self, wallet_kinds):
"""Ask the user what they want to do, and to what wallet kind.
wallet_kinds is an array of tuples (kind, description).
Return a tuple (action, kind). Action is 'create' or 'restore',
and kind is one of the wallet kinds passed."""
"""Ask the user what they want to do, and which wallet kind.
wallet_kinds is an array of translated wallet descriptions.
Return a a tuple (action, kind_index). Action is 'create' or
'restore', and kind the index of the wallet kind chosen."""
raise NotImplementedError
def query_multisig(self, action):
@@ -186,21 +186,25 @@ class WizardBase(PrintError):
a wallet and return it.'''
self.remove_from_recently_open(storage.path)
action, kind = self.query_create_or_restore(WizardBase.wallet_kinds)
# Filter out any unregistered wallet kinds
registered_kinds = zip(*wallet_types)[0]
kinds, descriptions = zip(*[pair for pair in WizardBase.wallet_kinds
if pair[0] in registered_kinds])
action, kind_index = self.query_create_or_restore(descriptions)
assert action in WizardBase.user_actions
assert kind in [k for k, desc in WizardBase.wallet_kinds]
kind = kinds[kind_index]
if kind == 'multisig':
wallet_type = self.query_multisig(action)
elif kind == 'hardware':
wallet_types, choices = self.plugins.hardware_wallets(action)
hw_wallet_types, choices = self.plugins.hardware_wallets(action)
if action == 'create':
msg = _('Select the hardware wallet to create')
else:
msg = _('Select the hardware wallet to restore')
choice = self.query_choice(msg, choices)
wallet_type = wallet_types[choice]
wallet_type = hw_wallet_types[choice]
elif kind == 'twofactor':
wallet_type = '2fa'
else: