Add avatar support.

2018-03-02 16:56:36 +08:00
parent 6a610e3808
commit d4c2a1ed50
10 changed files with 148 additions and 52 deletions
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -18,17 +18,16 @@ ApplicationWindow {
    title: qsTr("Matrique")

    Controller {
-        id: controller
-
-        onIsLoginChanged: console.log("Status:", isLogin)
+        id: matrixController
+        connection: m_connection
    }

-    Settings {
-        id: settings
+//    Settings {
+//        id: settings

-        property alias userID: controller.userID
-        property alias token: controller.token
-    }
+//        property var userID
+//        property var token
+//    }

    FontLoader { id: materialFont; source: "qrc:/asset/font/material.ttf" }

@@ -51,7 +50,7 @@ ApplicationWindow {

                page: Room {
                    id: roomPage
-                    roomListModel: controller.roomListModel
+                    roomListModel: matrixController.roomListModel//BUG: It will cause random crash as roomListModel may not be initialized.
                }
            }

@@ -72,7 +71,7 @@ ApplicationWindow {

                page: Login {
                    id: loginPage
-                    controller: controller
+                    controller: matrixController
                }
            }