Port devtools to FormCard

src/qml/Component/Devtools/RoomData.qml

@@ -6,28 +6,37 @@ import QtQuick.Controls 2.15 as QQC2
 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.kitemmodels 1.0
 
 import org.kde.neochat 1.0
 
 ColumnLayout {
-    MobileForm.FormCard {
+    id: root
-        Layout.fillWidth: true
+
-        contentItem: ColumnLayout {
+    required property NeoChatRoom room
-            spacing: 0
+
-            MobileForm.FormComboBoxDelegate {
+    FormCard.FormHeader {
+        title: i18nc("@title", "Choose Room")
+    }
+    FormCard.FormCard {
+        FormCard.FormComboBoxDelegate {
+            id: roomComboBox
             text: i18n("Room")
             textRole: "displayName"
-                valueRole: "id"
+            valueRole: "roomId"
             model: RoomListModel {
                 id: roomListModel
                 connection: Controller.activeConnection
             }
-                Component.onCompleted: currentIndex = indexOfValue(room.id)
+            currentIndex: -1
-                onCurrentValueChanged: room = roomListModel.roomByAliasOrId(currentValue)
+            Component.onCompleted: currentIndex = roomListModel.rowForRoom(root.room)
+            onCurrentValueChanged: root.room = roomListModel.roomByAliasOrId(roomComboBox.currentValue)
         }
-            MobileForm.FormCheckDelegate {
+        FormCard.FormTextDelegate {
+            text: i18n("Room Id: %1", root.room.id)
+        }
+        FormCard.FormCheckDelegate {
             text: i18n("Show m.room.member events")
             checked: true
             onToggled: {
@@ -38,28 +47,24 @@ ColumnLayout {
                 }
             }
         }
-            MobileForm.FormCheckDelegate {
+        FormCard.FormCheckDelegate {
-                id: roomAccoutnDataVisibleCheck
+            id: roomAccountDataVisibleCheck
             text: i18n("Show room account data")
             checked: false
         }
     }
+    FormCard.FormHeader {
+        visible: roomAccountDataVisibleCheck.checked
+        title: i18n("Room Account Data")
     }
-    MobileForm.FormCard {
+    FormCard.FormCard {
-        Layout.fillWidth: true
+        visible: roomAccountDataVisibleCheck.checked
-        visible: roomAccoutnDataVisibleCheck.checked
-        contentItem: ColumnLayout {
-            spacing: 0
-            MobileForm.FormCardHeader {
-                title: i18n("Room Account Data for %1 - %2", room.displayName, room.id)
-            }
-
         Repeater {
-                model: room.accountDataEventTypes
+            model: root.room.accountDataEventTypes
-                delegate: MobileForm.FormTextDelegate {
+            delegate: FormCard.FormButtonDelegate {
                 text: modelData
                 onClicked: applicationWindow().pageStack.pushDialogLayer("qrc:/MessageSourceSheet.qml", {
-                        "sourceText": room.roomAcountDataJson(text)
+                    "sourceText": root.room.roomAcountDataJson(text)
                 }, {
                     "title": i18n("Event Source"),
                     "width": Kirigami.Units.gridUnit * 25
@@ -67,37 +72,21 @@ ColumnLayout {
             }
         }
     }
-    }
+    FormCard.FormHeader {
-    MobileForm.FormCard {
-        Layout.fillWidth: true
-        Layout.fillHeight: true
-        contentItem: ColumnLayout {
-            spacing: 0
-            MobileForm.FormCardHeader {
         id: stateEventListHeader
-                title: i18n("Room State for %1", room.displayName)
+        title: i18n("Room State")
-                subtitle: room.id
     }
-            QQC2.ScrollView {
+    FormCard.FormCard {
-                Layout.fillWidth: true
+        Repeater {
-                Layout.fillHeight: true
-
-                // HACK: Hide unnecessary horizontal scrollbar (https://bugreports.qt.io/browse/QTBUG-83890)
-                QQC2.ScrollBar.horizontal.policy: QQC2.ScrollBar.AlwaysOff
-
-                ListView {
-                    id: stateEventListView
-                    clip: true
-
             model: StateFilterModel {
                 id: stateEventFilterModel
                 sourceModel: StateModel {
                     id: stateModel
-                            room: devtoolsPage.room
+                    room: root.room
                 }
             }
 
-                    delegate: MobileForm.FormTextDelegate {
+            delegate: FormCard.FormButtonDelegate {
                 text: model.type
                 description: model.stateKey
                 onClicked: applicationWindow().pageStack.pushDialogLayer('qrc:/MessageSourceSheet.qml', {
@@ -109,6 +98,4 @@ ColumnLayout {
             }
         }
     }
-        }
-    }
 }

src/qml/Component/Devtools/ServerData.qml

@@ -6,48 +6,37 @@ import QtQuick.Controls 2.15 as QQC2
 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.kitemmodels 1.0
 
 import org.kde.neochat 1.0
 
 ColumnLayout {
-    MobileForm.FormCard {
+    FormCard.FormHeader {
-        Layout.fillWidth: true
-        contentItem: ColumnLayout {
-            spacing: 0
-            MobileForm.FormCardHeader {
         title: i18n("Server Capabilities")
     }
-            MobileForm.FormTextDelegate {
+    FormCard.FormCard {
+        FormCard.FormTextDelegate {
             text: i18n("Can change password")
             description: Controller.activeConnection.canChangePassword
         }
     }
-    }
+    FormCard.FormHeader {
-    MobileForm.FormCard {
-        Layout.fillWidth: true
-        contentItem: ColumnLayout {
-            spacing: 0
-            MobileForm.FormCardHeader {
         title: i18n("Default Room Version")
     }
-            MobileForm.FormTextDelegate {
+    FormCard.FormCard {
+        FormCard.FormTextDelegate {
             text: Controller.activeConnection.defaultRoomVersion
         }
     }
-    }
+    FormCard.FormHeader {
-    MobileForm.FormCard {
-        Layout.fillWidth: true
-        contentItem: ColumnLayout {
-            spacing: 0
-            MobileForm.FormCardHeader {
         title: i18n("Available Room Versions")
     }
+    FormCard.FormCard {
         Repeater {
-                model: Controller.getSupportedRoomVersions(room.connection)
+            model: room.connection.getSupportedRoomVersions()
 
-                delegate: MobileForm.FormTextDelegate {
+            delegate: FormCard.FormTextDelegate {
                 text: modelData.id
                 contentItem.children: QQC2.Label {
                     text: modelData.status
@@ -56,8 +45,4 @@ ColumnLayout {
             }
         }
     }
-    }
-    Item {
-        Layout.fillHeight: true
-    }
 }

src/qml/Page/DevtoolsPage.qml

@@ -6,11 +6,12 @@ import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.15
 
 import org.kde.kirigami 2.20 as Kirigami
+import org.kde.kirigamiaddons.formcard 1.0 as FormCard
 
 import org.kde.neochat 1.0
 
-Kirigami.Page {
+FormCard.FormCardPage {
-    id: devtoolsPage
+    id: root
 
     property NeoChatRoom room
 
@@ -32,11 +33,12 @@ Kirigami.Page {
 
     StackLayout {
         id: swipeView
-        anchors.fill: parent
 
         currentIndex: tabBar.currentIndex
 
-        RoomData {}
+        RoomData {
+            room: root.room
+        }
         ServerData {}
     }
 }