Fix duplicate room signals.

2018-07-19 13:54:59 +08:00
parent 1919f0ca8e
commit 43f02c4fa1
4 changed files with 21 additions and 9 deletions
--- a/qml/Room.qml
+++ b/qml/Room.qml
@@ -6,12 +6,16 @@ import Matrique 0.1
 import "qrc:/qml/form"

 Page {
-    property alias connection: roomListModel.connection
+    property var connection

    id: page

    RoomListModel {
        id: roomListModel
+
+        connection: matriqueController.isLogin ? page.connection : undefined
+
+        onNewMessage: console.log("New message in room " + room.displayName)
    }

    RowLayout {
@@ -31,7 +35,7 @@ Page {
            }
            Layout.maximumWidth: 360

-            listModel: roomListModel
+            listModel:  roomListModel
        }

        RoomForm {
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -101,6 +101,10 @@ ApplicationWindow {
        connection: matriqueController.connection
    }

+    Setting {
+        id: settingPage
+    }
+
    RowLayout {
        anchors.fill: parent
        spacing: 0
@@ -135,8 +139,7 @@ ApplicationWindow {

                SideNavButton {
                    contentItem: MaterialIcon { icon: "\ue8b8"; color: "white" }
-
-                    onClicked: matriqueController.logout()
+                    page: settingPage
                }

                SideNavButton {