Port general settings page to FormCard

src/qml/Settings/GeneralSettingsPage.qml

@@ -6,28 +6,19 @@ import QtQuick 2.15
 import QtQuick.Layouts 1.15
 
 import org.kde.kirigami 2.15 as Kirigami
-import org.kde.kirigamiaddons.labs.mobileform 0.1 as MobileForm
+import org.kde.kirigamiaddons.formcard 1.0 as FormCard
 
 import org.kde.neochat 1.0
 
-Kirigami.ScrollablePage {
+FormCard.FormCardPage {
     title: i18nc("@title:window", "General")
-    topPadding: 0
-    leftPadding: 0
-    rightPadding: 0
-    ColumnLayout {
-        spacing: 0
-        MobileForm.FormHeader {
-            Layout.fillWidth: true
+
+    FormCard.FormHeader {
         title: i18n("General settings")
         visible: Qt.platform.os !== "android"
     }
-        MobileForm.FormCard {
-            Layout.fillWidth: true
-            contentItem: ColumnLayout {
-                spacing: 0
-
-                MobileForm.FormCheckDelegate {
+    FormCard.FormCard {
+        FormCard.FormCheckDelegate {
             id: closeDelegate
             text: i18n("Show in System Tray")
             checked: Config.systemTray
@@ -39,9 +30,9 @@ Kirigami.ScrollablePage {
             }
         }
 
-                MobileForm.FormDelegateSeparator { above: closeDelegate; below: minimizeDelegate }
+        FormCard.FormDelegateSeparator { above: closeDelegate; below: minimizeDelegate }
 
-                MobileForm.FormCheckDelegate {
+        FormCard.FormCheckDelegate {
             id: minimizeDelegate
             text: i18n("Minimize to system tray on startup")
             checked: Config.minimizeToSystemTrayOnStartup
@@ -53,9 +44,9 @@ Kirigami.ScrollablePage {
             }
         }
 
-                MobileForm.FormDelegateSeparator { above: minimizeDelegate; below: automaticallyDelegate }
+        FormCard.FormDelegateSeparator { above: minimizeDelegate; below: automaticallyDelegate }
 
-                MobileForm.FormCheckDelegate {
+        FormCard.FormCheckDelegate {
             id: automaticallyDelegate
             text: i18n("Automatically hide/unhide the room information when resizing the window")
             checked: Config.autoRoomInfoDrawer
@@ -67,17 +58,11 @@ Kirigami.ScrollablePage {
             }
         }
     }
-        }
-        MobileForm.FormHeader {
-            Layout.fillWidth: true
+    FormCard.FormHeader {
         title: i18n("Timeline Events")
     }
-        MobileForm.FormCard {
-            Layout.fillWidth: true
-            contentItem: ColumnLayout {
-                spacing: 0
-
-                MobileForm.FormCheckDelegate {
+    FormCard.FormCard {
+        FormCard.FormCheckDelegate {
             id: showDeletedMessages
             text: i18n("Show deleted messages")
             checked: Config.showDeletedMessages
@@ -88,9 +73,9 @@ Kirigami.ScrollablePage {
             }
         }
 
-                MobileForm.FormDelegateSeparator { above: showDeletedMessages; below: showStateEvents }
+        FormCard.FormDelegateSeparator { above: showDeletedMessages; below: showStateEvents }
 
-                MobileForm.FormCheckDelegate {
+        FormCard.FormCheckDelegate {
             id: showStateEvents
             text: i18n("Show state events")
             checked: Config.showStateEvent
@@ -101,12 +86,12 @@ Kirigami.ScrollablePage {
             }
         }
 
-                MobileForm.FormDelegateSeparator {
+        FormCard.FormDelegateSeparator {
             visible: Config.showStateEvent
             above: showStateEvents
             below: showLeaveJoinEventDelegate }
 
-                MobileForm.FormCheckDelegate {
+        FormCard.FormCheckDelegate {
             id: showLeaveJoinEventDelegate
             visible: Config.showStateEvent
             text: i18n("Show leave and join events")
@@ -118,13 +103,13 @@ Kirigami.ScrollablePage {
             }
         }
 
-                MobileForm.FormDelegateSeparator {
+        FormCard.FormDelegateSeparator {
             visible: Config.showStateEvent
             above: showLeaveJoinEventDelegate
             below: showNameDelegate
         }
 
-                MobileForm.FormCheckDelegate {
+        FormCard.FormCheckDelegate {
             id: showNameDelegate
             visible: Config.showStateEvent
             text: i18n("Show name change events")
@@ -136,13 +121,13 @@ Kirigami.ScrollablePage {
             }
         }
 
-                MobileForm.FormDelegateSeparator {
+        FormCard.FormDelegateSeparator {
             visible: Config.showStateEvent
             above: showNameDelegate
             below: showAvatarChangeDelegate
         }
 
-                MobileForm.FormCheckDelegate {
+        FormCard.FormCheckDelegate {
             id: showAvatarChangeDelegate
             visible: Config.showStateEvent
             text: i18n("Show avatar update events")
@@ -154,16 +139,11 @@ Kirigami.ScrollablePage {
             }
         }
     }
-        }
-        MobileForm.FormHeader {
-            Layout.fillWidth: true
+    FormCard.FormHeader {
         title: i18n("Rooms and private chats")
     }
-        MobileForm.FormCard {
-            Layout.fillWidth: true
-            contentItem: ColumnLayout {
-                spacing: 0
-                MobileForm.FormRadioDelegate {
+    FormCard.FormCard {
+        FormCard.FormRadioDelegate {
             text: i18n("Separated")
             checked: !Config.mergeRoomList
             enabled: !Config.isMergeRoomListImmutable
@@ -172,7 +152,7 @@ Kirigami.ScrollablePage {
                 Config.save()
             }
         }
-                MobileForm.FormRadioDelegate {
+        FormCard.FormRadioDelegate {
             text: i18n("Intermixed")
             checked: Config.mergeRoomList
             enabled: !Config.isMergeRoomListImmutable
@@ -182,16 +162,11 @@ Kirigami.ScrollablePage {
             }
         }
     }
-        }
-        MobileForm.FormHeader {
-            Layout.fillWidth: true
+    FormCard.FormHeader {
         title: i18nc("Chat Editor", "Editor")
     }
-        MobileForm.FormCard {
-            Layout.fillWidth: true
-            contentItem: ColumnLayout {
-                spacing: 0
-                MobileForm.FormCheckDelegate {
+    FormCard.FormCard {
+        FormCard.FormCheckDelegate {
             id: quickEditCheckbox
             text: i18n("Use s/text/replacement syntax to edit your last message")
             checked: Config.allowQuickEdit
@@ -201,8 +176,8 @@ Kirigami.ScrollablePage {
                 Config.save()
             }
         }
-                MobileForm.FormDelegateSeparator { above: quickEditCheckbox; below: typingNotificationsDelegate }
-                MobileForm.FormCheckDelegate {
+        FormCard.FormDelegateSeparator { above: quickEditCheckbox; below: typingNotificationsDelegate }
+        FormCard.FormCheckDelegate {
             id: typingNotificationsDelegate
             text: i18n("Send typing notifications")
             checked: Config.typingNotifications
@@ -213,16 +188,11 @@ Kirigami.ScrollablePage {
             }
         }
     }
-        }
-        MobileForm.FormHeader {
-            Layout.fillWidth: true
+    FormCard.FormHeader {
         title: i18n("Developer Settings")
     }
-        MobileForm.FormCard {
-            Layout.fillWidth: true
-            contentItem: ColumnLayout {
-                spacing: 0
-                MobileForm.FormCheckDelegate {
+    FormCard.FormCard {
+        FormCard.FormCheckDelegate {
             text: i18n("Enable developer tools")
             checked: Config.developerTools
             enabled: !Config.isDeveloperToolsImmutable
@@ -232,6 +202,4 @@ Kirigami.ScrollablePage {
             }
         }
     }
-        }
-    }
 }