redstrate/astra
1
Fork 0
mirror of https://github.com/redstrate/Astra.git synced 2025-04-22 12:47:44 +00:00
Code Activity

Add tabs to profile & account settings

Browse source 
The settings are getting quite long, so let's "fix" that by separating
them into categorical settings.
This commit is contained in:
Joshua Goins 2024-07-28 22:40:54 -04:00
parent a8190dabbc
commit e32a61edad
2 changed files with 64 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
launcher/ui/Settings/AccountSettings.qml
View file

@ -36,12 +36,32 @@ FormCard.FormCardPage {
} }
] ]
FormCard.FormHeader { header: Kirigami.NavigationTabBar {
title: i18n("General") width: parent.width
actions: [
Kirigami.Action {
id: generalAction
text: i18n("General")
},
Kirigami.Action {
id: accountAction
text: i18n("Account")
},
Kirigami.Action {
id: loginAction
text: i18n("Login")
}
]
Component.onCompleted: actions[0].checked = true
} }
FormCard.FormCard { FormCard.FormCard {
visible: generalAction.checked
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: Kirigami.Units.largeSpacing
FormCard.FormTextFieldDelegate { FormCard.FormTextFieldDelegate {
id: usernameDelegate id: usernameDelegate
@ -81,15 +101,11 @@ FormCard.FormCardPage {
} }
} }
FormCard.FormHeader {
title: i18n("Square Enix")
visible: !page.account.isSapphire
}
FormCard.FormCard { FormCard.FormCard {
visible: !page.account.isSapphire visible: accountAction.checked && !page.account.isSapphire
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: Kirigami.Units.largeSpacing
FormCard.FormComboBoxDelegate { FormCard.FormComboBoxDelegate {
id: licenseField id: licenseField
@ -158,15 +174,11 @@ FormCard.FormCardPage {
} }
} }
FormCard.FormHeader {
title: i18n("Sapphire")
visible: page.account.isSapphire
}
FormCard.FormCard { FormCard.FormCard {
visible: page.account.isSapphire visible: accountAction.checked && page.account.isSapphire
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: Kirigami.Units.largeSpacing
FormCard.FormTextFieldDelegate { FormCard.FormTextFieldDelegate {
id: lobbyURLDelegate id: lobbyURLDelegate
@ -179,12 +191,11 @@ FormCard.FormCardPage {
} }
} }
FormCard.FormHeader {
title: i18n("Login")
}
FormCard.FormCard { FormCard.FormCard {
visible: loginAction.checked
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: Kirigami.Units.largeSpacing
FormCard.FormCheckDelegate { FormCard.FormCheckDelegate {
id: rememberPasswordDelegate id: rememberPasswordDelegate

52
launcher/ui/Settings/ProfileSettings.qml
View file

@ -31,12 +31,38 @@ FormCard.FormCardPage {
} }
] ]
FormCard.FormHeader { header: Kirigami.NavigationTabBar {
title: i18n("General") width: parent.width
actions: [
Kirigami.Action {
id: generalAction
text: i18n("General")
},
Kirigami.Action {
id: wineAction
text: i18n("Wine")
visible: !LauncherCore.isWindows
},
Kirigami.Action {
id: toolsAction
text: i18n("Tools")
visible: !LauncherCore.isWindows
},
Kirigami.Action {
id: dalamudAction
text: i18n("Dalamud")
}
]
Component.onCompleted: actions[0].checked = true
} }
FormCard.FormCard { FormCard.FormCard {
visible: generalAction.checked
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: Kirigami.Units.largeSpacing
FormCard.FormTextFieldDelegate { FormCard.FormTextFieldDelegate {
id: nameDelegate id: nameDelegate
@ -85,14 +111,11 @@ FormCard.FormCardPage {
} }
} }
FormCard.FormHeader {
title: i18n("Wine")
}
FormCard.FormCard { FormCard.FormCard {
visible: !LauncherCore.isWindows visible: wineAction.checked
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: Kirigami.Units.largeSpacing
FormCard.FormComboBoxDelegate { FormCard.FormComboBoxDelegate {
id: wineTypeDelegate id: wineTypeDelegate
@ -139,15 +162,11 @@ FormCard.FormCardPage {
} }
} }
FormCard.FormHeader {
title: i18n("Tools")
visible: !LauncherCore.isWindows
}
FormCard.FormCard { FormCard.FormCard {
visible: !LauncherCore.isWindows visible: toolsAction.checked
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: Kirigami.Units.largeSpacing
FormCard.FormCheckDelegate { FormCard.FormCheckDelegate {
text: i18n("Enable Gamescope") text: i18n("Enable Gamescope")
@ -213,12 +232,11 @@ FormCard.FormCardPage {
} }
} }
FormCard.FormHeader {
title: i18n("Dalamud")
}
FormCard.FormCard { FormCard.FormCard {
visible: dalamudAction.checked
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: Kirigami.Units.largeSpacing
FormCard.FormCheckDelegate { FormCard.FormCheckDelegate {
id: enableDalamudDelegate id: enableDalamudDelegate