From 61424296233a00afdedb82d3125bc23a4f3892aa Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Sun, 30 Jul 2023 10:13:42 -0400 Subject: [PATCH] Remove unnecessary mobileform separators --- launcher/ui/Settings/AccountSettings.qml | 20 +++-------- launcher/ui/Settings/GeneralSettings.qml | 9 ++--- launcher/ui/Settings/ProfileSettings.qml | 42 ++++++++---------------- launcher/ui/Settings/SettingsPage.qml | 12 +++---- 4 files changed, 25 insertions(+), 58 deletions(-) diff --git a/launcher/ui/Settings/AccountSettings.qml b/launcher/ui/Settings/AccountSettings.qml index 6fd2dec..086fb29 100644 --- a/launcher/ui/Settings/AccountSettings.qml +++ b/launcher/ui/Settings/AccountSettings.qml @@ -29,8 +29,6 @@ Kirigami.ScrollablePage { title: i18n("General") } - MobileForm.FormDelegateSeparator { - } MobileForm.FormTextFieldDelegate { label: i18n("Username") @@ -38,8 +36,7 @@ Kirigami.ScrollablePage { onTextChanged: page.account.name = text } - MobileForm.FormDelegateSeparator { - } + MobileForm.FormDelegateSeparator {} MobileForm.FormComboBoxDelegate { text: i18n("Account type") @@ -48,8 +45,7 @@ Kirigami.ScrollablePage { onCurrentIndexChanged: page.account.isSapphire = (currentIndex === 1) } - MobileForm.FormDelegateSeparator { - } + MobileForm.FormDelegateSeparator {} MobileForm.FormComboBoxDelegate { id: licenseField @@ -110,8 +106,7 @@ Kirigami.ScrollablePage { onClicked: lodestoneDialog.open() } - MobileForm.FormDelegateSeparator { - } + MobileForm.FormDelegateSeparator {} MobileForm.FormTextFieldDelegate { label: i18n("Lobby URL") @@ -133,17 +128,13 @@ Kirigami.ScrollablePage { title: i18n("Login") } - MobileForm.FormDelegateSeparator { - } - MobileForm.FormCheckDelegate { text: i18n("Remember password") checked: page.account.rememberPassword onCheckedChanged: page.account.rememberPassword = checked } - MobileForm.FormDelegateSeparator { - } + MobileForm.FormDelegateSeparator {} MobileForm.FormCheckDelegate { text: i18n("Automatically generate one-time passwords") @@ -152,8 +143,7 @@ Kirigami.ScrollablePage { enabled: page.account.useOTP } - MobileForm.FormDelegateSeparator { - } + MobileForm.FormDelegateSeparator {} MobileForm.FormButtonDelegate { text: i18n("Enter OTP Secret") diff --git a/launcher/ui/Settings/GeneralSettings.qml b/launcher/ui/Settings/GeneralSettings.qml index b7d705d..f5af60d 100644 --- a/launcher/ui/Settings/GeneralSettings.qml +++ b/launcher/ui/Settings/GeneralSettings.qml @@ -19,17 +19,13 @@ MobileForm.FormCard { title: i18n("General") } - MobileForm.FormDelegateSeparator { - } - MobileForm.FormCheckDelegate { text: i18n("Close Astra when game is launched") checked: LauncherCore.closeWhenLaunched onCheckedChanged: LauncherCore.closeWhenLaunched = checked } - MobileForm.FormDelegateSeparator { - } + MobileForm.FormDelegateSeparator {} MobileForm.FormCheckDelegate { text: i18n("Show news banners") @@ -37,8 +33,7 @@ MobileForm.FormCard { onCheckedChanged: LauncherCore.showNewsBanners = checked } - MobileForm.FormDelegateSeparator { - } + MobileForm.FormDelegateSeparator {} MobileForm.FormCheckDelegate { text: i18n("Show news list") diff --git a/launcher/ui/Settings/ProfileSettings.qml b/launcher/ui/Settings/ProfileSettings.qml index cef92dd..f6c1e2f 100644 --- a/launcher/ui/Settings/ProfileSettings.qml +++ b/launcher/ui/Settings/ProfileSettings.qml @@ -37,16 +37,14 @@ Kirigami.ScrollablePage { onTextChanged: page.profile.name = text } - MobileForm.FormDelegateSeparator { - } + MobileForm.FormDelegateSeparator {} FormFolderDelegate { text: i18n("Game Path") folder: page.profile.gamePath } - MobileForm.FormDelegateSeparator { - } + MobileForm.FormDelegateSeparator {} MobileForm.FormComboBoxDelegate { text: i18n("DirectX Version") @@ -55,8 +53,7 @@ Kirigami.ScrollablePage { onCurrentIndexChanged: page.profile.directx9Enabled = (currentIndex === 1) } - MobileForm.FormDelegateSeparator { - } + MobileForm.FormDelegateSeparator {} MobileForm.FormCheckDelegate { text: i18n("Encrypt Game Arguments") @@ -65,8 +62,7 @@ Kirigami.ScrollablePage { enabled: false } - MobileForm.FormDelegateSeparator { - } + MobileForm.FormDelegateSeparator {} MobileForm.FormCheckDelegate { text: i18n("Enable Watchdog") @@ -76,8 +72,7 @@ Kirigami.ScrollablePage { enabled: false } - MobileForm.FormDelegateSeparator { - } + MobileForm.FormDelegateSeparator {} MobileForm.FormTextDelegate { description: page.profile.expansionVersionText @@ -103,8 +98,7 @@ Kirigami.ScrollablePage { enabled: !LauncherCore.isSteam } - MobileForm.FormDelegateSeparator { - } + MobileForm.FormDelegateSeparator {} FormFileDelegate { text: i18n("Wine Path") @@ -112,8 +106,7 @@ Kirigami.ScrollablePage { enabled: !LauncherCore.isSteam } - MobileForm.FormDelegateSeparator { - } + MobileForm.FormDelegateSeparator {} FormFolderDelegate { text: i18n("Wine Prefix Path") @@ -121,8 +114,7 @@ Kirigami.ScrollablePage { enabled: !LauncherCore.isSteam } - MobileForm.FormDelegateSeparator { - } + MobileForm.FormDelegateSeparator {} MobileForm.FormTextDelegate { description: page.profile.wineVersionText @@ -147,8 +139,7 @@ Kirigami.ScrollablePage { onCheckedChanged: page.profile.esyncEnabled = checked } - MobileForm.FormDelegateSeparator { - } + MobileForm.FormDelegateSeparator {} MobileForm.FormCheckDelegate { text: i18n("Enable Gamescope") @@ -157,8 +148,7 @@ Kirigami.ScrollablePage { onCheckedChanged: page.profile.gamescopeEnabled = checked } - MobileForm.FormDelegateSeparator { - } + MobileForm.FormDelegateSeparator {} MobileForm.FormButtonDelegate { text: i18n("Configure Gamescope...") @@ -203,8 +193,7 @@ Kirigami.ScrollablePage { onClicked: gamescopeSettingsDialog.open() } - MobileForm.FormDelegateSeparator { - } + MobileForm.FormDelegateSeparator {} MobileForm.FormCheckDelegate { text: i18n("Enable Gamemode") @@ -231,8 +220,7 @@ Kirigami.ScrollablePage { onCheckedChanged: page.profile.dalamudEnabled = checked } - MobileForm.FormDelegateSeparator { - } + MobileForm.FormDelegateSeparator {} MobileForm.FormComboBoxDelegate { text: i18n("Update Channel") @@ -241,8 +229,7 @@ Kirigami.ScrollablePage { onCurrentIndexChanged: page.profile.dalamudChannel = currentIndex } - MobileForm.FormDelegateSeparator { - } + MobileForm.FormDelegateSeparator {} MobileForm.FormCheckDelegate { text: i18n("Opt Out of Automatic Marketboard Collection") @@ -250,8 +237,7 @@ Kirigami.ScrollablePage { onCheckedChanged: page.profile.dalamudOptOut = checked } - MobileForm.FormDelegateSeparator { - } + MobileForm.FormDelegateSeparator {} MobileForm.FormTextDelegate { description: page.profile.dalamudVersionText diff --git a/launcher/ui/Settings/SettingsPage.qml b/launcher/ui/Settings/SettingsPage.qml index 2deb22f..f91e1a8 100644 --- a/launcher/ui/Settings/SettingsPage.qml +++ b/launcher/ui/Settings/SettingsPage.qml @@ -17,8 +17,7 @@ Kirigami.ScrollablePage { ColumnLayout { width: parent.width - GeneralSettings { - } + GeneralSettings {} MobileForm.FormCard { Layout.topMargin: Kirigami.Units.largeSpacing @@ -43,8 +42,7 @@ Kirigami.ScrollablePage { } } - MobileForm.FormDelegateSeparator { - } + MobileForm.FormDelegateSeparator {} MobileForm.FormButtonDelegate { text: i18n("Add Profile") @@ -88,8 +86,7 @@ Kirigami.ScrollablePage { } } - MobileForm.FormDelegateSeparator { - } + MobileForm.FormDelegateSeparator {} MobileForm.FormButtonDelegate { text: i18n("Add Square Enix Account") @@ -97,8 +94,7 @@ Kirigami.ScrollablePage { onClicked: pageStack.layers.push('qrc:/ui/Setup/AddSquareEnix.qml') } - MobileForm.FormDelegateSeparator { - } + MobileForm.FormDelegateSeparator {} MobileForm.FormButtonDelegate { text: i18n("Add Sapphire Account")