mirror of
https://github.com/monero-project/monero-gui.git
synced 2024-12-23 20:20:02 +00:00
Back transitions for the wizards
This commit is contained in:
parent
e81cb7e640
commit
e84f4623d8
5 changed files with 26 additions and 9 deletions
|
@ -76,6 +76,7 @@ Rectangle {
|
||||||
property var m_wallet;
|
property var m_wallet;
|
||||||
property alias wizardState: wizardStateView.state
|
property alias wizardState: wizardStateView.state
|
||||||
property alias wizardStatePrevious: wizardStateView.previousView
|
property alias wizardStatePrevious: wizardStateView.previousView
|
||||||
|
property alias wizardStackView: stackView
|
||||||
property int wizardSubViewWidth: 780
|
property int wizardSubViewWidth: 780
|
||||||
property int wizardSubViewTopMargin: persistentSettings.customDecorations ? 90 : 32
|
property int wizardSubViewTopMargin: persistentSettings.customDecorations ? 90 : 32
|
||||||
property bool skipModeSelection: false
|
property bool skipModeSelection: false
|
||||||
|
@ -161,9 +162,6 @@ Rectangle {
|
||||||
if (typeof previousView.onPageClosed === "function") {
|
if (typeof previousView.onPageClosed === "function") {
|
||||||
previousView.onPageClosed();
|
previousView.onPageClosed();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Combined with NumberAnimation to fade out views
|
|
||||||
previousView.opacity = 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (currentView) {
|
if (currentView) {
|
||||||
|
@ -172,12 +170,13 @@ Rectangle {
|
||||||
if (typeof currentView.onPageCompleted === "function") {
|
if (typeof currentView.onPageCompleted === "function") {
|
||||||
currentView.onPageCompleted(previousView);
|
currentView.onPageCompleted(previousView);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Combined with NumberAnimation to fade in views
|
|
||||||
currentView.opacity = 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
previousView = currentView;
|
previousView = currentView;
|
||||||
|
|
||||||
|
// reset push direction
|
||||||
|
if(wizardController.wizardState == "wizardHome")
|
||||||
|
wizardController.wizardStackView.backTransition = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
states: [
|
states: [
|
||||||
|
@ -286,7 +285,7 @@ Rectangle {
|
||||||
PropertyAnimation {
|
PropertyAnimation {
|
||||||
target: enterItem
|
target: enterItem
|
||||||
property: "x"
|
property: "x"
|
||||||
from: target.width
|
from: stackView.backTransition ? -target.width : target.width
|
||||||
to: 0
|
to: 0
|
||||||
duration: 300
|
duration: 300
|
||||||
easing.type: Easing.OutCubic
|
easing.type: Easing.OutCubic
|
||||||
|
@ -295,7 +294,7 @@ Rectangle {
|
||||||
target: exitItem
|
target: exitItem
|
||||||
property: "x"
|
property: "x"
|
||||||
from: 0
|
from: 0
|
||||||
to: 0 - target.width
|
to: stackView.backTransition ? target.width : -target.width
|
||||||
duration: 300
|
duration: 300
|
||||||
easing.type: Easing.OutCubic
|
easing.type: Easing.OutCubic
|
||||||
}
|
}
|
||||||
|
|
|
@ -142,6 +142,7 @@ Rectangle {
|
||||||
text: qsTr("Change wallet mode") + translationManager.emptyString
|
text: qsTr("Change wallet mode") + translationManager.emptyString
|
||||||
|
|
||||||
onClicked: {
|
onClicked: {
|
||||||
|
wizardController.wizardStackView.backTransition = true;
|
||||||
wizardController.wizardState = 'wizardModeSelection';
|
wizardController.wizardState = 'wizardModeSelection';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -152,6 +153,7 @@ Rectangle {
|
||||||
text: qsTr("Change language") + translationManager.emptyString
|
text: qsTr("Change language") + translationManager.emptyString
|
||||||
|
|
||||||
onClicked: {
|
onClicked: {
|
||||||
|
wizardController.wizardStackView.backTransition = false;
|
||||||
appWindow.toggleLanguageView();
|
appWindow.toggleLanguageView();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -169,7 +171,6 @@ Rectangle {
|
||||||
|
|
||||||
ListModel {
|
ListModel {
|
||||||
id: networkTypeModel
|
id: networkTypeModel
|
||||||
// @TODO: try real enums
|
|
||||||
ListElement {column1: "Mainnet"; column2: ""; nettype: "mainnet"}
|
ListElement {column1: "Mainnet"; column2: ""; nettype: "mainnet"}
|
||||||
ListElement {column1: "Testnet"; column2: ""; nettype: "testnet"}
|
ListElement {column1: "Testnet"; column2: ""; nettype: "testnet"}
|
||||||
ListElement {column1: "Stagenet"; column2: ""; nettype: "stagenet"}
|
ListElement {column1: "Stagenet"; column2: ""; nettype: "stagenet"}
|
||||||
|
|
|
@ -170,6 +170,7 @@ Rectangle {
|
||||||
text: "Continue"
|
text: "Continue"
|
||||||
|
|
||||||
onClicked: {
|
onClicked: {
|
||||||
|
wizardController.wizardStackView.backTransition = false;
|
||||||
if(wizardController.skipModeSelection){
|
if(wizardController.skipModeSelection){
|
||||||
wizardStateView.state = "wizardHome"
|
wizardStateView.state = "wizardHome"
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -126,6 +126,7 @@ Rectangle {
|
||||||
imageIcon: "qrc:///images/local-node-full.png"
|
imageIcon: "qrc:///images/local-node-full.png"
|
||||||
|
|
||||||
onMenuClicked: {
|
onMenuClicked: {
|
||||||
|
wizardController.wizardStackView.backTransition = false;
|
||||||
appWindow.changeWalletMode(2);
|
appWindow.changeWalletMode(2);
|
||||||
wizardController.wizardState = 'wizardHome';
|
wizardController.wizardState = 'wizardHome';
|
||||||
}
|
}
|
||||||
|
@ -138,6 +139,7 @@ Rectangle {
|
||||||
progressSteps: 0
|
progressSteps: 0
|
||||||
|
|
||||||
onPrevClicked: {
|
onPrevClicked: {
|
||||||
|
wizardController.wizardStackView.backTransition = true;
|
||||||
wizardController.wizardState = 'wizardLanguage';
|
wizardController.wizardState = 'wizardLanguage';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -50,6 +50,18 @@ GridLayout {
|
||||||
signal nextClicked;
|
signal nextClicked;
|
||||||
signal prevClicked;
|
signal prevClicked;
|
||||||
|
|
||||||
|
// internal signals
|
||||||
|
signal m_nextClicked;
|
||||||
|
signal m_prevClicked;
|
||||||
|
|
||||||
|
onM_prevClicked: {
|
||||||
|
wizardController.wizardStackView.backTransition = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
onM_nextClicked: {
|
||||||
|
wizardController.wizardStackView.backTransition = false;
|
||||||
|
}
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
Layout.preferredHeight: parent.height
|
Layout.preferredHeight: parent.height
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
@ -64,6 +76,7 @@ GridLayout {
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
|
||||||
onClicked: {
|
onClicked: {
|
||||||
|
menuNav.m_prevClicked();
|
||||||
menuNav.prevClicked();
|
menuNav.prevClicked();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -99,6 +112,7 @@ GridLayout {
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
|
|
||||||
onClicked: {
|
onClicked: {
|
||||||
|
menuNav.m_nextClicked();
|
||||||
menuNav.nextClicked();
|
menuNav.nextClicked();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue