monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-05-12 07:12:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 03e87a4bdd into e9afaa9cc8

Browse source
This commit is contained in:
rating89us 2022-02-01 03:45:44 +01:00 committed by GitHub
commit 552a6ce139
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions

3
wizard/WizardCreateDevice1.qml
View file

@ -43,6 +43,7 @@ Rectangle {
color: "transparent" color: "transparent"
property alias pageHeight: pageRoot.height property alias pageHeight: pageRoot.height
property string viewName: "wizardCreateDevice1" property string viewName: "wizardCreateDevice1"
property alias restoreDeviceWallet: restoreDeviceWallet
property var deviceName: deviceNameModel.get(deviceNameDropdown.currentIndex).column2 property var deviceName: deviceNameModel.get(deviceNameDropdown.currentIndex).column2
property var ledgerType: deviceName == "Ledger" ? deviceNameModel.get(deviceNameDropdown.currentIndex).column1 : null property var ledgerType: deviceName == "Ledger" ? deviceNameModel.get(deviceNameDropdown.currentIndex).column1 : null
@ -230,6 +231,8 @@ Rectangle {
btnNext.text: newDeviceWallet.checked ? qsTr("Create wallet") : qsTr("Restore wallet") + translationManager.emptyString btnNext.text: newDeviceWallet.checked ? qsTr("Create wallet") : qsTr("Restore wallet") + translationManager.emptyString
onPrevClicked: { onPrevClicked: {
wizardStateView.state = "wizardHome"; wizardStateView.state = "wizardHome";
//reset restoreDeviceWallet.checked, since wizardCreateWallet4 reads it
restoreDeviceWallet.checked = false;
} }
onNextClicked: { onNextClicked: {
wizardController.walletOptionsName = walletInput.walletName.text; wizardController.walletOptionsName = walletInput.walletName.text;

5
wizard/WizardCreateWallet4.qml
View file

@ -58,14 +58,14 @@ Rectangle {
WizardHeader { WizardHeader {
title: qsTr("You're all set up!") + translationManager.emptyString title: qsTr("You're all set up!") + translationManager.emptyString
subtitle: qsTr("New wallet details:") + translationManager.emptyString subtitle: wizardStateView.wizardCreateDevice1View.restoreDeviceWallet.checked ? qsTr("Details of the wallet to be restored:") : qsTr("New wallet details:") + translationManager.emptyString
} }
WizardSummary {} WizardSummary {}
WizardNav { WizardNav {
Layout.topMargin: 24 Layout.topMargin: 24
btnNextText: qsTr("Create wallet") + translationManager.emptyString btnNextText: wizardStateView.wizardCreateDevice1View.restoreDeviceWallet.checked ? qsTr("Restore wallet") : qsTr("Create wallet") + translationManager.emptyString
progressSteps: appWindow.walletMode <= 1 ? 3 : 4 progressSteps: appWindow.walletMode <= 1 ? 3 : 4
progress: appWindow.walletMode <= 1 ? 2 : 3 progress: appWindow.walletMode <= 1 ? 2 : 3
@ -82,6 +82,7 @@ Rectangle {
wizardController.writeWallet(function() { wizardController.writeWallet(function() {
wizardController.useMoneroClicked(); wizardController.useMoneroClicked();
wizardController.walletOptionsIsRecoveringFromDevice = false; wizardController.walletOptionsIsRecoveringFromDevice = false;
wizardStateView.wizardCreateDevice1View.restoreDeviceWallet.checked = false;
}); });
} }
} }

4
wizard/WizardRestoreWallet4.qml
View file

@ -58,14 +58,14 @@ Rectangle {
WizardHeader { WizardHeader {
title: qsTr("You're all set up!") + translationManager.emptyString title: qsTr("You're all set up!") + translationManager.emptyString
subtitle: qsTr("New wallet details:") + translationManager.emptyString subtitle: qsTr("Details of the wallet to be restored:") + translationManager.emptyString
} }
WizardSummary {} WizardSummary {}
WizardNav { WizardNav {
Layout.topMargin: 24 Layout.topMargin: 24
btnNextText: qsTr("Create wallet") + translationManager.emptyString btnNextText: qsTr("Restore wallet") + translationManager.emptyString
progressSteps: appWindow.walletMode <= 1 ? 3 : 4 progressSteps: appWindow.walletMode <= 1 ? 3 : 4
progress: appWindow.walletMode <= 1 ? 2 : 3 progress: appWindow.walletMode <= 1 ? 2 : 3