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

Fix more separator visual bugs, hide some nonfunctional settings

Browse source
This commit is contained in:
Joshua Goins 2023-07-31 19:01:58 -04:00
parent ca0b25c935
commit 11a6469e4a
2 changed files with 36 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -74,6 +74,8 @@ Kirigami.ScrollablePage {
} }
MobileForm.FormCheckDelegate { MobileForm.FormCheckDelegate {
id: needOTPField
text: i18n("Needs a one-time password") text: i18n("Needs a one-time password")
checked: page.account.useOTP checked: page.account.useOTP
onCheckedChanged: page.account.useOTP = checked onCheckedChanged: page.account.useOTP = checked
@ -81,13 +83,23 @@ Kirigami.ScrollablePage {
} }
MobileForm.FormDelegateSeparator { MobileForm.FormDelegateSeparator {
visible: needOTPField.visible
} }
MobileForm.FormTextFieldDelegate {
label: i18n("Lobby URL")
text: page.account.lobbyUrl
onTextChanged: page.account.lobbyUrl = text
visible: page.account.isSapphire
placeholderText: "neolobby0X.ffxiv.com"
}
MobileForm.FormDelegateSeparator {}
MobileForm.FormButtonDelegate { MobileForm.FormButtonDelegate {
text: i18n("Set Lodestone Character") text: i18n("Set Lodestone Character")
description: i18n("Associate a character's avatar with this account.") description: i18n("Associate a character's avatar with this account.")
icon.name: "actor" icon.name: "actor"
visible: !page.account.isSapphire
Kirigami.PromptDialog { Kirigami.PromptDialog {
id: lodestoneDialog id: lodestoneDialog
title: i18n("Enter Lodestone Id") title: i18n("Enter Lodestone Id")
@ -105,16 +117,6 @@ Kirigami.ScrollablePage {
onClicked: lodestoneDialog.open() onClicked: lodestoneDialog.open()
} }
MobileForm.FormDelegateSeparator {}
MobileForm.FormTextFieldDelegate {
label: i18n("Lobby URL")
text: page.account.lobbyUrl
onTextChanged: page.account.lobbyUrl = text
visible: page.account.isSapphire
placeholderText: "neolobby0X.ffxiv.com"
}
} }
} }
@ -137,18 +139,24 @@ Kirigami.ScrollablePage {
MobileForm.FormDelegateSeparator {} MobileForm.FormDelegateSeparator {}
MobileForm.FormCheckDelegate { MobileForm.FormCheckDelegate {
id: generateOTPField
text: i18n("Automatically generate one-time passwords") text: i18n("Automatically generate one-time passwords")
checked: page.account.rememberOTP checked: page.account.rememberOTP
onCheckedChanged: page.account.rememberOTP = checked onCheckedChanged: page.account.rememberOTP = checked
enabled: page.account.useOTP enabled: page.account.useOTP
visible: !page.account.isSapphire
} }
MobileForm.FormDelegateSeparator {} MobileForm.FormDelegateSeparator {
visible: generateOTPField.visible
}
MobileForm.FormButtonDelegate { MobileForm.FormButtonDelegate {
text: i18n("Enter OTP Secret") text: i18n("Enter OTP Secret")
icon.name: "list-add-symbolic" icon.name: "list-add-symbolic"
enabled: page.account.rememberOTP enabled: page.account.rememberOTP
visible: generateOTPField.visible
Kirigami.PromptDialog { Kirigami.PromptDialog {
id: otpDialog id: otpDialog
title: i18n("Enter OTP Secret") title: i18n("Enter OTP Secret")
@ -176,7 +184,7 @@ Kirigami.ScrollablePage {
MobileForm.FormButtonDelegate { MobileForm.FormButtonDelegate {
text: i18n("Delete Account") text: i18n("Delete Account")
description: !enabled ? i18n("Cannot delete the only account") : "" description: !enabled ? i18n("Cannot delete the only account.") : ""
icon.name: "delete" icon.name: "delete"
enabled: LauncherCore.accountManager.canDelete(page.account) enabled: LauncherCore.accountManager.canDelete(page.account)
onClicked: { onClicked: {

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

@ -59,7 +59,6 @@ Kirigami.ScrollablePage {
text: i18n("Encrypt Game Arguments") text: i18n("Encrypt Game Arguments")
checked: page.profile.argumentsEncrypted checked: page.profile.argumentsEncrypted
onCheckedChanged: page.profile.argumentsEncrypted = checked onCheckedChanged: page.profile.argumentsEncrypted = checked
enabled: false
} }
MobileForm.FormDelegateSeparator {} MobileForm.FormDelegateSeparator {}
@ -70,9 +69,12 @@ Kirigami.ScrollablePage {
checked: page.profile.watchdogEnabled checked: page.profile.watchdogEnabled
onCheckedChanged: page.profile.watchdogEnabled = checked onCheckedChanged: page.profile.watchdogEnabled = checked
enabled: false enabled: false
visible: false
} }
MobileForm.FormDelegateSeparator {} MobileForm.FormDelegateSeparator {
visible: false
}
MobileForm.FormTextDelegate { MobileForm.FormTextDelegate {
description: page.profile.expansionVersionText description: page.profile.expansionVersionText
@ -146,14 +148,19 @@ Kirigami.ScrollablePage {
description: i18n("A micro-compositor that uses Wayland to create a nested session.\nIf you use fullscreen mode, it may improve input handling.") description: i18n("A micro-compositor that uses Wayland to create a nested session.\nIf you use fullscreen mode, it may improve input handling.")
checked: page.profile.gamescopeEnabled checked: page.profile.gamescopeEnabled
onCheckedChanged: page.profile.gamescopeEnabled = checked onCheckedChanged: page.profile.gamescopeEnabled = checked
visible: false
enabled: false
} }
MobileForm.FormDelegateSeparator {} MobileForm.FormDelegateSeparator {
visible: false
}
MobileForm.FormButtonDelegate { MobileForm.FormButtonDelegate {
text: i18n("Configure Gamescope...") text: i18n("Configure Gamescope...")
icon.name: "configure" icon.name: "configure"
enabled: page.profile.gamescopeEnabled enabled: false
visible: false
Kirigami.PromptDialog { Kirigami.PromptDialog {
id: gamescopeSettingsDialog id: gamescopeSettingsDialog
title: i18n("Configure Gamescope") title: i18n("Configure Gamescope")
@ -193,7 +200,9 @@ Kirigami.ScrollablePage {
onClicked: gamescopeSettingsDialog.open() onClicked: gamescopeSettingsDialog.open()
} }
MobileForm.FormDelegateSeparator {} MobileForm.FormDelegateSeparator {
visible: false
}
MobileForm.FormCheckDelegate { MobileForm.FormCheckDelegate {
text: i18n("Enable Gamemode") text: i18n("Enable Gamemode")
@ -253,7 +262,7 @@ Kirigami.ScrollablePage {
MobileForm.FormButtonDelegate { MobileForm.FormButtonDelegate {
text: i18n("Delete Profile") text: i18n("Delete Profile")
description: !enabled ? i18n("Cannot delete the only profile") : "" description: !enabled ? i18n("Cannot delete the only profile.") : ""
icon.name: "delete" icon.name: "delete"
enabled: LauncherCore.profileManager.canDelete(page.profile) enabled: LauncherCore.profileManager.canDelete(page.profile)
onClicked: { onClicked: {