From becb5b928979a6ac51614e2bad26b75b2f0ca9a5 Mon Sep 17 00:00:00 2001
From: Joshua Goins <josh@redstrate.com>
Date: Thu, 28 Mar 2024 16:58:39 -0400
Subject: [PATCH] Move auto-login setting to the profiles page

It makes more sense to be put here because you select which profile to
login with.
---
 launcher/ui/Settings/GeneralSettings.qml | 37 ---------------------
 launcher/ui/Settings/ProfilesPage.qml    | 41 ++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/launcher/ui/Settings/GeneralSettings.qml b/launcher/ui/Settings/GeneralSettings.qml
index 3aee194..319697a 100644
--- a/launcher/ui/Settings/GeneralSettings.qml
+++ b/launcher/ui/Settings/GeneralSettings.qml
@@ -21,43 +21,6 @@ FormCard.FormCardPage {
     FormCard.FormCard {
         Layout.topMargin: Kirigami.Units.largeSpacing
 
-        FormCard.FormButtonDelegate {
-            text: i18n("Auto-login Profile")
-            description: LauncherCore.autoLoginProfile ? LauncherCore.autoLoginProfile.name : i18n("Disabled")
-
-            QQC2.Menu {
-                id: profileMenu
-
-                QQC2.MenuItem {
-                    text: "Disabled"
-
-                    onClicked: {
-                        LauncherCore.autoLoginProfile = null;
-                        profileMenu.close();
-                    }
-                }
-
-                Repeater {
-                    model: LauncherCore.profileManager
-
-                    QQC2.MenuItem {
-                        required property var profile
-
-                        text: profile.name
-
-                        onClicked: {
-                            LauncherCore.autoLoginProfile = profile;
-                            profileMenu.close();
-                        }
-                    }
-                }
-            }
-
-            onClicked: profileMenu.popup()
-        }
-
-        FormCard.FormDelegateSeparator {}
-
         FormCard.FormCheckDelegate {
             id: closeAstraDelegate
 
diff --git a/launcher/ui/Settings/ProfilesPage.qml b/launcher/ui/Settings/ProfilesPage.qml
index 7337927..5f26791 100644
--- a/launcher/ui/Settings/ProfilesPage.qml
+++ b/launcher/ui/Settings/ProfilesPage.qml
@@ -6,6 +6,7 @@ pragma ComponentBehavior: Bound
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.Window
+import QtQuick.Controls as QQC2
 
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.formcard as FormCard
@@ -28,6 +29,46 @@ FormCard.FormCardPage {
         }
     ]
 
+    FormCard.FormCard {
+        Layout.fillWidth: true
+        Layout.topMargin: Kirigami.Units.largeSpacing
+
+        FormCard.FormButtonDelegate {
+            text: i18n("Auto-login Profile")
+            description: LauncherCore.autoLoginProfile ? LauncherCore.autoLoginProfile.name : i18n("Disabled")
+
+            QQC2.Menu {
+                id: profileMenu
+
+                QQC2.MenuItem {
+                    text: "Disabled"
+
+                    onClicked: {
+                        LauncherCore.autoLoginProfile = null;
+                        profileMenu.close();
+                    }
+                }
+
+                Repeater {
+                    model: LauncherCore.profileManager
+
+                    QQC2.MenuItem {
+                        required property var profile
+
+                        text: profile.name
+
+                        onClicked: {
+                            LauncherCore.autoLoginProfile = profile;
+                            profileMenu.close();
+                        }
+                    }
+                }
+            }
+
+            onClicked: profileMenu.popup()
+        }
+    }
+
     FormCard.FormCard {
         Layout.fillWidth: true
         Layout.topMargin: Kirigami.Units.largeSpacing