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

Remove unnecessary mobileform separators

Browse source
This commit is contained in:
Joshua Goins 2023-07-30 10:13:42 -04:00
parent 682d6b8aa6
commit 6142429623
4 changed files with 25 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,8 +29,6 @@ Kirigami.ScrollablePage {
title: i18n("General") title: i18n("General")
} }
MobileForm.FormDelegateSeparator {
}
MobileForm.FormTextFieldDelegate { MobileForm.FormTextFieldDelegate {
label: i18n("Username") label: i18n("Username")
@ -38,8 +36,7 @@ Kirigami.ScrollablePage {
onTextChanged: page.account.name = text onTextChanged: page.account.name = text
} }
MobileForm.FormDelegateSeparator { MobileForm.FormDelegateSeparator {}
}
MobileForm.FormComboBoxDelegate { MobileForm.FormComboBoxDelegate {
text: i18n("Account type") text: i18n("Account type")
@ -48,8 +45,7 @@ Kirigami.ScrollablePage {
onCurrentIndexChanged: page.account.isSapphire = (currentIndex === 1) onCurrentIndexChanged: page.account.isSapphire = (currentIndex === 1)
} }
MobileForm.FormDelegateSeparator { MobileForm.FormDelegateSeparator {}
}
MobileForm.FormComboBoxDelegate { MobileForm.FormComboBoxDelegate {
id: licenseField id: licenseField
@ -110,8 +106,7 @@ Kirigami.ScrollablePage {
onClicked: lodestoneDialog.open() onClicked: lodestoneDialog.open()
} }
MobileForm.FormDelegateSeparator { MobileForm.FormDelegateSeparator {}
}
MobileForm.FormTextFieldDelegate { MobileForm.FormTextFieldDelegate {
label: i18n("Lobby URL") label: i18n("Lobby URL")
@ -133,17 +128,13 @@ Kirigami.ScrollablePage {
title: i18n("Login") title: i18n("Login")
} }
MobileForm.FormDelegateSeparator {
}
MobileForm.FormCheckDelegate { MobileForm.FormCheckDelegate {
text: i18n("Remember password") text: i18n("Remember password")
checked: page.account.rememberPassword checked: page.account.rememberPassword
onCheckedChanged: page.account.rememberPassword = checked onCheckedChanged: page.account.rememberPassword = checked
} }
MobileForm.FormDelegateSeparator { MobileForm.FormDelegateSeparator {}
}
MobileForm.FormCheckDelegate { MobileForm.FormCheckDelegate {
text: i18n("Automatically generate one-time passwords") text: i18n("Automatically generate one-time passwords")
@ -152,8 +143,7 @@ Kirigami.ScrollablePage {
enabled: page.account.useOTP enabled: page.account.useOTP
} }
MobileForm.FormDelegateSeparator { MobileForm.FormDelegateSeparator {}
}
MobileForm.FormButtonDelegate { MobileForm.FormButtonDelegate {
text: i18n("Enter OTP Secret") text: i18n("Enter OTP Secret")

9
launcher/ui/Settings/GeneralSettings.qml
View file

@ -19,17 +19,13 @@ MobileForm.FormCard {
title: i18n("General") title: i18n("General")
} }
MobileForm.FormDelegateSeparator {
}
MobileForm.FormCheckDelegate { MobileForm.FormCheckDelegate {
text: i18n("Close Astra when game is launched") text: i18n("Close Astra when game is launched")
checked: LauncherCore.closeWhenLaunched checked: LauncherCore.closeWhenLaunched
onCheckedChanged: LauncherCore.closeWhenLaunched = checked onCheckedChanged: LauncherCore.closeWhenLaunched = checked
} }
MobileForm.FormDelegateSeparator { MobileForm.FormDelegateSeparator {}
}
MobileForm.FormCheckDelegate { MobileForm.FormCheckDelegate {
text: i18n("Show news banners") text: i18n("Show news banners")
@ -37,8 +33,7 @@ MobileForm.FormCard {
onCheckedChanged: LauncherCore.showNewsBanners = checked onCheckedChanged: LauncherCore.showNewsBanners = checked
} }
MobileForm.FormDelegateSeparator { MobileForm.FormDelegateSeparator {}
}
MobileForm.FormCheckDelegate { MobileForm.FormCheckDelegate {
text: i18n("Show news list") text: i18n("Show news list")

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

@ -37,16 +37,14 @@ Kirigami.ScrollablePage {
onTextChanged: page.profile.name = text onTextChanged: page.profile.name = text
} }
MobileForm.FormDelegateSeparator { MobileForm.FormDelegateSeparator {}
}
FormFolderDelegate { FormFolderDelegate {
text: i18n("Game Path") text: i18n("Game Path")
folder: page.profile.gamePath folder: page.profile.gamePath
} }
MobileForm.FormDelegateSeparator { MobileForm.FormDelegateSeparator {}
}
MobileForm.FormComboBoxDelegate { MobileForm.FormComboBoxDelegate {
text: i18n("DirectX Version") text: i18n("DirectX Version")
@ -55,8 +53,7 @@ Kirigami.ScrollablePage {
onCurrentIndexChanged: page.profile.directx9Enabled = (currentIndex === 1) onCurrentIndexChanged: page.profile.directx9Enabled = (currentIndex === 1)
} }
MobileForm.FormDelegateSeparator { MobileForm.FormDelegateSeparator {}
}
MobileForm.FormCheckDelegate { MobileForm.FormCheckDelegate {
text: i18n("Encrypt Game Arguments") text: i18n("Encrypt Game Arguments")
@ -65,8 +62,7 @@ Kirigami.ScrollablePage {
enabled: false enabled: false
} }
MobileForm.FormDelegateSeparator { MobileForm.FormDelegateSeparator {}
}
MobileForm.FormCheckDelegate { MobileForm.FormCheckDelegate {
text: i18n("Enable Watchdog") text: i18n("Enable Watchdog")
@ -76,8 +72,7 @@ Kirigami.ScrollablePage {
enabled: false enabled: false
} }
MobileForm.FormDelegateSeparator { MobileForm.FormDelegateSeparator {}
}
MobileForm.FormTextDelegate { MobileForm.FormTextDelegate {
description: page.profile.expansionVersionText description: page.profile.expansionVersionText
@ -103,8 +98,7 @@ Kirigami.ScrollablePage {
enabled: !LauncherCore.isSteam enabled: !LauncherCore.isSteam
} }
MobileForm.FormDelegateSeparator { MobileForm.FormDelegateSeparator {}
}
FormFileDelegate { FormFileDelegate {
text: i18n("Wine Path") text: i18n("Wine Path")
@ -112,8 +106,7 @@ Kirigami.ScrollablePage {
enabled: !LauncherCore.isSteam enabled: !LauncherCore.isSteam
} }
MobileForm.FormDelegateSeparator { MobileForm.FormDelegateSeparator {}
}
FormFolderDelegate { FormFolderDelegate {
text: i18n("Wine Prefix Path") text: i18n("Wine Prefix Path")
@ -121,8 +114,7 @@ Kirigami.ScrollablePage {
enabled: !LauncherCore.isSteam enabled: !LauncherCore.isSteam
} }
MobileForm.FormDelegateSeparator { MobileForm.FormDelegateSeparator {}
}
MobileForm.FormTextDelegate { MobileForm.FormTextDelegate {
description: page.profile.wineVersionText description: page.profile.wineVersionText
@ -147,8 +139,7 @@ Kirigami.ScrollablePage {
onCheckedChanged: page.profile.esyncEnabled = checked onCheckedChanged: page.profile.esyncEnabled = checked
} }
MobileForm.FormDelegateSeparator { MobileForm.FormDelegateSeparator {}
}
MobileForm.FormCheckDelegate { MobileForm.FormCheckDelegate {
text: i18n("Enable Gamescope") text: i18n("Enable Gamescope")
@ -157,8 +148,7 @@ Kirigami.ScrollablePage {
onCheckedChanged: page.profile.gamescopeEnabled = checked onCheckedChanged: page.profile.gamescopeEnabled = checked
} }
MobileForm.FormDelegateSeparator { MobileForm.FormDelegateSeparator {}
}
MobileForm.FormButtonDelegate { MobileForm.FormButtonDelegate {
text: i18n("Configure Gamescope...") text: i18n("Configure Gamescope...")
@ -203,8 +193,7 @@ Kirigami.ScrollablePage {
onClicked: gamescopeSettingsDialog.open() onClicked: gamescopeSettingsDialog.open()
} }
MobileForm.FormDelegateSeparator { MobileForm.FormDelegateSeparator {}
}
MobileForm.FormCheckDelegate { MobileForm.FormCheckDelegate {
text: i18n("Enable Gamemode") text: i18n("Enable Gamemode")
@ -231,8 +220,7 @@ Kirigami.ScrollablePage {
onCheckedChanged: page.profile.dalamudEnabled = checked onCheckedChanged: page.profile.dalamudEnabled = checked
} }
MobileForm.FormDelegateSeparator { MobileForm.FormDelegateSeparator {}
}
MobileForm.FormComboBoxDelegate { MobileForm.FormComboBoxDelegate {
text: i18n("Update Channel") text: i18n("Update Channel")
@ -241,8 +229,7 @@ Kirigami.ScrollablePage {
onCurrentIndexChanged: page.profile.dalamudChannel = currentIndex onCurrentIndexChanged: page.profile.dalamudChannel = currentIndex
} }
MobileForm.FormDelegateSeparator { MobileForm.FormDelegateSeparator {}
}
MobileForm.FormCheckDelegate { MobileForm.FormCheckDelegate {
text: i18n("Opt Out of Automatic Marketboard Collection") text: i18n("Opt Out of Automatic Marketboard Collection")
@ -250,8 +237,7 @@ Kirigami.ScrollablePage {
onCheckedChanged: page.profile.dalamudOptOut = checked onCheckedChanged: page.profile.dalamudOptOut = checked
} }
MobileForm.FormDelegateSeparator { MobileForm.FormDelegateSeparator {}
}
MobileForm.FormTextDelegate { MobileForm.FormTextDelegate {
description: page.profile.dalamudVersionText description: page.profile.dalamudVersionText

12
launcher/ui/Settings/SettingsPage.qml
View file

@ -17,8 +17,7 @@ Kirigami.ScrollablePage {
ColumnLayout { ColumnLayout {
width: parent.width width: parent.width
GeneralSettings { GeneralSettings {}
}
MobileForm.FormCard { MobileForm.FormCard {
Layout.topMargin: Kirigami.Units.largeSpacing Layout.topMargin: Kirigami.Units.largeSpacing
@ -43,8 +42,7 @@ Kirigami.ScrollablePage {
} }
} }
MobileForm.FormDelegateSeparator { MobileForm.FormDelegateSeparator {}
}
MobileForm.FormButtonDelegate { MobileForm.FormButtonDelegate {
text: i18n("Add Profile") text: i18n("Add Profile")
@ -88,8 +86,7 @@ Kirigami.ScrollablePage {
} }
} }
MobileForm.FormDelegateSeparator { MobileForm.FormDelegateSeparator {}
}
MobileForm.FormButtonDelegate { MobileForm.FormButtonDelegate {
text: i18n("Add Square Enix Account") text: i18n("Add Square Enix Account")
@ -97,8 +94,7 @@ Kirigami.ScrollablePage {
onClicked: pageStack.layers.push('qrc:/ui/Setup/AddSquareEnix.qml') onClicked: pageStack.layers.push('qrc:/ui/Setup/AddSquareEnix.qml')
} }
MobileForm.FormDelegateSeparator { MobileForm.FormDelegateSeparator {}
}
MobileForm.FormButtonDelegate { MobileForm.FormButtonDelegate {
text: i18n("Add Sapphire Account") text: i18n("Add Sapphire Account")