redstrate/astra
1
Fork 0
mirror of https://github.com/redstrate/Astra.git synced 2025-06-08 15:07:45 +00:00
Code Activity

Re-arrange the login page yet again

Browse source
This commit is contained in:
Joshua Goins 2024-03-19 19:10:30 -04:00
parent 171483d2c9
commit 130703d874
3 changed files with 30 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
launcher/ui/Main.qml
View file

@ -21,11 +21,13 @@ Kirigami.ApplicationWindow {
property bool checkedAutoLogin: false property bool checkedAutoLogin: false
pageStack.initialPage: Kirigami.Page { pageStack {
initialPage: Kirigami.Page {
Kirigami.LoadingPlaceholder { Kirigami.LoadingPlaceholder {
anchors.centerIn: parent anchors.centerIn: parent
} }
} }
}
onClosing: (close) => { onClosing: (close) => {
if (LauncherCore.isPatching()) { if (LauncherCore.isPatching()) {
@ -56,7 +58,7 @@ Kirigami.ApplicationWindow {
pageStack.layers.replace(Qt.createComponent("zone.xiv.astra", "AutoLoginPage")) pageStack.layers.replace(Qt.createComponent("zone.xiv.astra", "AutoLoginPage"))
checkedAutoLogin = true; checkedAutoLogin = true;
} else { } else {
pageStack.layers.replace(Qt.createComponent("zone.xiv.astra", "MainPage")) pageStack.replace(Qt.createComponent("zone.xiv.astra", "MainPage"))
} }
} }
} }

27
launcher/ui/Pages/LoginPage.qml
View file

@ -274,32 +274,5 @@ QQC2.Control {
onClicked: applicationWindow().openUrl('https://secure.square-enix.com/account/app/svc/reminder') onClicked: applicationWindow().openUrl('https://secure.square-enix.com/account/app/svc/reminder')
} }
} }
FormCard.FormCard {
maximumWidth: Kirigami.Units.gridUnit * 25
Layout.fillWidth: true
FormCard.FormButtonDelegate {
id: serverStatusButton
text: i18n("Server Status")
icon.name: "cloudstatus"
onClicked: applicationWindow().openUrl('https://na.finalfantasyxiv.com/lodestone/worldstatus/')
}
FormCard.FormDelegateSeparator {
above: serverStatusButton
below: settingsButton
}
FormCard.FormButtonDelegate {
id: settingsButton
text: i18n("Settings")
icon.name: "configure"
onClicked: applicationWindow().pushDialogLayer(Qt.createComponent("zone.xiv.astra", "SettingsPage"))
}
}
} }
} }

37
launcher/ui/Pages/MainPage.qml
View file

@ -14,18 +14,37 @@ Kirigami.Page {
title: i18n("Home") title: i18n("Home")
globalToolBarStyle: Kirigami.ApplicationHeaderStyle.None topPadding: 0
leftPadding: 0
topPadding: Kirigami.Units.largeSpacing rightPadding: 0
leftPadding: Kirigami.Units.largeSpacing
rightPadding: Kirigami.Units.largeSpacing
bottomPadding: 0 bottomPadding: 0
actions: [
Kirigami.Action {
text: i18nc("@action:button", "Server Status")
icon.name: "cloudstatus"
onTriggered: applicationWindow().openUrl('https://na.finalfantasyxiv.com/lodestone/worldstatus/')
},
Kirigami.Action {
text: i18nc("@action:button", "Settings")
icon.name: "configure"
onTriggered: applicationWindow().pushDialogLayer(Qt.createComponent("zone.xiv.astra", "SettingsPage"))
}
]
RowLayout { RowLayout {
anchors.fill: parent anchors.fill: parent
spacing: Kirigami.Units.largeSpacing spacing: Kirigami.Units.largeSpacing
LoginPage {
id: loginPage
Layout.alignment: Qt.AlignTop | Qt.AlignHCenter
Layout.minimumWidth: LauncherCore.settings.showNews ? Kirigami.Units.gridUnit * 26 : 0
Layout.fillWidth: !LauncherCore.settings.showNews
}
Loader { Loader {
active: LauncherCore.settings.showNews active: LauncherCore.settings.showNews
@ -41,13 +60,5 @@ Kirigami.Page {
} }
} }
} }
LoginPage {
id: loginPage
Layout.alignment: Qt.AlignTop | Qt.AlignHCenter
Layout.minimumWidth: LauncherCore.settings.showNews ? Kirigami.Units.gridUnit * 26 : 0
Layout.fillWidth: !LauncherCore.settings.showNews
}
} }
} }