aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2019-12-03 22:24:06 -0600
committerluigi1111 <luigi1111w@gmail.com>2019-12-03 22:24:06 -0600
commit7cca39ad48d14ed6d48ede3f245c1d4f2a5052cb (patch)
tree88050df23c6815fe435e9f68b13fc22886c4fc53
parent90406dfd1e1d71881521f92888c1744bc8395526 (diff)
parent7b0cd19487ff479c4d9c3a1b12cd39baf008ca2c (diff)
downloadmonzero-gui-7cca39ad48d14ed6d48ede3f245c1d4f2a5052cb.tar.gz
monzero-gui-7cca39ad48d14ed6d48ede3f245c1d4f2a5052cb.tar.xz
monzero-gui-7cca39ad48d14ed6d48ede3f245c1d4f2a5052cb.zip
Merge pull request #2520
7b0cd19 wizard: Language button on home and add back button (selsta)
-rw-r--r--wizard/WizardHome.qml2
-rw-r--r--wizard/WizardModeSelection.qml6
2 files changed, 3 insertions, 5 deletions
diff --git a/wizard/WizardHome.qml b/wizard/WizardHome.qml
index 05460805..db83b598 100644
--- a/wizard/WizardHome.qml
+++ b/wizard/WizardHome.qml
@@ -149,12 +149,10 @@ Rectangle {
}
MoneroComponents.StandardButton {
- visible: !persistentSettings.customDecorations
small: true
text: qsTr("Change language") + translationManager.emptyString
onClicked: {
- wizardController.wizardStackView.backTransition = false;
appWindow.toggleLanguageView();
}
}
diff --git a/wizard/WizardModeSelection.qml b/wizard/WizardModeSelection.qml
index 1eb3320f..3a901341 100644
--- a/wizard/WizardModeSelection.qml
+++ b/wizard/WizardModeSelection.qml
@@ -138,13 +138,13 @@ Rectangle {
WizardNav {
Layout.topMargin: 5
- btnPrevText: qsTr("Change language") + translationManager.emptyString
+ btnPrevText: qsTr("Back to menu") + translationManager.emptyString
btnNext.visible: false
progressSteps: 0
onPrevClicked: {
- wizardController.wizardStackView.backTransition = true;
- wizardController.wizardState = 'wizardLanguage';
+ wizardController.wizardStackView.backTransition = wizardController.wizardStatePrevious.viewName == 'wizardLanguage';
+ wizardController.wizardState = wizardController.wizardStatePrevious.viewName == 'wizardLanguage' ? 'wizardLanguage' : 'wizardHome';
}
}
}