Skip to content

Commit 6dab3de

Browse files
committed
qml: start new wallet wizard if no wallets exist, create/open button opens wizard if no wallets exist
1 parent 8184093 commit 6dab3de

File tree

2 files changed

+23
-3
lines changed

2 files changed

+23
-3
lines changed

electrum/gui/qml/components/WalletMainView.qml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,17 @@ Item {
8989
text: qsTr('Open/Create Wallet')
9090
Layout.alignment: Qt.AlignHCenter
9191
onClicked: {
92-
stack.push(Qt.resolvedUrl('Wallets.qml'))
92+
if (Daemon.availableWallets.rowCount() > 0) {
93+
stack.push(Qt.resolvedUrl('Wallets.qml'))
94+
} else {
95+
var newww = app.newWalletWizard.createObject(app)
96+
newww.walletCreated.connect(function() {
97+
Daemon.availableWallets.reload()
98+
// and load the new wallet
99+
Daemon.load_wallet(newww.path, newww.wizard_data['password'])
100+
})
101+
newww.open()
102+
}
93103
}
94104
}
95105
}

electrum/gui/qml/components/main.qml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,16 +223,26 @@ ApplicationWindow
223223
})
224224
dialog.accepted.connect(function() {
225225
var newww = app.newWalletWizard.createObject(app)
226-
newww.open()
227226
newww.walletCreated.connect(function() {
228227
Daemon.availableWallets.reload()
229228
// and load the new wallet
230229
Daemon.load_wallet(newww.path, newww.wizard_data['password'])
231230
})
231+
newww.open()
232232
})
233233
dialog.open()
234234
} else {
235-
Daemon.load_wallet()
235+
if (Daemon.availableWallets.rowCount() > 0) {
236+
Daemon.load_wallet()
237+
} else {
238+
var newww = app.newWalletWizard.createObject(app)
239+
newww.walletCreated.connect(function() {
240+
Daemon.availableWallets.reload()
241+
// and load the new wallet
242+
Daemon.load_wallet(newww.path, newww.wizard_data['password'])
243+
})
244+
newww.open()
245+
}
236246
}
237247
}
238248

0 commit comments

Comments
 (0)