Use Quotient qml module

src/app/qml/KeyVerificationDialog.qml

@@ -1,6 +1,8 @@
 // SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+pragma ComponentBehavior: Bound
+
 import QtQuick
 import QtQuick.Controls as QQC2
 import QtQuick.Layouts
@@ -8,8 +10,8 @@ import QtQuick.Window
 import QtQml
 
 import org.kde.kirigami as Kirigami
-import org.kde.kirigamiaddons.delegates as Delegates
 import org.kde.neochat
+import io.github.quotient_im.libquotient
 
 Kirigami.Page {
     id: root
@@ -23,72 +25,63 @@ Kirigami.Page {
             name: "cancelled"
             when: root.session.state === KeyVerificationSession.CANCELED
             PropertyChanges {
-                target: stateLoader
+                stateLoader.sourceComponent: verificationCanceled
-                sourceComponent: verificationCanceled
             }
         },
         State {
             name: "waitingForVerification"
             when: root.session.state === KeyVerificationSession.WAITINGFORVERIFICATION
             PropertyChanges {
-                target: stateLoader
+                stateLoader.sourceComponent: emojiSas
-                sourceComponent: emojiSas
             }
         },
         State {
             name: "waitingForReady"
             when: root.session.state === KeyVerificationSession.WAITINGFORREADY
             PropertyChanges {
-                target: stateLoader
+                stateLoader.sourceComponent: message
-                sourceComponent: message
             }
         },
         State {
             name: "incoming"
             when: root.session.state === KeyVerificationSession.INCOMING
             PropertyChanges {
-                target: stateLoader
+                stateLoader.sourceComponent: message
-                sourceComponent: message
             }
         },
         State {
             name: "waitingForKey"
             when: root.session.state === KeyVerificationSession.WAITINGFORKEY
             PropertyChanges {
-                target: stateLoader
+                stateLoader.sourceComponent: message
-                sourceComponent: message
             }
         },
         State {
             name: "waitingForAccept"
             when: root.session.state === KeyVerificationSession.WAITINGFORACCEPT
             PropertyChanges {
-                target: stateLoader
+                stateLoader.sourceComponent: message
-                sourceComponent: message
             }
         },
         State {
             name: "waitingForMac"
             when: root.session.state === KeyVerificationSession.WAITINGFORMAC
             PropertyChanges {
-                target: stateLoader
+                stateLoader.sourceComponent: message
-                sourceComponent: message
             }
         },
         State {
             name: "ready"
             when: root.session.state === KeyVerificationSession.READY
             PropertyChanges {
-                target: stateLoader
+                stateLoader.sourceComponent: chooseVerificationComponent
-                sourceComponent: chooseVerificationComponent
             }
         },
         State {
             name: "done"
             when: root.session.state === KeyVerificationSession.DONE
             PropertyChanges {
-                target: stateLoader
+                stateLoader.sourceComponent: message
-                sourceComponent: message
             }
         }
     ]
@@ -172,7 +165,7 @@ Kirigami.Page {
                 }
             }
             isDone: root.session.state === KeyVerificationSession.DONE
-            onDone: root.closeDialog()
+            onDone: root.Kirigami.PageStack.closeDialog()
         }
     }
 

src/app/qml/UnlockSSSSDialog.qml

@@ -5,6 +5,7 @@ import QtQuick
 
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.formcard as FormCard
+import io.github.quotient_im.libquotient
 
 import org.kde.neochat
 

src/app/qml/VerificationCanceled.qml

@@ -5,6 +5,7 @@ import QtQuick
 import QtQml
 
 import org.kde.neochat
+import io.github.quotient_im.libquotient
 
 VerificationMessage {
     id: root

src/messagecontent/AudioComponent.qml

@@ -53,22 +53,19 @@ ColumnLayout {
             when: !root.fileTransferInfo.completed && !root.fileTransferInfo.active
 
             PropertyChanges {
-                target: playButton
+                playButton.icon.name: "media-playback-start"
-                icon.name: "media-playback-start"
+                playButton.onClicked: Message.room.downloadFile(root.eventId)
-                onClicked: Message.room.downloadFile(root.eventId)
             }
         },
         State {
             name: "downloading"
             when: root.fileTransferInfo.active && !root.fileTransferInfo.completed
             PropertyChanges {
-                target: downloadBar
+                downloadBar.visible: true
-                visible: true
             }
             PropertyChanges {
-                target: playButton
+                playButton.icon.name: "media-playback-stop"
-                icon.name: "media-playback-stop"
+                playButton.onClicked: {
-                onClicked: {
                     Message.room.cancelFileTransfer(root.eventId);
                 }
             }
@@ -77,9 +74,8 @@ ColumnLayout {
             name: "paused"
             when: root.fileTransferInfo.completed && (audio.playbackState === MediaPlayer.StoppedState || audio.playbackState === MediaPlayer.PausedState)
             PropertyChanges {
-                target: playButton
+                playButton.icon.name: "media-playback-start"
-                icon.name: "media-playback-start"
+                playButton.onClicked: {
-                onClicked: {
                     audio.source = root.fileTransferInfo.localPath;
                     MediaManager.startPlayback();
                     audio.play();
@@ -91,11 +87,8 @@ ColumnLayout {
             when: root.fileTransferInfo.completed && audio.playbackState === MediaPlayer.PlayingState
 
             PropertyChanges {
-                target: playButton
+                playButton.icon.name: "media-playback-pause"
-
+                playButton.onClicked: audio.pause()
-                icon.name: "media-playback-pause"
-
-                onClicked: audio.pause()
             }
         }
     ]

src/messagecontent/CMakeLists.txt

@@ -43,6 +43,7 @@ ecm_add_qml_module(MessageContent GENERATE_PLUGIN_SOURCE
         ThreadBodyComponent.qml
         VideoComponent.qml
     SOURCES
+        messageattached.cpp
         contentprovider.cpp
         mediasizehelper.cpp
         pollhandler.cpp
@@ -53,6 +54,7 @@ ecm_add_qml_module(MessageContent GENERATE_PLUGIN_SOURCE
         models/reactionmodel.cpp
         models/threadmodel.cpp
         models/eventmessagecontentmodel.cpp
+        models/messagecontentfiltermodel.cpp
     RESOURCES
         images/bike.svg
         images/bus.svg
@@ -81,6 +83,9 @@ ecm_add_qml_module(MessageContent GENERATE_PLUGIN_SOURCE
         images/walk.svg
     DEPENDENCIES
         QtQuick
+    IMPORTS
+        org.kde.neochat.libneochat
+        io.github.quotient_im.libquotient
 )
 
 configure_file(config-neochat.h.in ${CMAKE_CURRENT_BINARY_DIR}/config-neochat.h)

src/messagecontent/FileComponent.qml

@@ -73,16 +73,13 @@ ColumnLayout {
                 when: root.fileTransferInfo.completed && autoOpenFile
 
                 PropertyChanges {
-                    target: openButton
+                    openButton.icon.name: "document-open"
-                    icon.name: "document-open"
+                    openButton.onClicked: openSavedFile()
-                    onClicked: openSavedFile()
+                    downloadButton {
-                }
+                        icon.name: "download"
-
+                        QQC2.ToolTip.text: i18nc("tooltip for a button on a message; offers ability to download its file", "Download")
-                PropertyChanges {
+                        onClicked: saveFileAs()
-                    target: downloadButton
+                    }
-                    icon.name: "download"
-                    QQC2.ToolTip.text: i18nc("tooltip for a button on a message; offers ability to download its file", "Download")
-                    onClicked: saveFileAs()
                 }
             },
             State {
@@ -90,15 +87,12 @@ ColumnLayout {
                 when: root.fileTransferInfo.completed && !autoOpenFile
 
                 PropertyChanges {
-                    target: openButton
+                    openButton.visible: false
-                    visible: false
+                    downloadButton {
-                }
+                        icon.name: "document-open"
-
+                        QQC2.ToolTip.text: i18nc("tooltip for a button on a message; offers ability to open its downloaded file with an appropriate application", "Open File")
-                PropertyChanges {
+                        onClicked: openSavedFile()
-                    target: downloadButton
+                    }
-                    icon.name: "document-open"
-                    QQC2.ToolTip.text: i18nc("tooltip for a button on a message; offers ability to open its downloaded file with an appropriate application", "Open File")
-                    onClicked: openSavedFile()
                 }
             },
             State {
@@ -106,19 +100,13 @@ ColumnLayout {
                 when: root.fileTransferInfo.active
 
                 PropertyChanges {
-                    target: openButton
+                    sizeLabel.text: i18nc("file download progress", "%1 / %2", Format.formatByteSize(root.fileTransferInfo.progress), Format.formatByteSize(root.fileTransferInfo.total))
-                    visible: false
+                    openButton.visible: false
-                }
+                    downloadButton {
-
+                        icon.name: "media-playback-stop"
-                PropertyChanges {
+                        QQC2.ToolTip.text: i18nc("tooltip for a button on a message; stops downloading the message's file", "Stop Download")
-                    target: sizeLabel
+                        onClicked: Message.room.cancelFileTransfer(root.eventId)
-                    text: i18nc("file download progress", "%1 / %2", Format.formatByteSize(root.fileTransferInfo.progress), Format.formatByteSize(root.fileTransferInfo.total))
+                    }
-                }
-                PropertyChanges {
-                    target: downloadButton
-                    icon.name: "media-playback-stop"
-                    QQC2.ToolTip.text: i18nc("tooltip for a button on a message; stops downloading the message's file", "Stop Download")
-                    onClicked: Message.room.cancelFileTransfer(root.eventId)
                 }
             }
         ]

src/messagecontent/VideoComponent.qml

@@ -75,37 +75,25 @@ Video {
             name: "notDownloaded"
             when: !root.fileTransferInfo.completed && !root.fileTransferInfo.active
             PropertyChanges {
-                target: videoLabel
+                videoLabel.visible: true
-                visible: true
+                mediaThumbnail.visible: true
-            }
-            PropertyChanges {
-                target: mediaThumbnail
-                visible: true
             }
         },
         State {
             name: "downloading"
             when: root.fileTransferInfo.active && !root.fileTransferInfo.completed && (Controller.isImageShown(root.eventId) || !NeoChatConfig.hideImages)
             PropertyChanges {
-                target: downloadBar
+                downloadBar.visible: true
-                visible: true
+                mediaThumbnail.visible: true
-            }
-            PropertyChanges {
-                target: mediaThumbnail
-                visible: true
             }
         },
         State {
             name: "paused"
             when: root.fileTransferInfo.completed && root.playbackState === MediaPlayer.PausedState && (Controller.isImageShown(root.eventId) || !NeoChatConfig.hideImages)
             PropertyChanges {
-                target: videoControls
+                videoControls.stateVisible: true
-                stateVisible: true
+                playButton.icon.name: "media-playback-start"
-            }
+                playButton.onClicked: {
-            PropertyChanges {
-                target: playButton
-                icon.name: "media-playback-start"
-                onClicked: {
                     MediaManager.startPlayback();
                     root.play();
                 }
@@ -115,34 +103,20 @@ Video {
             name: "playing"
             when: root.fileTransferInfo.completed && root.playbackState === MediaPlayer.PlayingState && (Controller.isImageShown(root.eventId) || !NeoChatConfig.hideImages)
             PropertyChanges {
-                target: videoControls
+                videoControls.stateVisible: true
-                stateVisible: true
+                playButton.icon.name: "media-playback-pause"
-            }
+                playButton.onClicked: root.pause()
-            PropertyChanges {
-                target: playButton
-                icon.name: "media-playback-pause"
-                onClicked: root.pause()
             }
         },
         State {
             name: "stopped"
             when: root.fileTransferInfo.completed && root.playbackState === MediaPlayer.StoppedState && (Controller.isImageShown(root.eventId) || !NeoChatConfig.hideImages)
             PropertyChanges {
-                target: videoControls
+                videoControls.stateVisible: true
-                stateVisible: true
+                mediaThumbnail.visible: true
-            }
+                videoLabel.visible: true
-            PropertyChanges {
+                playButton.icon.name: "media-playback-start"
-                target: mediaThumbnail
+                playButton.onClicked: {
-                visible: true
-            }
-            PropertyChanges {
-                target: videoLabel
-                visible: true
-            }
-            PropertyChanges {
-                target: playButton
-                icon.name: "media-playback-start"
-                onClicked: {
                     MediaManager.startPlayback();
                     root.play();
                 }
@@ -151,16 +125,9 @@ Video {
         State {
             name: "hidden"
             PropertyChanges {
-                target: mediaThumbnail
+                mediaThumbnail.visible: false
-                visible: false
+                videoControls.visible: false
-            }
+                hidden.visible: true
-            PropertyChanges {
-                target: videoControls
-                visible: false
-            }
-            PropertyChanges {
-                target: hidden
-                visible: true
             }
         }
     ]

src/timeline/CMakeLists.txt

@@ -23,12 +23,10 @@ ecm_add_qml_module(Timeline GENERATE_PLUGIN_SOURCE
         TypingPane.qml
         DelegateContextMenu.qml
     SOURCES
-        messageattached.cpp
         messagedelegate.cpp
         timelinedelegate.cpp
         enums/delegatetype.h
         models/mediamessagefiltermodel.cpp
-        models/messagecontentfiltermodel.cpp
         models/messagefiltermodel.cpp
         models/messagemodel.cpp
         models/pinnedmessagemodel.cpp
@@ -39,6 +37,8 @@ ecm_add_qml_module(Timeline GENERATE_PLUGIN_SOURCE
         models/webshortcutmodel.cpp
     DEPENDENCIES
         QtQuick
+        org.kde.neochat.libneochat
+        io.github.quotient_im.libquotient
 )
 
 target_include_directories(Timeline PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/enums ${CMAKE_CURRENT_SOURCE_DIR}/models)

src/timeline/MessageDelegate.qml

@@ -1,16 +1,15 @@
 // SPDX-FileCopyrightText: 2020 Black Hat <bhat@encom.eu.org>
 // SPDX-License-Identifier: GPL-3.0-only
 
+pragma ComponentBehavior: Bound
+
 import QtQuick
 import QtQuick.Controls as QQC2
-import QtQuick.Layouts
-import Qt.labs.qmlmodels
 
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.components as KirigamiComponents
 
 import org.kde.neochat
-import org.kde.neochat.libneochat as LibNeoChat
 
 /**
  * @brief The base delegate for all messages in the timeline.