Use QQC2 Dialog with updated style instead of Kirigami.Dialog

src/CMakeLists.txt

@@ -8,7 +8,6 @@ endif()
 add_subdirectory(libneochat)
 add_subdirectory(login)
 add_subdirectory(rooms)
-add_subdirectory(roominfo)
 add_subdirectory(timeline)
 add_subdirectory(spaces)
 add_subdirectory(chatbar)

src/app/CMakeLists.txt

@@ -8,6 +8,8 @@ add_library(neochat STATIC
     controller.h
     roommanager.cpp
     roommanager.h
+    models/userfiltermodel.cpp
+    models/userfiltermodel.h
     models/userdirectorylistmodel.cpp
     models/userdirectorylistmodel.h
     notificationsmanager.cpp
@@ -56,8 +58,10 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
         qml/AccountMenu.qml
         qml/CollapsedRoomDelegate.qml
         qml/RoomPage.qml
+        qml/ExploreRoomsPage.qml
         qml/ManualRoomDialog.qml
         qml/ExplorerDelegate.qml
+        qml/InviteUserPage.qml
         qml/ImageEditorPage.qml
         qml/NeochatMaximizeComponent.qml
         qml/TypingPane.qml
@@ -65,6 +69,7 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
         qml/AttachmentPane.qml
         qml/QuickFormatBar.qml
         qml/UserDetailDialog.qml
+        qml/CreateRoomDialog.qml
         qml/OpenFileDialog.qml
         qml/KeyVerificationDialog.qml
         qml/ConfirmLogoutDialog.qml
@@ -74,14 +79,26 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
         qml/EmojiSas.qml
         qml/VerificationCanceled.qml
         qml/MessageSourceSheet.qml
+        qml/RoomSearchPage.qml
+        qml/RoomPinnedMessagesPage.qml
         qml/LocationChooser.qml
         qml/InvitationView.qml
         qml/AvatarTabButton.qml
         qml/OsmLocationPlugin.qml
         qml/FullScreenMap.qml
+        qml/LocationsPage.qml
+        qml/LocationMapItem.qml
+        qml/RoomDrawer.qml
+        qml/RoomDrawerPage.qml
+        qml/DirectChatDrawerHeader.qml
+        qml/GroupChatDrawerHeader.qml
+        qml/RoomInformation.qml
+        qml/RoomMedia.qml
         qml/ChooseRoomDialog.qml
+        qml/RemoveChildDialog.qml
         qml/QrCodeMaximizeComponent.qml
         qml/NotificationsView.qml
+        qml/SearchPage.qml
         qml/ServerComboBox.qml
         qml/UserSearchPage.qml
         qml/ManualUserDialog.qml
@@ -101,14 +118,12 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
         qml/AvatarNotification.qml
         qml/ReasonDialog.qml
         qml/NewPollDialog.qml
-        qml/UserMenu.qml
     DEPENDENCIES
         QtCore
         QtQuick
     IMPORTS
         org.kde.neochat.libneochat
         org.kde.neochat.rooms
-        org.kde.neochat.roominfo
         org.kde.neochat.timeline
         org.kde.neochat.spaces
         org.kde.neochat.settings
@@ -174,7 +189,7 @@ else()
 endif()
 
 target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/models)
-target_link_libraries(neochat PRIVATE Loginplugin Roomsplugin RoomInfoplugin Timelineplugin Spacesplugin Chatbarplugin Settingsplugin Devtoolsplugin)
+target_link_libraries(neochat PRIVATE Loginplugin Roomsplugin Timelineplugin Spacesplugin Chatbarplugin Settingsplugin Devtoolsplugin)
 target_link_libraries(neochat PUBLIC
     LibNeoChat
     Timeline

src/app/controller.cpp

@@ -32,7 +32,6 @@
 #include "neochatroom.h"
 #include "notificationsmanager.h"
 #include "proxycontroller.h"
-#include "roommanager.h"
 
 #if defined(Q_OS_WIN) || defined(Q_OS_MAC)
 #include "trayicon.h"
@@ -231,7 +230,6 @@ void Controller::initConnection(NeoChatConnection *connection)
         m_notificationsManager.handleNotifications(connection);
     });
     connect(this, &Controller::globalUrlPreviewDefaultChanged, connection, &NeoChatConnection::globalUrlPreviewEnabledChanged);
-    connect(connection, &NeoChatConnection::roomAboutToBeLeft, &RoomManager::instance(), &RoomManager::roomLeft);
     Q_EMIT connectionAdded(connection);
 }
 

src/app/notificationsmanager.cpp

@@ -276,7 +276,7 @@ void NotificationsManager::postInviteNotification(NeoChatRoom *rawRoom)
                 if (inAnyOfOurRooms) {
                     doPostInviteNotification(room);
                 } else {
-                    room->forget();
+                    room->leaveRoom();
                 }
             }
         });
@@ -330,14 +330,14 @@ void NotificationsManager::doPostInviteNotification(QPointer<NeoChatRoom> room)
         if (!room) {
             return;
         }
-        room->forget();
+        RoomManager::instance().leaveRoom(room);
         notification->close();
     });
     connect(rejectAndIgnoreAction, &KNotificationAction::activated, this, [room, notification]() {
         if (!room) {
             return;
         }
-        room->forget();
+        RoomManager::instance().leaveRoom(room);
         room->connection()->addToIgnoredUsers(room->invitingUserId());
         notification->close();
     });

src/app/qml/AccountMenu.qml

@@ -92,7 +92,7 @@ KirigamiComponents.ConvergentContextMenu {
             const dialog = Qt.createComponent("org.kde.kirigami", "PromptDialog").createObject(QQC2.Overlay.overlay, {
                 title: i18nc("@title", "Verification Request Sent"),
                 subtitle: i18nc("@info:label", "To proceed, accept the verification request on another device."),
-                standardButtons: Kirigami.Dialog.Ok
+                standardButtons: QQC2.Dialog.Ok
             })
             dialog.open();
             root.connection.onNewKeyVerificationSession.connect(() => {

src/app/qml/AccountSwitchDialog.qml

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 import QtQuick
+import QtQuick.Controls as QQC2
 import QtQuick.Layouts
 
 import org.kde.kirigami as Kirigami
@@ -11,7 +12,7 @@ import org.kde.kirigamiaddons.delegates as Delegates
 
 import org.kde.neochat
 
-Kirigami.Dialog {
+QQC2.Dialog {
     id: root
 
     required property NeoChatConnection connection
@@ -23,7 +24,7 @@ Kirigami.Dialog {
     topPadding: 0
     bottomPadding: 0
 
-    standardButtons: Kirigami.Dialog.NoButton
+    standardButtons: QQC2.Dialog.NoButton
 
     width: Math.min(applicationWindow().width, Kirigami.Units.gridUnit * 24)
     title: i18nc("@title: dialog to switch between logged in accounts", "Switch Account")

src/app/qml/AskDirectChatConfirmation.qml

@@ -8,33 +8,30 @@ import org.kde.kirigami as Kirigami
 
 import org.kde.neochat
 
-Kirigami.Dialog {
+Kirigami.PromptDialog {
     id: root
 
     required property var user
 
-    width: Math.min(Kirigami.Units.gridUnit * 24, QQC2.ApplicationWindow.window.width)
-    height: Kirigami.Units.gridUnit * 8
-
-    standardButtons: QQC2.Dialog.Close
     title: i18nc("@title:dialog", "Start a chat")
+    subtitle: i18n("Do you want to start a chat with %1?", root.user.displayName)
+    dialogType: Kirigami.PromptDialog.Warning
 
-    contentItem: QQC2.Label {
-        text: i18n("Do you want to start a chat with %1?", root.user.displayName)
-        textFormat: Text.PlainText
-        wrapMode: Text.Wrap
-        horizontalAlignment: Qt.AlignHCenter
-        verticalAlignment: Qt.AlignVCenter
+    onRejected: {
+        root.close();
     }
 
-    customFooterActions: [
-        Kirigami.Action {
+    footer: QQC2.DialogButtonBox {
+        standardButtons: QQC2.Dialog.Cancel
+
+        QQC2.Button {
             text: i18nc("@action:button", "Start Chat")
+            QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.AcceptRole
             icon.name: "im-user"
-            onTriggered: {
+            onClicked: {
                 root.user.requestDirectChat();
                 root.close();
             }
         }
-    ]
+    }
 }

src/app/qml/ConfirmLeaveDialog.qml

@@ -28,7 +28,7 @@ Kirigami.PromptDialog {
             text: i18nc("@action:button", "Leave Room")
             QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.AcceptRole
             icon.name: "arrow-left-symbolic"
-            onClicked: root.room.forget();
+            onClicked: RoomManager.leaveRoom(root.room)
         }
     }
 }

src/app/qml/ConsentDialog.qml

@@ -8,32 +8,30 @@ import org.kde.kirigami as Kirigami
 
 import org.kde.neochat
 
-Kirigami.Dialog {
+Kirigami.PromptDialog {
     id: root
 
     required property string url
 
-    width: Math.min(Kirigami.Units.gridUnit * 24, QQC2.ApplicationWindow.window.width)
-    height: Kirigami.Units.gridUnit * 8
-    leftPadding: Kirigami.Units.largeSpacing
-    rightPadding: Kirigami.Units.largeSpacing
-
     title: i18nc("@title:dialog", "User Consent")
+    subtitle: i18nc("@info", "Your homeserver requires you to agree to its terms and conditions before being able to use it. Please click the button below to read them.")
+    dialogType: Kirigami.PromptDialog.Warning
 
-    contentItem: QQC2.Label {
-        text: i18nc("@info", "Your homeserver requires you to agree to its terms and conditions before being able to use it. Please click the button below to read them.")
-        wrapMode: Text.WordWrap
-        horizontalAlignment: Qt.AlignHCenter
-        verticalAlignment: Qt.AlignVCenter
+    onRejected: {
+        root.close();
     }
-    customFooterActions: [
-        Kirigami.Action {
+
+    footer: QQC2.DialogButtonBox {
+        standardButtons: QQC2.Dialog.Cancel
+
+        QQC2.Button {
             text: i18nc("@action:button", "Open")
+            QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.AcceptRole
             icon.name: "internet-services"
-            onTriggered: {
+            onClicked: {
                 UrlHelper.openUrl(root.url);
                 root.close();
             }
         }
-    ]
+    }
 }

src/app/qml/CreateRoomDialog.qml

@@ -9,36 +9,124 @@ import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.formcard as FormCard
 import org.kde.kirigamiaddons.labs.components as Components
 
-import org.kde.neochat.libneochat
+import org.kde.neochat
 
-Kirigami.Dialog {
+FormCard.FormCardPage {
     id: root
 
-    property string parentId
+    property string parentId: ""
+
+    property bool isSpace: false
+
+    property bool showChildType: false
+
+    property bool showCreateChoice: false
 
     required property NeoChatConnection connection
 
     signal addChild(string childId, bool setChildParent, bool canonical)
     signal newChild(string childName)
 
-    title: i18nc("@title", "Select Existing Room")
-    implicitWidth: Kirigami.Units.gridUnit * 20
-    standardButtons: Kirigami.Dialog.Ok | Kirigami.Dialog.Cancel
+    title: isSpace ? i18nc("@title", "Create a Space") : i18nc("@title", "Create a Room")
 
-    onAccepted: root.addChild(chosenRoomDelegate.roomId, existingOfficialCheck.checked, makeCanonicalCheck.checked);
+    Component.onCompleted: roomNameField.forceActiveFocus()
 
-    Component.onCompleted: pickRoomDelegate.forceActiveFocus()
+    FormCard.FormHeader {
+        title: root.isSpace ? i18n("New Space Information") : i18n("New Room Information")
+    }
+    FormCard.FormCard {
+        FormCard.FormComboBoxDelegate {
+            id: roomTypeCombo
+            property bool isInitialising: true
 
-    ColumnLayout {
-        spacing: Kirigami.Units.largeSpacing
+            visible: root.showChildType
+
+            text: i18n("Select type")
+            model: ListModel {
+                id: roomTypeModel
+            }
+            textRole: "text"
+            valueRole: "isSpace"
+
+            Component.onCompleted: {
+                currentIndex = indexOfValue(root.isSpace);
+                roomTypeModel.append({
+                    "text": i18n("Room"),
+                    "isSpace": false
+                });
+                roomTypeModel.append({
+                    "text": i18n("Space"),
+                    "isSpace": true
+                });
+                roomTypeCombo.currentIndex = 0;
+                roomTypeCombo.isInitialising = false;
+            }
+            onCurrentValueChanged: {
+                if (!isInitialising) {
+                    root.isSpace = currentValue;
+                }
+            }
+        }
+
+        FormCard.FormDelegateSeparator {
+            visible: root.showChildType
+        }
+
+        FormCard.FormTextFieldDelegate {
+            id: roomNameField
+            label: i18n("Name:")
+            onAccepted: if (roomNameField.text.length > 0) {
+                roomTopicField.forceActiveFocus();
+            }
+        }
+
+        FormCard.FormDelegateSeparator {}
+
+        FormCard.FormTextFieldDelegate {
+            id: roomTopicField
+            label: i18n("Topic:")
+            onAccepted: ok.clicked()
+        }
+
+        FormCard.FormDelegateSeparator {}
+
+        FormCard.FormCheckDelegate {
+            id: newOfficialCheck
+            visible: root.parentId.length > 0
+            text: i18nc("@option:check As in make the space from which this dialog was created an official parent.", "Make this parent official")
+            checked: true
+        }
+
+        FormCard.FormDelegateSeparator {
+            visible: root.parentId.length > 0
+        }
 
         FormCard.FormButtonDelegate {
-            id: pickRoomDelegate
-
-            visible: !chosenRoomDelegate.visible
-            text: i18nc("@action:button", "Pick Room")
+            id: ok
+            text: root.isSpace ? i18nc("@action:button", "Create Space") : i18nc("@action:button", "Create Room")
+            enabled: roomNameField.text.length > 0
             onClicked: {
-                let dialog = pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.libneochat', 'ExploreRoomsPage'), {
+                if (root.isSpace) {
+                    root.connection.createSpace(roomNameField.text, roomTopicField.text, root.parentId, newOfficialCheck.checked);
+                } else {
+                    root.connection.createRoom(roomNameField.text, roomTopicField.text, root.parentId, newOfficialCheck.checked);
+                }
+                root.newChild(roomNameField.text);
+                root.closeDialog();
+            }
+        }
+    }
+    FormCard.FormHeader {
+        visible: root.showChildType
+        title: i18n("Select Existing Room")
+    }
+    FormCard.FormCard {
+        visible: root.showChildType
+        FormCard.FormButtonDelegate {
+            visible: !chosenRoomDelegate.visible
+            text: i18nc("@action:button", "Pick room")
+            onClicked: {
+                let dialog = pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage'), {
                     connection: root.connection
                 }, {
                     title: i18nc("@title", "Explore Rooms")
@@ -139,15 +227,13 @@ Kirigami.Dialog {
             }
         }
 
-        FormCard.FormDelegateSeparator {
-            below: existingOfficialCheck
-        }
+        FormCard.FormDelegateSeparator {}
 
         FormCard.FormCheckDelegate {
             id: existingOfficialCheck
             visible: root.parentId.length > 0
             text: i18nc("@option:check As in make the space from which this dialog was created an official parent.", "Make this parent official")
-            description: enabled ? i18nc("@info:description", "You have the required privilege level in the child to set this state") : i18n("You do not have a high enough privilege level in the child to set this state")
+            description: enabled ? i18n("You have the required privilege level in the child to set this state") : i18n("You do not have a high enough privilege level in the child to set this state")
             checked: enabled
 
             enabled: {
@@ -164,17 +250,26 @@ Kirigami.Dialog {
         }
 
         FormCard.FormDelegateSeparator {
-            above: existingOfficialCheck
-            below: makeCanonicalCheck
+            visible: root.parentId.length > 0
         }
 
         FormCard.FormCheckDelegate {
             id: makeCanonicalCheck
             text: i18nc("@option:check The canonical parent is the default one if a room has multiple parent spaces.", "Make this space the canonical parent")
-            description: i18nc("@info:description", "The canonical parent is the default one if a room has multiple parent spaces.")
             checked: enabled
 
             enabled: existingOfficialCheck.enabled
         }
+
+        FormCard.FormDelegateSeparator {}
+
+        FormCard.FormButtonDelegate {
+            text: i18nc("@action:button", "Ok")
+            enabled: chosenRoomDelegate.visible
+            onClicked: {
+                root.addChild(chosenRoomDelegate.roomId, existingOfficialCheck.checked, makeCanonicalCheck.checked);
+                root.closeDialog();
+            }
+        }
     }
 }

src/app/qml/DirectChatDrawerHeader.qml

@@ -8,7 +8,7 @@ import QtQuick.Layouts
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 
-import org.kde.neochat.libneochat
+import org.kde.neochat
 
 ColumnLayout {
     id: root
@@ -18,8 +18,6 @@ ColumnLayout {
      */
     required property NeoChatRoom room
 
-    signal resolveResource(string idOrUri, string action)
-
     Layout.fillWidth: true
     Layout.alignment: Qt.AlignVCenter
     spacing: 0
@@ -35,7 +33,7 @@ ColumnLayout {
         Layout.alignment: Qt.AlignHCenter
 
         onClicked: {
-            root.resolveResource(root.room.directChatRemoteMember.uri, "")
+            RoomManager.resolveResource(root.room.directChatRemoteMember.uri)
         }
 
         contentItem: KirigamiComponents.Avatar {

src/app/qml/FullScreenMap.qml

@@ -8,8 +8,6 @@ import QtPositioning
 
 import org.kde.kirigami as Kirigami
 
-import org.kde.neochat.libneochat
-
 ApplicationWindow {
     id: root
 

src/app/qml/GlobalMenu.qml

@@ -15,7 +15,7 @@ import org.kde.neochat.settings
 Labs.MenuBar {
     id: root
 
-    required property NeoChatConnection connection
+    property NeoChatConnection connection
 
     Labs.Menu {
         title: i18nc("menu", "NeoChat")
@@ -38,31 +38,25 @@ Labs.MenuBar {
         title: i18nc("menu", "File")
 
         Labs.MenuItem {
-            icon.name: "list-add-user"
-            text: i18nc("@action:inmenu", "Find your Friends")
+            text: i18nc("menu", "Find your friends")
             enabled: pageStack.layers.currentItem.title !== i18n("Find your friends") && AccountRegistry.accountCount > 0
-            onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'UserSearchPage'), {
+            onTriggered: pushReplaceLayer(Qt.createComponent('org.kde.neochat', 'UserSearchPage'), {
                 connection: root.connection
             }, {
                 title: i18nc("@title", "Find your friends")
             })
         }
         Labs.MenuItem {
-            icon.name: "system-users-symbolic"
-            text: i18nc("@action:inmenu", "Create a Room…")
+            text: i18nc("menu", "New Group…")
             enabled: pageStack.layers.currentItem.title !== i18n("Find your friends") && AccountRegistry.accountCount > 0
             shortcut: StandardKey.New
             onTriggered: {
-                pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'CreateRoomDialog'), {
-                    connection: root.connection
-                }, {
-                    title: i18nc("@title", "Create a Room")
-                });
+                const dialog = createRoomDialog.createObject(root.overlay);
+                dialog.open();
             }
         }
         Labs.MenuItem {
-            icon.name: "compass-symbolic"
-            text: i18nc("@action:inmenu", "Explore Rooms")
+            text: i18nc("menu", "Browse Chats…")
             onTriggered: {
                 let dialog = pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage'), {
                     connection: root.connection
@@ -83,8 +77,7 @@ Labs.MenuBar {
         title: i18nc("menu", "View")
 
         Labs.MenuItem {
-            icon.name: "search-symbolic"
-            text: i18nc("@action:inmenu opens a UI element called the 'Quick Switcher', which offers a fast keyboard-based interface for switching in between chats.", "Search Rooms")
+            text: i18nc("menu item that opens a UI element called the 'Quick Switcher', which offers a fast keyboard-based interface for switching in between chats.", "Open Quick Switcher")
             onTriggered: quickSwitcher.open()
         }
     }
@@ -92,7 +85,6 @@ Labs.MenuBar {
         title: i18nc("menu", "Window")
 
         Labs.MenuItem {
-            icon.name: "view-fullscreen-symbolic"
             text: root.visibility === Window.FullScreen ? i18nc("menu", "Exit Full Screen") : i18nc("menu", "Enter Full Screen")
             onTriggered: root.visibility === Window.FullScreen ? root.showNormal() : root.showFullScreen()
         }
@@ -101,12 +93,14 @@ Labs.MenuBar {
         title: i18nc("menu", "Help")
 
         Labs.MenuItem {
-            icon.name: "help-about-symbolic"
+            text: i18nc("menu", "About Matrix")
+            onTriggered: UrlHelper.openUrl("https://matrix.org/docs/chat_basics/matrix-for-im/")
+        }
+        Labs.MenuItem {
             text: i18nc("menu", "About NeoChat")
             onTriggered: pageStack.pushDialogLayer(Qt.createComponent("org.kde.kirigamiaddons.formcard", "AboutPage"))
         }
         Labs.MenuItem {
-            icon.name: "kde-symbolic"
             text: i18nc("menu", "About KDE")
             onTriggered: pageStack.pushDialogLayer(Qt.createComponent("org.kde.kirigamiaddons.formcard", "AboutKDEPage"))
         }

src/app/qml/InvitationView.qml

@@ -108,7 +108,7 @@ ColumnLayout {
             icon.name: "dialog-cancel-symbolic"
             text: i18nc("@action:button Reject this invite", "Reject Invite")
 
-            onClicked: root.currentRoom.forget()
+            onClicked: RoomManager.leaveRoom(root.currentRoom)
         }
     }
 
@@ -123,7 +123,7 @@ ColumnLayout {
             text: i18nc("@action:button Block the user", "Block %1", root.invitingMember.displayName)
 
             onClicked: {
-                root.currentRoom.forget()
+                RoomManager.leaveRoom(root.currentRoom);
                 root.currentRoom.connection.addToIgnoredUsers(root.currentRoom.invitingUserId);
             }
         }

src/app/qml/JoinRoomDialog.qml

@@ -12,7 +12,7 @@ import org.kde.prison
 
 import org.kde.neochat
 
-Kirigami.Dialog {
+QQC2.Dialog {
     id: root
 
     required property string room
@@ -23,7 +23,7 @@ Kirigami.Dialog {
     topPadding: 0
     bottomPadding: 0
 
-    standardButtons: Kirigami.Dialog.NoButton
+    standardButtons: QQC2.Dialog.NoButton
 
     width: Math.min(applicationWindow().width, Kirigami.Units.gridUnit * 24)
     title: i18nc("@title:dialog", "Join Room")

src/app/qml/LocationsPage.qml

@@ -6,13 +6,12 @@ import QtLocation
 import QtPositioning
 
 import org.kde.kirigami as Kirigami
-
-import org.kde.neochat.libneochat
+import org.kde.neochat
 
 Kirigami.Page {
     id: root
 
-    required property NeoChatRoom room
+    required property var room
 
     title: i18nc("Locations on a map", "Locations")
 

src/app/qml/Main.qml

@@ -80,8 +80,9 @@ Kirigami.ApplicationWindow {
 
     Loader {
         active: Kirigami.Settings.hasPlatformMenuBar && !Kirigami.Settings.isMobile
-        sourceComponent: GlobalMenu {
-            connection: root.connection
+        sourceComponent: Qt.createComponent("org.kde.neochat", "GlobalMenu")
+        onActiveChanged: if (active) {
+            item.connection = root.connection;
         }
     }
 
@@ -148,13 +149,9 @@ Kirigami.ApplicationWindow {
     }
 
     function openRoomDrawer() {
-        const page = pageStack.push(Qt.createComponent('org.kde.neochat', 'RoomDrawerPage'), {
-            connection: root.connection,
-            room: RoomManager.currentRoom,
-            userListModel: RoomManager.userListModel,
-            mediaMessageFilterModel: RoomManager.mediaMessageFilterModel
+        pageStack.push(Qt.createComponent('org.kde.neochat', 'RoomDrawerPage'), {
+            connection: root.connection
         });
-        page.resolveResource.connect((idOrUri, action) => RoomManager.resolveResource(idOrUri, action))
     }
 
     contextDrawer: RoomDrawer {
@@ -164,18 +161,7 @@ Kirigami.ApplicationWindow {
         // It is used to ensure that user choice is remembered when changing pages and expanding and contracting the window width
         property bool drawerUserState: NeoChatConfig.autoRoomInfoDrawer
 
-        room: RoomManager.currentRoom
         connection: root.connection
-        userListModel: RoomManager.userListModel
-        mediaMessageFilterModel: RoomManager.mediaMessageFilterModel
-
-        onResolveResource: (idOrUri, action) => RoomManager.resolveResource(idOrUri, action)
-
-        roomDrawerWidth: NeoChatConfig.roomDrawerWidth
-        onRoomDrawerWidthChanged: {
-            NeoChatConfig.roomDrawerWidth = actualWidth;
-            NeoChatConfig.save();
-        }
 
         handleClosedIcon.source: "documentinfo-symbolic"
         handleClosedToolTip: i18nc("@action:button", "Show Room Information")

src/app/qml/ManualRoomDialog.qml

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 
 import QtQuick
+import QtQuick.Controls as QQC2
 import QtQuick.Window
 import QtQuick.Layouts
 
@@ -10,7 +11,7 @@ import org.kde.kirigamiaddons.formcard as FormCard
 
 import org.kde.neochat
 
-Kirigami.Dialog {
+QQC2.Dialog {
     id: root
 
     /**
@@ -31,35 +32,41 @@ Kirigami.Dialog {
     topPadding: 0
     bottomPadding: 0
 
-    standardButtons: Kirigami.Dialog.Cancel
-    customFooterActions: [
-        Kirigami.Action {
+    footer: QQC2.DialogButtonBox {
+        QQC2.Button {
+            QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.AcceptRole
             enabled: roomIdAliasText.isValidText
             text: i18n("OK")
             icon.name: "dialog-ok"
-            onTriggered: {
-                // We don't necessarily have all the info so fill out the best we can.
-                let roomId = roomIdAliasText.isAlias() ? "" : roomIdAliasText.text;
-                let displayName = "";
-                let avatarUrl = "";
-                let alias = roomIdAliasText.isAlias() ? roomIdAliasText.text : "";
-                let topic = "";
-                let memberCount = -1;
-                let isJoined = false;
-                if (roomIdAliasText.room) {
-                    roomId = roomIdAliasText.room.id;
-                    displayName = roomIdAliasText.room.displayName;
-                    avatarUrl = roomIdAliasText.room.avatarUrl.toString().length > 0 ? connection.makeMediaUrl(roomIdAliasText.room.avatarUrl) : "";
-                    alias = roomIdAliasText.room.canonicalAlias;
-                    topic = roomIdAliasText.room.topic;
-                    memberCount = roomIdAliasText.room.joinedCount;
-                    isJoined = true;
-                }
-                root.roomSelected(roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined);
-                root.close();
-            }
         }
-    ]
+        QQC2.Button {
+            QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.RejectRole
+            text: i18n("Cancel")
+            icon.name: "dialog-cancel"
+        }
+    }
+
+    onAccepted: {
+        // We don't necessarily have all the info so fill out the best we can.
+        let roomId = roomIdAliasText.isAlias() ? "" : roomIdAliasText.text;
+        let displayName = "";
+        let avatarUrl = "";
+        let alias = roomIdAliasText.isAlias() ? roomIdAliasText.text : "";
+        let topic = "";
+        let memberCount = -1;
+        let isJoined = false;
+        if (roomIdAliasText.room) {
+            roomId = roomIdAliasText.room.id;
+            displayName = roomIdAliasText.room.displayName;
+            avatarUrl = roomIdAliasText.room.avatarUrl.toString().length > 0 ? connection.makeMediaUrl(roomIdAliasText.room.avatarUrl) : "";
+            alias = roomIdAliasText.room.canonicalAlias;
+            topic = roomIdAliasText.room.topic;
+            memberCount = roomIdAliasText.room.joinedCount;
+            isJoined = true;
+        }
+        root.roomSelected(roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined);
+        root.close();
+    }
 
     contentItem: ColumnLayout {
         spacing: 0

src/app/qml/ManualUserDialog.qml

@@ -10,7 +10,7 @@ import org.kde.kirigamiaddons.formcard as FormCard
 
 import org.kde.neochat
 
-Kirigami.Dialog {
+QQC2.Dialog {
     id: root
 
     /**
@@ -31,19 +31,6 @@ Kirigami.Dialog {
     topPadding: 0
     bottomPadding: 0
 
-    standardButtons: Kirigami.Dialog.Cancel
-    customFooterActions: [
-        Kirigami.Action {
-            enabled: userIdText.isValidText
-            text: i18n("OK")
-            icon.name: "dialog-ok"
-            onTriggered: {
-                root.connection.requestDirectChat(userIdText.text);
-                root.accept();
-            }
-        }
-    ]
-
     contentItem: ColumnLayout {
         spacing: 0
         FormCard.FormTextFieldDelegate {
@@ -75,6 +62,21 @@ Kirigami.Dialog {
         }
     }
 
+    footer: QQC2.DialogButtonBox {
+        standardButtons: QQC2.Dialog.Cancel
+
+        QQC2.Button {
+            enabled: userIdText.isValidText
+            text: i18n("OK")
+            QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.AcceptRole
+            icon.name: "dialog-ok"
+            onClicked: {
+                root.connection.requestDirectChat(userIdText.text);
+                root.accept();
+            }
+        }
+    }
+
     onVisibleChanged: {
         userIdText.forceActiveFocus();
         timer.restart();

src/app/qml/NewPollDialog.qml

@@ -15,27 +15,18 @@ import Quotient
 
 import org.kde.neochat
 
-Kirigami.Dialog {
+QQC2.Dialog {
     id: root
 
     required property NeoChatRoom room
 
-    standardButtons: Kirigami.Dialog.Cancel
-
-    customFooterActions: [
-        Kirigami.Action {
-            enabled: optionModel.allValuesSet && questionTextField.text.length > 0
-            text: i18nc("@action:button", "Send")
-            icon.name: "document-send"
-            onTriggered: {
-                root.room.postPoll(pollTypeCombo.currentValue, questionTextField.text, optionModel.values())
-                root.close()
-            }
-        }
-    ]
+    title: i18nc("@title: create new poll in the room", "Create Poll")
 
     width: Math.min(applicationWindow().width, Kirigami.Units.gridUnit * 24)
-    title: i18nc("@title: create new poll in the room", "Create Poll")
+    leftPadding: 0
+    rightPadding: 0
+    topPadding: 0
+    bottomPadding: 0
 
     contentItem: ColumnLayout {
         spacing: 0
@@ -153,4 +144,19 @@ Kirigami.Dialog {
             onClicked: optionModel.append({optionText: ""})
         }
     }
+
+    footer: QQC2.DialogButtonBox {
+        standardButtons: QQC2.Dialog.Cancel
+
+        QQC2.Button {
+            enabled: optionModel.allValuesSet && questionTextField.text.length > 0
+            text: i18nc("@action:button", "Send")
+            QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.AcceptRole
+            icon.name: "document-send"
+            onClicked: {
+                root.room.postPoll(pollTypeCombo.currentValue, questionTextField.text, optionModel.values())
+                root.close()
+            }
+        }
+    }
 }

src/app/qml/RecommendedSpaceDialog.qml

@@ -10,13 +10,11 @@ import org.kde.kirigamiaddons.components
 
 import org.kde.neochat
 
-Kirigami.Dialog {
+QQC2.Dialog {
     id: root
 
     property var connection
 
-    parent: applicationWindow().overlay
-
     leftPadding: 0
     rightPadding: 0
     topPadding: 0

src/app/qml/RemoveChildDialog.qml

@@ -2,14 +2,15 @@
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 
 import QtQuick
+import QtQuick.Controls as QQC2
 import QtQuick.Layouts
 
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.formcard as FormCard
 
-import org.kde.neochat.libneochat
+import org.kde.neochat
 
-Kirigami.Dialog {
+QQC2.Dialog {
     id: root
 
     required property NeoChatRoom parentRoom
@@ -28,7 +29,7 @@ Kirigami.Dialog {
 
     width: Math.min(applicationWindow().width, Kirigami.Units.gridUnit * 24)
 
-    standardButtons: Kirigami.Dialog.Ok | Kirigami.Dialog.Cancel
+    standardButtons: QQC2.Dialog.Ok | QQC2.Dialog.Cancel
 
     onAccepted: parentRoom.removeChild(root.roomId, removeOfficalCheck.checked)
 

src/app/qml/RoomDrawer.qml

@@ -9,19 +9,14 @@ import QtQuick.Layouts
 import org.kde.kirigami as Kirigami
 import org.kde.kitemmodels
 
-import org.kde.neochat.libneochat
-import org.kde.neochat.timeline as Timeline
-import org.kde.neochat.settings as Settings
+import org.kde.neochat
+import org.kde.neochat.settings
 
 Kirigami.OverlayDrawer {
     id: root
 
-    required property NeoChatRoom room
+    readonly property NeoChatRoom room: RoomManager.currentRoom
     required property NeoChatConnection connection
-    required property UserListModel userListModel
-    required property Timeline.MediaMessageFilterModel mediaMessageFilterModel
-
-    signal resolveResource(string idOrUri, string action)
 
     width: actualWidth
     interactive: modal
@@ -29,12 +24,11 @@ Kirigami.OverlayDrawer {
     readonly property int minWidth: Kirigami.Units.gridUnit * 15
     readonly property int maxWidth: Kirigami.Units.gridUnit * 25
     readonly property int defaultWidth: Kirigami.Units.gridUnit * 20
-    property int roomDrawerWidth
     property int actualWidth: {
-        if (root.roomDrawerWidth === -1) {
+        if (NeoChatConfig.roomDrawerWidth === -1) {
             return Kirigami.Units.gridUnit * 20;
         } else {
-            return root.roomDrawerWidth;
+            return NeoChatConfig.roomDrawerWidth;
         }
     }
 
@@ -52,7 +46,8 @@ Kirigami.OverlayDrawer {
         visible: true
         onPressed: _lastX = mapToGlobal(mouseX, mouseY).x
         onReleased: {
-            root.roomDrawerWidth = root.actualWidth;
+            NeoChatConfig.roomDrawerWidth = root.actualWidth;
+            NeoChatConfig.save();
         }
         property real _lastX: -1
 
@@ -61,9 +56,9 @@ Kirigami.OverlayDrawer {
                 return;
             }
             if (Qt.application.layoutDirection === Qt.RightToLeft) {
-                root.actualWidth = Math.min(root.maxWidth, Math.max(root.minWidth, root.roomDrawerWidth - _lastX + mapToGlobal(mouseX, mouseY).x));
+                root.actualWidth = Math.min(root.maxWidth, Math.max(root.minWidth, NeoChatConfig.roomDrawerWidth - _lastX + mapToGlobal(mouseX, mouseY).x));
             } else {
-                root.actualWidth = Math.min(root.maxWidth, Math.max(root.minWidth, root.roomDrawerWidth + _lastX - mapToGlobal(mouseX, mouseY).x));
+                root.actualWidth = Math.min(root.maxWidth, Math.max(root.minWidth, NeoChatConfig.roomDrawerWidth + _lastX - mapToGlobal(mouseX, mouseY).x));
             }
         }
     }
@@ -126,7 +121,7 @@ Kirigami.OverlayDrawer {
                             QQC2.ToolTip.visible: hovered
 
                             onClicked: {
-                                Settings.RoomSettingsView.openRoomSettings(root.room, Settings.RoomSettingsView.Room);
+                                RoomSettingsView.openRoomSettings(root.room, RoomSettingsView.Room);
                             }
                         }
                     }
@@ -143,17 +138,15 @@ Kirigami.OverlayDrawer {
                     id: roomInformation
                     RoomInformation {
                         room: root.room
-                        userListModel: root.userListModel
-
-                        onResolveResource: (idOrUri, action) => root.resolveResource(idOrUri, action)
+                        connection: root.connection
                     }
                 }
 
                 Component {
                     id: roomMedia
                     RoomMedia {
-                        room: root.room
-                        mediaMessageFilterModel: root.mediaMessageFilterModel
+                        currentRoom: root.room
+                        connection: root.connection
                     }
                 }
 

src/app/qml/RoomDrawerPage.qml

@@ -7,8 +7,7 @@ import QtQuick.Layouts
 import org.kde.kirigami as Kirigami
 import org.kde.kitemmodels
 
-import org.kde.neochat.libneochat
-import org.kde.neochat.timeline as Timeline
+import org.kde.neochat
 
 /**
  * @brief Page for holding a room drawer component.
@@ -25,12 +24,8 @@ Kirigami.Page {
     /**
      * @brief The current room that user is viewing.
      */
-    required property NeoChatRoom room
+    readonly property NeoChatRoom room: RoomManager.currentRoom
     required property NeoChatConnection connection
-    required property UserListModel userListModel
-    required property Timeline.MediaMessageFilterModel mediaMessageFilterModel
-
-    signal resolveResource(string idOrUri, string action)
 
     title: drawerItemLoader.item ? drawerItemLoader.item.title : ""
 
@@ -66,17 +61,15 @@ Kirigami.Page {
         id: roomInformation
         RoomInformation {
             room: root.room
-            userListModel: root.userListModel
-
-            onResolveResource: (idOrUri, action) => root.resolveResource(idOrUri, action)
+            connection: root.connection
         }
     }
 
     Component {
         id: roomMedia
         RoomMedia {
-            room: root.room
-            mediaMessageFilterModel: root.mediaMessageFilterModel
+            currentRoom: root.room
+            connection: root.connection
         }
     }
 

src/app/qml/RoomInformation.qml

@@ -12,7 +12,7 @@ import org.kde.kirigamiaddons.delegates as Delegates
 import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 import org.kde.kitemmodels
 
-import org.kde.neochat.libneochat
+import org.kde.neochat
 
 /**
  * @brief Component for visualising the room information.
@@ -34,15 +34,13 @@ QQC2.ScrollView {
      */
     required property NeoChatRoom room
 
-    required property UserListModel userListModel
+    required property NeoChatConnection connection
 
     /**
      * @brief The title that should be displayed for this component if available.
      */
     readonly property string title: root.room.isSpace ? i18nc("@action:title", "Space Members") : i18nc("@action:title", "Room Information")
 
-    signal resolveResource(string idOrUri, string action)
-
     // HACK: Hide unnecessary horizontal scrollbar (https://bugreports.qt.io/browse/QTBUG-83890)
     QQC2.ScrollBar.horizontal.policy: QQC2.ScrollBar.AlwaysOff
 
@@ -218,7 +216,7 @@ QQC2.ScrollView {
 
         UserFilterModel {
             id: userFilterModel
-            sourceModel: root.userListModel
+            sourceModel: RoomManager.userListModel
             allowEmpty: true
         }
 
@@ -251,7 +249,7 @@ QQC2.ScrollView {
             KeyNavigation.backtab: index === 0 ? userList.headerItem.userListSearchField : null
 
             onClicked: {
-                root.resolveResource(userDelegate.userId, "mention");
+                RoomManager.resolveResource(userDelegate.userId, "mention");
             }
 
             contentItem: RowLayout {
@@ -288,8 +286,6 @@ QQC2.ScrollView {
         id: directChatDrawerHeader
         DirectChatDrawerHeader {
             room: root.room
-
-            onResolveResource: (idOrUri, action) => root.resolveResource(idOrUri, action)
         }
     }
 

src/app/qml/RoomMedia.qml

@@ -6,8 +6,8 @@ import QtQuick.Controls as QQC2
 import QtQuick.Layouts
 import Qt.labs.qmlmodels
 
-import org.kde.neochat.libneochat
-import org.kde.neochat.timeline as Timeline
+import org.kde.neochat
+import org.kde.neochat.timeline
 
 /**
  * @brief Component for visualising the loaded media items in the room.
@@ -31,9 +31,9 @@ QQC2.ScrollView {
     /**
      * @brief The current room that user is viewing.
      */
-    required property NeoChatRoom room
+    required property NeoChatRoom currentRoom
 
-    required property Timeline.MediaMessageFilterModel mediaMessageFilterModel
+    required property NeoChatConnection connection
 
     // HACK: Hide unnecessary horizontal scrollbar (https://bugreports.qt.io/browse/QTBUG-83890)
     QQC2.ScrollBar.horizontal.policy: QQC2.ScrollBar.AlwaysOff
@@ -42,26 +42,26 @@ QQC2.ScrollView {
         clip: true
         verticalLayoutDirection: ListView.BottomToTop
 
-        model: root.mediaMessageFilterModel
+        model: RoomManager.mediaMessageFilterModel
 
         delegate: DelegateChooser {
             role: "type"
 
             DelegateChoice {
-                roleValue: Timeline.MediaMessageFilterModel.Image
-                delegate: Timeline.MessageDelegate {
+                roleValue: MediaMessageFilterModel.Image
+                delegate: MessageDelegate {
                     alwaysFillWidth: true
                     cardBackground: false
-                    room: root.room
+                    room: root.currentRoom
                 }
             }
 
             DelegateChoice {
-                roleValue: Timeline.MediaMessageFilterModel.Video
-                delegate: Timeline.MessageDelegate {
+                roleValue: MediaMessageFilterModel.Video
+                delegate: MessageDelegate {
                     alwaysFillWidth: true
                     cardBackground: false
-                    room: root.room
+                    room: root.currentRoom
                 }
             }
         }

src/app/qml/RoomPage.qml

@@ -137,9 +137,7 @@ Kirigami.Page {
         id: spaceLoader
         active: root.currentRoom && root.currentRoom.isSpace
         anchors.fill: parent
-        sourceComponent: SpaceHomePage {
-            room: root.currentRoom
-        }
+        sourceComponent: SpaceHomePage {}
     }
 
     Loader {

src/app/qml/RoomPinnedMessagesPage.qml

@@ -6,7 +6,7 @@ import QtQuick.Layouts
 
 import org.kde.kirigami as Kirigami
 
-import org.kde.neochat.libneochat
+import org.kde.neochat
 import org.kde.neochat.timeline
 
 /**

src/app/qml/RoomSearchPage.qml

@@ -3,7 +3,7 @@
 
 import QtQuick
 
-import org.kde.neochat.libneochat
+import org.kde.neochat
 import org.kde.neochat.timeline
 
 /**

src/app/qml/ServerComboBox.qml

@@ -102,7 +102,7 @@ QQC2.ComboBox {
         }
     }
 
-    Kirigami.Dialog {
+    QQC2.Dialog {
         id: addServerSheet
 
         width: Math.min(Kirigami.Units.gridUnit * 15, QQC2.ApplicationWindow.window.width)
@@ -182,15 +182,19 @@ QQC2.ComboBox {
             }
         }
 
-        customFooterActions: Kirigami.Action {
-            text: i18nc("@action:button", "Ok")
-            enabled: serverUrlField.acceptableInput && serverUrlField.isValidServer
-            onTriggered: {
-                serverListModel.addServer(serverUrlField.text);
-                root.currentIndex = root.indexOfValue(serverUrlField.text);
-                root.server = root.currentValue;
-                serverUrlField.text = "";
-                addServerSheet.close();
+        footer: QQC2.DialogButtonBox {
+            QQC2.Button {
+                enabled: serverUrlField.acceptableInput && serverUrlField.isValidServer
+                text: i18nc("@action:button", "Ok")
+                QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.AcceptRole
+                icon.name: "dialog-ok"
+                onClicked: {
+                    serverListModel.addServer(serverUrlField.text);
+                    root.currentIndex = root.indexOfValue(serverUrlField.text);
+                    root.server = root.currentValue;
+                    serverUrlField.text = "";
+                    addServerSheet.close();
+                }
             }
         }
     }

src/app/qml/UserDetailDialog.qml

@@ -13,7 +13,7 @@ import org.kde.prison
 
 import org.kde.neochat
 
-Kirigami.Dialog {
+QQC2.Dialog {
     id: root
 
     // This dialog is sometimes used outside the context of a room, e.g., when scanning a user's QR code.
@@ -28,7 +28,7 @@ Kirigami.Dialog {
     topPadding: 0
     bottomPadding: 0
 
-    standardButtons: Kirigami.Dialog.NoButton
+    standardButtons: QQC2.Dialog.NoButton
 
     width: Math.min(QQC2.ApplicationWindow.window.width, Kirigami.Units.gridUnit * 24)
     title: i18nc("@title:menu Account details dialog", "Account Details")

src/app/qml/UserMenu.qml

@@ -1,74 +0,0 @@
-// SPDX-FileCopyrightText: 2025 Joshua Goins <josh@redstrate.com>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-import QtQuick
-import QtQuick.Controls as QQC2
-import QtQuick.Layouts
-
-import org.kde.kirigami as Kirigami
-import org.kde.kirigamiaddons.components as KirigamiComponents
-
-import org.kde.neochat
-import org.kde.neochat.settings
-import org.kde.neochat.devtools
-
-KirigamiComponents.ConvergentContextMenu {
-    id: root
-
-    required property Kirigami.ApplicationWindow window
-    required property var author
-
-    headerContentItem: RowLayout {
-        id: detailRow
-
-        spacing: Kirigami.Units.largeSpacing
-
-        KirigamiComponents.Avatar {
-            id: avatar
-            Layout.preferredWidth: Kirigami.Units.iconSizes.medium
-            Layout.preferredHeight: Kirigami.Units.iconSizes.medium
-
-            name: root.author.displayName
-            source: root.author.avatarUrl
-            color: root.author.color
-        }
-
-        ColumnLayout {
-            Layout.fillWidth: true
-
-            spacing: 0
-
-            Kirigami.Heading {
-                level: 1
-                Layout.fillWidth: true
-                font.bold: true
-
-                elide: Text.ElideRight
-                wrapMode: Text.NoWrap
-                text: root.author.displayName
-                textFormat: Text.PlainText
-            }
-
-            QQC2.Label {
-                id: idLabel
-                textFormat: TextEdit.PlainText
-                text: root.author.id
-                elide: Qt.ElideRight
-            }
-        }
-    }
-
-    QQC2.Action {
-        text: i18nc("@action:button", "Open Profile")
-        icon.name: "im-user-symbolic"
-        onTriggered: RoomManager.resolveResource(root.author.uri)
-    }
-
-    QQC2.Action {
-        text: i18nc("@action:button", "Mention")
-        icon.name: "username-copy-symbolic"
-        onTriggered: {
-            RoomManager.currentRoom.mainCache.mentionAdded(root.author.id);
-        }
-    }
-}

src/app/roommanager.cpp

@@ -448,27 +448,29 @@ void RoomManager::knockRoom(NeoChatConnection *account, const QString &roomAlias
         Qt::SingleShotConnection);
 }
 
-void RoomManager::roomLeft(const QString &id)
-{
-    if (id.isEmpty()) {
-        return;
-    }
-
-    if (m_currentRoom && m_currentRoom->id() == id) {
-        setCurrentRoom({});
-    }
-
-    if (m_currentSpaceId == id) {
-        setCurrentSpace({});
-    }
-}
-
 bool RoomManager::visitNonMatrix(const QUrl &url)
 {
     UrlHelper().openUrl(url);
     return true;
 }
 
+void RoomManager::leaveRoom(NeoChatRoom *room)
+{
+    if (!room) {
+        return;
+    }
+
+    if (m_currentRoom && m_currentRoom->id() == room->id()) {
+        setCurrentRoom({});
+    }
+
+    if (m_currentSpaceId == room->id()) {
+        setCurrentSpace({});
+    }
+
+    room->forget();
+}
+
 ChatDocumentHandler *RoomManager::chatDocumentHandler() const
 {
     return m_chatDocumentHandler;

src/app/roommanager.h

@@ -195,6 +195,11 @@ public:
      */
     Q_INVOKABLE void loadInitialRoom();
 
+    /**
+     * @brief Leave the room and close it if it is open.
+     */
+    Q_INVOKABLE void leaveRoom(NeoChatRoom *room);
+
     /**
      * @brief Knock a room.
      *
@@ -203,13 +208,6 @@ public:
      */
     void knockRoom(NeoChatConnection *account, const QString &roomAliasOrId, const QString &reason, const QStringList &viaServers);
 
-    /**
-     * @brief Cleanup after the given room is left.
-     *
-     * This ensures that the current room and space are not set to the left room.
-     */
-    void roomLeft(const QString &id);
-
     /**
      * @brief Show a media item maximized.
      *

src/chatbar/ChatBar.qml

@@ -55,19 +55,6 @@ QQC2.Control {
         }
     }
 
-    Connections {
-        target: currentRoom.mainCache
-
-        function onMentionAdded(mention: string): void {
-            // add mention text
-            textField.append(mention + " ");
-            // move cursor to the end
-            textField.cursorPosition = textField.text.length;
-            // move the focus back to the chat bar
-            textField.forceActiveFocus(Qt.OtherFocusReason);
-        }
-    }
-
     /**
      * @brief The list of actions in the ChatBar.
      *
@@ -136,7 +123,7 @@ QQC2.Control {
             displayHint: QQC2.AbstractButton.IconOnly
 
             onTriggered: {
-                newPollDialog.createObject(QQC2.Overlay.overlay, {
+                newPollDialog.createObject(root.QQC2.Overlay.overlay, {
                     room: root.currentRoom
                 }).open();
             }

src/libneochat/CMakeLists.txt

@@ -41,21 +41,12 @@ target_sources(LibNeoChat PRIVATE
     models/locationsmodel.cpp
     models/roomlistmodel.cpp
     models/stickermodel.cpp
-    models/userfiltermodel.cpp
     models/userlistmodel.cpp
 )
 
 ecm_add_qml_module(LibNeoChat GENERATE_PLUGIN_SOURCE
     URI org.kde.neochat.libneochat
     OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/neochat/libneochat
-    QML_FILES
-        qml/GroupChatDrawerHeader.qml
-        qml/LocationMapItem.qml
-        qml/InviteUserPage.qml
-        qml/ExploreRoomsPage.qml
-        qml/SearchPage.qml
-        qml/CreateRoomDialog.qml
-        qml/CreateSpaceDialog.qml
 )
 
 ecm_qt_declare_logging_category(LibNeoChat

src/libneochat/chatbarcache.h

@@ -195,7 +195,6 @@ Q_SIGNALS:
     void relationIdChanged(const QString &oldEventId, const QString &newEventId);
     void threadIdChanged(const QString &oldThreadId, const QString &newThreadId);
     void attachmentPathChanged();
-    void mentionAdded(const QString &mention);
 
 private:
     QString m_text = QString();

src/libneochat/models/actionsmodel.cpp

@@ -29,7 +29,7 @@ QStringList rainbowColors{"#ff2b00"_L1, "#ff5500"_L1, "#ff8000"_L1, "#ffaa00"_L1
 auto leaveRoomLambda = [](const QString &text, NeoChatRoom *room, ChatBarCache *) {
     if (text.isEmpty()) {
         Q_EMIT room->showMessage(MessageType::Information, i18n("Leaving this room."));
-        room->forget();
+        room->connection()->leaveRoom(room);
     } else {
         QRegularExpression roomRegex(uR"(^[#!][^:]+:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?)"_s);
         auto regexMatch = roomRegex.match(text);
@@ -38,13 +38,13 @@ auto leaveRoomLambda = [](const QString &text, NeoChatRoom *room, ChatBarCache *
                                      i18nc("'<text>' does not look like a room id or alias.", "'%1' does not look like a room id or alias.", text));
             return QString();
         }
-        auto leaving = dynamic_cast<NeoChatRoom *>(room->connection()->room(text));
+        auto leaving = room->connection()->room(text);
         if (!leaving) {
-            leaving = dynamic_cast<NeoChatRoom *>(room->connection()->roomByAlias(text));
+            leaving = room->connection()->roomByAlias(text);
         }
         if (leaving) {
             Q_EMIT room->showMessage(MessageType::Information, i18nc("Leaving room <roomname>.", "Leaving room %1.", text));
-            leaving->forget();
+            room->connection()->leaveRoom(leaving);
         } else {
             Q_EMIT room->showMessage(MessageType::Information, i18nc("Room <roomname> not found", "Room %1 not found.", text));
         }

src/libneochat/neochatconnection.cpp

@@ -9,7 +9,6 @@
 #include "neochatroom.h"
 #include "spacehierarchycache.h"
 
-#include <Quotient/connection.h>
 #include <Quotient/jobs/basejob.h>
 #include <Quotient/quotient_common.h>
 #include <qt6keychain/keychain.h>
@@ -387,13 +386,6 @@ void NeoChatConnection::createSpace(const QString &name, const QString &topic, c
     });
 }
 
-Quotient::ForgetRoomJob *NeoChatConnection::forgetRoom(const QString &id)
-{
-    Q_EMIT roomAboutToBeLeft(id);
-
-    return Connection::forgetRoom(id);
-}
-
 bool NeoChatConnection::directChatExists(Quotient::User *user)
 {
     return directChats().contains(user);

src/libneochat/neochatconnection.h

@@ -150,14 +150,6 @@ public:
      */
     Q_INVOKABLE void createSpace(const QString &name, const QString &topic, const QString &parent = {}, bool setChildParent = false);
 
-    /**
-     * @brief Send /forget to the server and delete room locally.
-     *
-     * @note This wraps around the Quotient::Connection::forgetRoom() to allow
-     *       roomAboutToBeLeft() to be emitted.
-     */
-    Quotient::ForgetRoomJob *forgetRoom(const QString &id);
-
     /**
      * @brief Whether a direct chat with the user exists.
      */
@@ -232,11 +224,6 @@ Q_SIGNALS:
      */
     void errorOccured(const QString &error);
 
-    /**
-     * @brief The given room ID is about to be forgotten.
-     */
-    void roomAboutToBeLeft(const QString &id);
-
 private:
     static bool m_globalUrlPreviewDefault;
     static PushRuleAction::Action m_defaultAction;

src/libneochat/neochatroom.cpp

@@ -305,9 +305,8 @@ void NeoChatRoom::forget()
         roomIds += predecessor->id();
     }
 
-    const auto neochatConnection = dynamic_cast<NeoChatConnection *>(connection());
     for (const auto &id : roomIds) {
-        neochatConnection->forgetRoom(id);
+        connection()->forgetRoom(id);
     }
 }
 

src/libneochat/qml/CreateRoomDialog.qml

@@ -1,73 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-or-later OR LicenseRef-KDE-Accepted-GPL
-
-import QtQuick
-import QtQuick.Controls as QQC2
-import QtQuick.Layouts
-
-import org.kde.kirigami as Kirigami
-import org.kde.kirigamiaddons.formcard as FormCard
-import org.kde.kirigamiaddons.labs.components as Components
-
-import org.kde.neochat
-
-Kirigami.Dialog {
-    id: root
-
-    property string parentId
-
-    required property NeoChatConnection connection
-
-    signal newChild(string childName)
-
-    title: i18nc("@title", "Create Room")
-    implicitWidth: Kirigami.Units.gridUnit * 20
-    standardButtons: Kirigami.Dialog.Cancel
-
-    customFooterActions: [
-        Kirigami.Action {
-            icon.name: "list-add-symbolic"
-            text: i18nc("@action:button Create new room", "Create")
-            enabled: roomNameField.text.length > 0
-            onTriggered: {
-                root.connection.createRoom(roomNameField.text, "", root.parentId, false);
-                root.newChild(roomNameField.text);
-                root.close();
-            }
-        }
-    ]
-
-    Component.onCompleted: roomNameField.forceActiveFocus()
-
-    ColumnLayout {
-        spacing: Kirigami.Units.largeSpacing
-
-        FormCard.FormRadioDelegate {
-            id: privateTypeDelegate
-            text: i18nc("@info:label", "Private")
-            description: i18nc("@info:description", "This room can only be joined with an invite.")
-            checked: true
-        }
-
-        FormCard.FormRadioDelegate {
-            id: publicTypeDelegate
-            text: i18nc("@info:label", "Public")
-            description: i18nc("@info:description", "This room can be found and joined by anyone.")
-        }
-
-        FormCard.FormDelegateSeparator {}
-
-        FormCard.FormTextFieldDelegate {
-            id: roomNameField
-            label: i18nc("@info:label Name of the room", "Name:")
-            placeholderText: i18nc("@info:placeholder Placeholder for room name", "New Room")
-        }
-
-        FormCard.FormTextFieldDelegate {
-            id: roomAddressField
-            label: i18nc("@info:label Address or alias to refer to the room by", "Address:")
-            placeholderText: i18nc("@info:placeholder Placeholder address for the room", "new-room")
-            visible: publicTypeDelegate.checked
-        }
-    }
-}

src/libneochat/qml/CreateSpaceDialog.qml

@@ -1,64 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-or-later OR LicenseRef-KDE-Accepted-GPL
-
-import QtQuick
-import QtQuick.Controls as QQC2
-import QtQuick.Layouts
-
-import org.kde.kirigami as Kirigami
-import org.kde.kirigamiaddons.formcard as FormCard
-import org.kde.kirigamiaddons.labs.components as Components
-
-import org.kde.neochat
-
-Kirigami.Dialog {
-    id: root
-
-    property string parentId
-
-    required property NeoChatConnection connection
-
-    signal newChild(string childName)
-
-    title: i18nc("@title", "Create a Space")
-    implicitWidth: Kirigami.Units.gridUnit * 20
-    standardButtons: Kirigami.Dialog.Cancel
-
-    Component.onCompleted: roomNameField.forceActiveFocus()
-
-    customFooterActions: [
-        Kirigami.Action {
-            icon.name: "list-add-symbolic"
-            text: i18nc("@action:button Create new space", "Create")
-            enabled: roomNameField.text.length > 0
-            onTriggered: {
-                root.connection.createSpace(roomNameField.text, "", root.parentId, newOfficialCheck.checked);
-                root.newChild(roomNameField.text);
-                root.close();
-            }
-        }
-    ]
-
-    ColumnLayout {
-        spacing: Kirigami.Units.largeSpacing
-
-        FormCard.FormTextFieldDelegate {
-            id: roomNameField
-            label: i18nc("@info:label Name of the space", "Name:")
-            placeholderText: i18nc("@info:placeholder", "New Space")
-        }
-
-        FormCard.FormDelegateSeparator {
-            above: roomNameField
-            below: newOfficialCheck
-            visible: newOfficialCheck.visible
-        }
-
-        FormCard.FormCheckDelegate {
-            id: newOfficialCheck
-            visible: root.parentId.length > 0
-            text: i18nc("@option:check As in make the space from which this dialog was created an official parent.", "Make this parent official")
-            checked: true
-        }
-    }
-}

src/roominfo/CMakeLists.txt

@@ -1,17 +0,0 @@
-# SPDX-FileCopyrightText: 2025 James Graham <james.h.graham@protonmail.com>
-# SPDX-License-Identifier: BSD-2-Clause
-
-qt_add_library(RoomInfo STATIC)
-ecm_add_qml_module(RoomInfo GENERATE_PLUGIN_SOURCE
-    URI org.kde.neochat.roominfo
-    OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/neochat/roominfo
-    QML_FILES
-        RoomDrawer.qml
-        RoomDrawerPage.qml
-        RoomInformation.qml
-        RoomMedia.qml
-        DirectChatDrawerHeader.qml
-        LocationsPage.qml
-        RoomPinnedMessagesPage.qml
-        RoomSearchPage.qml
-)

src/rooms/ExploreComponent.qml

@@ -90,13 +90,29 @@ RowLayout {
                 action: QQC2.Action {
                     shortcut: StandardKey.New
                     onTriggered: {
-                        Qt.createComponent('org.kde.neochat', 'CreateRoomDialog').createObject(root, {
+                        pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'CreateRoomDialog'), {
                             connection: root.connection
-                        }).open();
+                        }, {
+                            title: i18nc("@title", "Create a Room")
+                        });
                     }
                 }
             }
 
+            QQC2.MenuItem {
+                text: i18n("Create a Space")
+                icon.name: "list-add"
+                onTriggered: {
+                    pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'CreateRoomDialog'), {
+                        connection: root.connection,
+                        isSpace: true,
+                        title: i18nc("@title", "Create a Space")
+                    }, {
+                        title: i18nc("@title", "Create a Space")
+                    });
+                }
+            }
+
             QQC2.MenuItem {
                 text: i18n("Scan a QR Code")
                 icon.name: "view-barcode-qr"

src/rooms/ExploreComponentMobile.qml

@@ -159,9 +159,13 @@ Kirigami.NavigationTabBar {
                         text: i18n("Create a Space")
                         icon.name: "list-add"
                         onTriggered: {
-                            Qt.createComponent('org.kde.neochat', 'CreateSpaceDialog').createObject(root, {
-                                connection: root.connection
-                            }).open();
+                            pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'CreateRoomDialog'), {
+                                connection: root.connection,
+                                isSpace: true,
+                                title: i18nc("@title", "Create a Space")
+                            }, {
+                                title: i18nc("@title", "Create a Space")
+                            });
                             explorePopup.close();
                         }
                     }

src/rooms/SpaceDrawer.qml

@@ -268,11 +268,13 @@ QQC2.Control {
 
                     activeFocusOnTab: true
 
-                    onSelected: {
-                        Qt.createComponent('org.kde.neochat', 'CreateSpaceDialog').createObject(root, {
-                            connection: root.connection
-                        }).open();
-                    }
+                    onSelected: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'CreateRoomDialog'), {
+                        connection: root.connection,
+                        isSpace: true,
+                        title: i18nc("@title", "Create a Space")
+                    }, {
+                        title: i18nc("@title", "Create a Space")
+                    })
                 }
 
                 AvatarTabButton {

src/rooms/SpaceListContextMenu.qml

@@ -72,6 +72,6 @@ KirigamiComponents.ConvergentContextMenu {
     QQC2.Action {
         text: i18nc("'Space' is a matrix space", "Leave Space")
         icon.name: "go-previous"
-        onTriggered: root.room.forget()
+        onTriggered: RoomManager.leaveRoom(room)
     }
 }