Merge pull request #742 from LorenDB/qmlLeaveRoom

QML the leave room dialog

4 files changed, 45 insertions, 13 deletions

diff --git a/resources/qml/RoomList.qml b/resources/qml/RoomList.qml

index addbf571..85087bc4 100644
--- a/resources/qml/RoomList.qml
+++ b/resources/qml/RoomList.qml
@@ -71,19 +71,9 @@ Page {
                 }
             }
 
-            Platform.MessageDialog {
-                id: leaveRoomDialog
-
-                title: qsTr("Leave Room")
-                text: qsTr("Are you sure you want to leave this room?")
-                modality: Qt.ApplicationModal
-                onAccepted: Rooms.leave(roomContextMenu.roomid)
-                buttons: Dialog.Ok | Dialog.Cancel
-            }
-
             Platform.MenuItem {
                 text: qsTr("Leave room")
-                onTriggered: leaveRoomDialog.open()
+                onTriggered: TimelineManager.openLeaveRoomDialog(roomContextMenu.roomid)
             }
 
             Platform.MenuSeparator {
diff --git a/resources/qml/Root.qml b/resources/qml/Root.qml

index c73d1f1d..18130469 100644
--- a/resources/qml/Root.qml
+++ b/resources/qml/Root.qml
@@ -125,6 +125,13 @@ Page {
         }
     }
 
+    Component {
+        id: leaveRoomComponent
+
+        LeaveRoomDialog {
+        }
+    }
+
     Shortcut {
         sequence: "Ctrl+K"
         onActivated: {
@@ -209,6 +216,13 @@ Page {
             dialog.show();
         }
 
+        function onOpenLeaveRoomDialog(roomid) {
+            var dialog = leaveRoomComponent.createObject(timelineRoot, {
+                                                          "roomId": roomid
+                                                      });
+            dialog.open();
+        }
+
         target: TimelineManager
     }
 
diff --git a/resources/qml/dialogs/LeaveRoomDialog.qml b/resources/qml/dialogs/LeaveRoomDialog.qml
new file mode 100644

index 00000000..1341ad72
--- /dev/null
+++ b/resources/qml/dialogs/LeaveRoomDialog.qml
@@ -0,0 +1,20 @@
+// SPDX-FileCopyrightText: 2021 Nheko Contributors
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import Qt.labs.platform 1.1
+import im.nheko 1.0
+
+MessageDialog {
+    id: leaveRoomRoot
+
+    required property string roomId
+
+    title: qsTr("Leave room")
+    text: qsTr("Are you sure you want to leave?")
+    modality: Qt.ApplicationModal
+    buttons: Dialog.Ok | Dialog.Cancel
+    onAccepted: Rooms.leave(roomId)
+}
diff --git a/resources/res.qrc b/resources/res.qrc

index 9303ab5f..ffbadd91 100644
--- a/resources/res.qrc
+++ b/resources/res.qrc
@@ -185,8 +185,16 @@
         <file>qml/voip/VideoCall.qml</file>
         <file>qml/components/AdaptiveLayout.qml</file>
         <file>qml/components/AdaptiveLayoutElement.qml</file>
-        <file>qml/components/AvatarListTile.qml</file>
-		<file>qml/components/FlatButton.qml</file>
+		<file>qml/components/AvatarListTile.qml</file>
+        <file>qml/components/FlatButton.qml</file>
+        <file>qml/dialogs/InviteDialog.qml</file>
+		<file>qml/dialogs/LeaveRoomDialog.qml</file>
+        <file>qml/dialogs/RawMessageDialog.qml</file>
+        <file>qml/dialogs/ReadReceipts.qml</file>
+        <file>qml/dialogs/RoomDirectory.qml</file>
+        <file>qml/dialogs/RoomMembers.qml</file>
+        <file>qml/dialogs/RoomSettings.qml</file>
+		<file>qml/dialogs/UserProfile.qml</file>
     </qresource>
     <qresource prefix="/media">
         <file>media/ring.ogg</file>