Browse Source

qml: start new wallet wizard if no wallets exist, create/open button opens wizard if no wallets exist

master
Sander van Grieken 3 years ago
parent
commit
6dab3de1f2
  1. 12
      electrum/gui/qml/components/WalletMainView.qml
  2. 14
      electrum/gui/qml/components/main.qml

12
electrum/gui/qml/components/WalletMainView.qml

@ -89,7 +89,17 @@ Item {
text: qsTr('Open/Create Wallet') text: qsTr('Open/Create Wallet')
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
onClicked: { onClicked: {
stack.push(Qt.resolvedUrl('Wallets.qml')) if (Daemon.availableWallets.rowCount() > 0) {
stack.push(Qt.resolvedUrl('Wallets.qml'))
} else {
var newww = app.newWalletWizard.createObject(app)
newww.walletCreated.connect(function() {
Daemon.availableWallets.reload()
// and load the new wallet
Daemon.load_wallet(newww.path, newww.wizard_data['password'])
})
newww.open()
}
} }
} }
} }

14
electrum/gui/qml/components/main.qml

@ -223,16 +223,26 @@ ApplicationWindow
}) })
dialog.accepted.connect(function() { dialog.accepted.connect(function() {
var newww = app.newWalletWizard.createObject(app) var newww = app.newWalletWizard.createObject(app)
newww.open()
newww.walletCreated.connect(function() { newww.walletCreated.connect(function() {
Daemon.availableWallets.reload() Daemon.availableWallets.reload()
// and load the new wallet // and load the new wallet
Daemon.load_wallet(newww.path, newww.wizard_data['password']) Daemon.load_wallet(newww.path, newww.wizard_data['password'])
}) })
newww.open()
}) })
dialog.open() dialog.open()
} else { } else {
Daemon.load_wallet() if (Daemon.availableWallets.rowCount() > 0) {
Daemon.load_wallet()
} else {
var newww = app.newWalletWizard.createObject(app)
newww.walletCreated.connect(function() {
Daemon.availableWallets.reload()
// and load the new wallet
Daemon.load_wallet(newww.path, newww.wizard_data['password'])
})
newww.open()
}
} }
} }

Loading…
Cancel
Save