monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-23 03:59:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Back transitions for the wizards

Browse source
This commit is contained in:
dsc 2019-04-15 04:59:04 +02:00
parent e81cb7e640
commit e84f4623d8
No known key found for this signature in database
GPG key ID: 7BBC83D7A8810AAB
5 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
wizard/WizardController.qml
View file

@ -76,6 +76,7 @@ Rectangle {
property var m_wallet;
property alias wizardState: wizardStateView.state
property alias wizardStatePrevious: wizardStateView.previousView
property alias wizardStackView: stackView
property int wizardSubViewWidth: 780
property int wizardSubViewTopMargin: persistentSettings.customDecorations ? 90 : 32
property bool skipModeSelection: false
@ -161,9 +162,6 @@ Rectangle {
if (typeof previousView.onPageClosed === "function") {
previousView.onPageClosed();
}
// Combined with NumberAnimation to fade out views
previousView.opacity = 0;
}
if (currentView) {
@ -172,12 +170,13 @@ Rectangle {
if (typeof currentView.onPageCompleted === "function") {
currentView.onPageCompleted(previousView);
}
// Combined with NumberAnimation to fade in views
currentView.opacity = 1;
}
previousView = currentView;
// reset push direction
if(wizardController.wizardState == "wizardHome")
wizardController.wizardStackView.backTransition = false;
}
states: [
@ -286,7 +285,7 @@ Rectangle {
PropertyAnimation {
target: enterItem
property: "x"
from: target.width
from: stackView.backTransition ? -target.width : target.width
to: 0
duration: 300
easing.type: Easing.OutCubic
@ -295,7 +294,7 @@ Rectangle {
target: exitItem
property: "x"
from: 0
to: 0 - target.width
to: stackView.backTransition ? target.width : -target.width
duration: 300
easing.type: Easing.OutCubic
}

3
wizard/WizardHome.qml
View file

@ -142,6 +142,7 @@ Rectangle {
text: qsTr("Change wallet mode") + translationManager.emptyString
onClicked: {
wizardController.wizardStackView.backTransition = true;
wizardController.wizardState = 'wizardModeSelection';
}
}
@ -152,6 +153,7 @@ Rectangle {
text: qsTr("Change language") + translationManager.emptyString
onClicked: {
wizardController.wizardStackView.backTransition = false;
appWindow.toggleLanguageView();
}
}
@ -169,7 +171,6 @@ Rectangle {
ListModel {
id: networkTypeModel
// @TODO: try real enums
ListElement {column1: "Mainnet"; column2: ""; nettype: "mainnet"}
ListElement {column1: "Testnet"; column2: ""; nettype: "testnet"}
ListElement {column1: "Stagenet"; column2: ""; nettype: "stagenet"}

1
wizard/WizardLanguage.qml
View file

@ -170,6 +170,7 @@ Rectangle {
text: "Continue"
onClicked: {
wizardController.wizardStackView.backTransition = false;
if(wizardController.skipModeSelection){
wizardStateView.state = "wizardHome"
} else {

2
wizard/WizardModeSelection.qml
View file

@ -126,6 +126,7 @@ Rectangle {
imageIcon: "qrc:///images/local-node-full.png"
onMenuClicked: {
wizardController.wizardStackView.backTransition = false;
appWindow.changeWalletMode(2);
wizardController.wizardState = 'wizardHome';
}
@ -138,6 +139,7 @@ Rectangle {
progressSteps: 0
onPrevClicked: {
wizardController.wizardStackView.backTransition = true;
wizardController.wizardState = 'wizardLanguage';
}
}

14
wizard/WizardNav.qml
View file

@ -50,6 +50,18 @@ GridLayout {
signal nextClicked;
signal prevClicked;
// internal signals
signal m_nextClicked;
signal m_prevClicked;
onM_prevClicked: {
wizardController.wizardStackView.backTransition = true;
}
onM_nextClicked: {
wizardController.wizardStackView.backTransition = false;
}
Rectangle {
Layout.preferredHeight: parent.height
Layout.fillWidth: true
@ -64,6 +76,7 @@ GridLayout {
anchors.verticalCenter: parent.verticalCenter
onClicked: {
menuNav.m_prevClicked();
menuNav.prevClicked();
}
}
@ -99,6 +112,7 @@ GridLayout {
anchors.right: parent.right
onClicked: {
menuNav.m_nextClicked();
menuNav.nextClicked();
}
}