From 23db248d82d0dd9b9ee77ea857930db4a2bf5498 Mon Sep 17 00:00:00 2001
From: Joshua Goins <josh@redstrate.com>
Date: Wed, 20 Sep 2023 15:30:50 -0400
Subject: [PATCH] Fix settings page names

---
 launcher/ui/Settings/AccountSettings.qml        |  2 +-
 launcher/ui/Settings/AccountsPage.qml           |  5 ++---
 launcher/ui/Settings/CompatibilityToolSetup.qml |  7 ++-----
 launcher/ui/Settings/DeveloperSettings.qml      |  2 +-
 launcher/ui/Settings/GeneralSettings.qml        | 10 +++++-----
 launcher/ui/Settings/ProfileSettings.qml        |  2 +-
 launcher/ui/Settings/ProfilesPage.qml           |  8 +++-----
 7 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/launcher/ui/Settings/AccountSettings.qml b/launcher/ui/Settings/AccountSettings.qml
index c39dcdd..470e1a0 100644
--- a/launcher/ui/Settings/AccountSettings.qml
+++ b/launcher/ui/Settings/AccountSettings.qml
@@ -15,7 +15,7 @@ FormCard.FormCardPage {
 
     property var account
 
-    title: i18n("Account Settings")
+    title: i18nc("@title:window", "Edit Account")
 
     FormCard.FormHeader {
         title: i18n("General")
diff --git a/launcher/ui/Settings/AccountsPage.qml b/launcher/ui/Settings/AccountsPage.qml
index 739b875..2ac401c 100644
--- a/launcher/ui/Settings/AccountsPage.qml
+++ b/launcher/ui/Settings/AccountsPage.qml
@@ -11,12 +11,11 @@ import org.kde.kirigamiaddons.components as Components
 import zone.xiv.astra
 
 FormCard.FormCardPage {
-    FormCard.FormHeader {
-        title: i18n("Accounts")
-    }
+    title: i18nc("@title:window", "Accounts")
 
     FormCard.FormCard {
         Layout.fillWidth: true
+        Layout.topMargin: Kirigami.Units.largeSpacing
 
         Repeater {
             model: LauncherCore.accountManager
diff --git a/launcher/ui/Settings/CompatibilityToolSetup.qml b/launcher/ui/Settings/CompatibilityToolSetup.qml
index 136fa35..85c319a 100644
--- a/launcher/ui/Settings/CompatibilityToolSetup.qml
+++ b/launcher/ui/Settings/CompatibilityToolSetup.qml
@@ -14,14 +14,11 @@ FormCard.FormCardPage {
 
     property var installer: null
 
-    title: i18n("Install Compatibility Tool")
-
-    FormCard.FormHeader {
-        title: i18n("Compatibility Tool")
-    }
+    title: i18nc("@title:window", "Compatibility Tool")
 
     FormCard.FormCard {
         Layout.fillWidth: true
+        Layout.topMargin: Kirigami.Units.largeSpacing
 
         FormCard.FormTextDelegate {
             text: i18n("Press the button below to install the compatibility tool for Steam.")
diff --git a/launcher/ui/Settings/DeveloperSettings.qml b/launcher/ui/Settings/DeveloperSettings.qml
index 4298249..5a860b2 100644
--- a/launcher/ui/Settings/DeveloperSettings.qml
+++ b/launcher/ui/Settings/DeveloperSettings.qml
@@ -14,7 +14,7 @@ import "../Components"
 FormCard.FormCardPage {
     id: page
 
-    title: i18n("Developer Settings")
+    title: i18nc("@title:window", "Developer Settings")
 
     FormCard.FormHeader {
         title: i18n("Patching")
diff --git a/launcher/ui/Settings/GeneralSettings.qml b/launcher/ui/Settings/GeneralSettings.qml
index 92aa6a5..d41bb10 100644
--- a/launcher/ui/Settings/GeneralSettings.qml
+++ b/launcher/ui/Settings/GeneralSettings.qml
@@ -3,19 +3,19 @@
 
 import QtQuick
 import QtQuick.Controls as QQC2
+import QtQuick.Layouts
 
+import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.formcard as FormCard
 
 import zone.xiv.astra
 
 FormCard.FormCardPage {
-    title: i18n("General")
-
-    FormCard.FormHeader {
-        title: i18n("General settings")
-    }
+    title: i18nc("@title:window", "General")
 
     FormCard.FormCard {
+        Layout.topMargin: Kirigami.Units.largeSpacing
+
         FormCard.FormButtonDelegate {
             text: i18n("Auto-login Profile")
             description: LauncherCore.autoLoginProfile ? LauncherCore.autoLoginProfile.name : i18n("Disabled")
diff --git a/launcher/ui/Settings/ProfileSettings.qml b/launcher/ui/Settings/ProfileSettings.qml
index e2cd337..307e75b 100644
--- a/launcher/ui/Settings/ProfileSettings.qml
+++ b/launcher/ui/Settings/ProfileSettings.qml
@@ -17,7 +17,7 @@ FormCard.FormCardPage {
 
     property var profile
 
-    title: i18n("Profile Settings")
+    title: i18nc("@window:title", "Edit Profile")
 
     FormCard.FormHeader {
         title: i18n("General")
diff --git a/launcher/ui/Settings/ProfilesPage.qml b/launcher/ui/Settings/ProfilesPage.qml
index aa62dde..27346bd 100644
--- a/launcher/ui/Settings/ProfilesPage.qml
+++ b/launcher/ui/Settings/ProfilesPage.qml
@@ -4,19 +4,17 @@
 import QtQuick
 import QtQuick.Layouts
 
+import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.formcard as FormCard
 
 import zone.xiv.astra
 
 FormCard.FormCardPage {
-    title: i18n("General")
-
-    FormCard.FormHeader {
-        title: i18n("Profiles")
-    }
+    title: i18nc("@title:window", "Profiles")
 
     FormCard.FormCard {
         Layout.fillWidth: true
+        Layout.topMargin: Kirigami.Units.largeSpacing
 
         Repeater {
             model: LauncherCore.profileManager