AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge branch spesmilo/pr/10016' into 202507_pr10016_qml_wizard_passphrase

Browse Source
This commit is contained in:
SomberNight
2025-07-20 22:00:51 +00:00
parent e56bc4f2ae 307181fe5e
commit bfd3c0e48c
12 changed files with 327 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
electrum/plugins/trustedcoin/qml.py
View File

@@ -69,12 +69,21 @@ class Plugin(TrustedCoinPlugin):
'trustedcoin_create_seed': {
'gui': 'WCCreateSeed',
},
'trustedcoin_create_ext': {
'gui': 'WCEnterExt',
},
'trustedcoin_confirm_seed': {
'gui': 'WCConfirmSeed',
},
'trustedcoin_confirm_ext': {
'gui': 'WCConfirmExt',
},
'trustedcoin_have_seed': {
'gui': 'WCHaveSeed',
},
'trustedcoin_have_ext': {
'gui': 'WCEnterExt',
},
'trustedcoin_keep_disable': {
'gui': '../../../../plugins/trustedcoin/qml/KeepDisable',
},

41
electrum/plugins/trustedcoin/qt.py
View File

@@ -250,14 +250,26 @@ class Plugin(TrustedCoinPlugin):
'gui': WCCreateSeed,
'params': {'icon': self.icon_path('trustedcoin-wizard.png')},
},
'trustedcoin_create_ext': {
'gui': WCEnterExt,
'params': {'icon': self.icon_path('trustedcoin-wizard.png')},
},
'trustedcoin_confirm_seed': {
'gui': WCConfirmSeed,
'params': {'icon': self.icon_path('trustedcoin-wizard.png')},
},
'trustedcoin_confirm_ext': {
'gui': WCConfirmExt,
'params': {'icon': self.icon_path('trustedcoin-wizard.png')},
},
'trustedcoin_have_seed': {
'gui': WCHaveSeed,
'params': {'icon': self.icon_path('trustedcoin-wizard.png')},
},
'trustedcoin_have_ext': {
'gui': WCEnterExt,
'params': {'icon': self.icon_path('trustedcoin-wizard.png')},
},
'trustedcoin_keep_disable': {
'gui': WCKeepDisable,
'params': {'icon': self.icon_path('trustedcoin-wizard.png')},
@@ -277,35 +289,6 @@ class Plugin(TrustedCoinPlugin):
}
wizard.navmap_merge(views)
# modify default flow, insert seed extension entry/confirm as separate views
ext = {
'trustedcoin_create_seed': {
'next': lambda d: 'trustedcoin_create_ext' if wizard.wants_ext(d) else 'trustedcoin_confirm_seed'
},
'trustedcoin_create_ext': {
'gui': WCEnterExt,
'params': {'icon': self.icon_path('trustedcoin-wizard.png')},
'next': 'trustedcoin_confirm_seed',
},
'trustedcoin_confirm_seed': {
'next': lambda d: 'trustedcoin_confirm_ext' if wizard.wants_ext(d) else 'trustedcoin_tos'
},
'trustedcoin_confirm_ext': {
'gui': WCConfirmExt,
'params': {'icon': self.icon_path('trustedcoin-wizard.png')},
'next': 'trustedcoin_tos',
},
'trustedcoin_have_seed': {
'next': lambda d: 'trustedcoin_have_ext' if wizard.wants_ext(d) else 'trustedcoin_keep_disable'
},
'trustedcoin_have_ext': {
'gui': WCEnterExt,
'params': {'icon': self.icon_path('trustedcoin-wizard.png')},
'next': 'trustedcoin_keep_disable',
},
}
wizard.navmap_merge(ext)
# insert page offering choice to go online or continue on another system
ext_online = {
'trustedcoin_continue_online': {

15
electrum/plugins/trustedcoin/trustedcoin.py
View File

@@ -586,13 +586,22 @@ class TrustedCoinPlugin(BasePlugin):
else 'trustedcoin_have_seed'
},
'trustedcoin_create_seed': {
'next': 'trustedcoin_confirm_seed'
'next': lambda d: 'trustedcoin_create_ext' if wizard.wants_ext(d) else 'trustedcoin_confirm_seed',
},
'trustedcoin_create_ext': {
'next': 'trustedcoin_confirm_seed',
},
'trustedcoin_confirm_seed': {
'next': 'trustedcoin_tos'
'next': lambda d: 'trustedcoin_confirm_ext' if wizard.wants_ext(d) else 'trustedcoin_tos',
},
'trustedcoin_confirm_ext': {
'next': 'trustedcoin_tos',
},
'trustedcoin_have_seed': {
'next': 'trustedcoin_keep_disable'
'next': lambda d: 'trustedcoin_have_ext' if wizard.wants_ext(d) else 'trustedcoin_keep_disable',
},
'trustedcoin_have_ext': {
'next': 'trustedcoin_keep_disable',
},
'trustedcoin_keep_disable': {
'next': lambda d: 'trustedcoin_tos' if d['trustedcoin_keepordisable'] != 'disable'