1
0

qt,qml: add a welcome page as initial page for server connect wizard

This is much less intimidating than asking if the user wants to use a proxy
out of the gate.
This commit is contained in:
Sander van Grieken
2023-12-11 15:17:45 +01:00
parent 6e576f2a08
commit a03b2d7bae
14 changed files with 126 additions and 17 deletions

View File

@@ -264,7 +264,9 @@ class NewWalletWizard(AbstractWizard):
if initial_data is None:
initial_data = {}
self.reset()
self._current = WizardViewState('wallet_name', initial_data, {})
start_view = 'wallet_name'
params = self.navmap[start_view].get('params', {})
self._current = WizardViewState(start_view, initial_data, params)
return self._current
def is_single_password(self) -> bool:
@@ -652,14 +654,18 @@ class ServerConnectWizard(AbstractWizard):
def __init__(self, daemon: 'Daemon'):
AbstractWizard.__init__(self)
self.navmap = {
'welcome': {
'next': 'proxy_ask',
'last': lambda d: d['use_defaults']
},
'proxy_ask': {
'next': lambda d: 'proxy_config' if d['want_proxy'] else 'autoconnect'
},
'autoconnect': {
'next': 'server_config',
'accept': self.do_configure_autoconnect,
'last': lambda d: d['autoconnect']
},
'proxy_ask': {
'next': lambda d: 'proxy_config' if d['want_proxy'] else 'autoconnect'
},
'proxy_config': {
'next': 'autoconnect',
'accept': self.do_configure_proxy
@@ -704,5 +710,7 @@ class ServerConnectWizard(AbstractWizard):
if initial_data is None:
initial_data = {}
self.reset()
self._current = WizardViewState('proxy_ask', initial_data, {})
start_view = 'welcome'
params = self.navmap[start_view].get('params', {})
self._current = WizardViewState(start_view, initial_data, params)
return self._current