Fix imageprovider.

main.cpp

@@ -37,7 +37,9 @@ int main(int argc, char *argv[])
     ImageProvider* m_provider = new ImageProvider();
 
     engine.rootContext()->setContextProperty("imageProvider", m_provider->getConnection());
+
     engine.addImageProvider(QLatin1String("mxc"), m_provider);
+
     engine.load(QUrl(QStringLiteral("qrc:/qml/main.qml")));
 
     if (engine.rootObjects().isEmpty())

matrique.pro

@@ -18,7 +18,8 @@ SOURCES += main.cpp \
     matrix/controller.cpp \
     matrix/roomlistmodel.cpp \
     matrix/imageprovider.cpp \
-    matrix/messageeventmodel.cpp
+    matrix/messageeventmodel.cpp \
+    matrix/imageproviderconnection.cpp
 
 RESOURCES += \
     res.qrc
@@ -52,4 +53,5 @@ HEADERS += \
     matrix/controller.h \
     matrix/roomlistmodel.h \
     matrix/imageprovider.h \
-    matrix/messageeventmodel.h
+    matrix/messageeventmodel.h \
+    matrix/imageproviderconnection.h

matrix/controller.cpp

@@ -10,7 +10,7 @@ Controller::Controller(QObject *parent) : QObject(parent) {
 }
 
 Controller::~Controller() {
-
+    m_connection->stopSync();
 }
 
 void Controller::login() {

matrix/imageprovider.cpp

@@ -10,14 +10,6 @@
 
 using QMatrixClient::MediaThumbnailJob;
 
-ImageProviderConnection::ImageProviderConnection(QObject* parent) : QObject(parent) {
-
-}
-
-ImageProviderConnection::~ImageProviderConnection() {
-
-}
-
 ImageProvider::ImageProvider(QObject* parent)
     : QQuickImageProvider(QQmlImageProviderBase::Image,
                           QQmlImageProviderBase::ForceAsynchronousImageLoading)

matrix/imageprovider.h

@@ -6,28 +6,7 @@
 #include <QObject>
 
 #include "libqmatrixclient/connection.h"
-
+#include "imageproviderconnection.h"
-class ImageProviderConnection: public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QMatrixClient::Connection* connection READ getConnection WRITE setConnection NOTIFY connectionChanged)
-
-    public:
-        explicit ImageProviderConnection(QObject* parent = nullptr);
-        ~ImageProviderConnection();
-
-        QMatrixClient::Connection* getConnection() { return m_connection; }
-        Q_INVOKABLE void setConnection(QMatrixClient::Connection* connection) {
-            qDebug() << "Connection changed.";
-            emit connectionChanged();
-            m_connection = connection;
-        }
-    private:
-        QMatrixClient::Connection* m_connection;
-    signals:
-        void connectionChanged();
-};
 
 class ImageProvider: public QQuickImageProvider
 {

matrix/imageproviderconnection.cpp

@@ -0,0 +1,9 @@
+#include "imageproviderconnection.h"
+
+ImageProviderConnection::ImageProviderConnection(QObject* parent) : QObject(parent) {
+
+}
+
+ImageProviderConnection::~ImageProviderConnection() {
+
+}

matrix/imageproviderconnection.h

@@ -0,0 +1,29 @@
+#ifndef IMAGEPROVIDERCONNECTION_H
+#define IMAGEPROVIDERCONNECTION_H
+
+#include <QObject>
+
+#include "libqmatrixclient/connection.h"
+
+class ImageProviderConnection : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QMatrixClient::Connection* connection READ getConnection WRITE setConnection NOTIFY connectionChanged)
+
+    public:
+        explicit ImageProviderConnection(QObject* parent = nullptr);
+        ~ImageProviderConnection();
+
+        QMatrixClient::Connection* getConnection() { return m_connection; }
+        void setConnection(QMatrixClient::Connection* connection) {
+            emit connectionChanged();
+            m_connection = connection;
+        }
+    private:
+        QMatrixClient::Connection* m_connection;
+    signals:
+        void connectionChanged();
+};
+
+#endif // IMAGEPROVIDERCONNECTION_H

matrix/roomlistmodel.cpp

@@ -70,12 +70,12 @@ QVariant RoomListModel::data(const QModelIndex& index, int role) const
     }
     if( role == Qt::DecorationRole )
     {
-        if(room->avatarUrl().toString() != "") {
+        if ( room->avatarUrl().toString() != "" ) {
             return room->avatarUrl();
         }
         return QVariant();
     }
-    if (role == Qt::StatusTipRole )
+    if ( role == Qt::StatusTipRole )
     {
         return room->topic();
     }

qml/Room.qml

@@ -22,14 +22,13 @@ Page {
             id: roomListForm
 
             Layout.fillHeight: true
-//            Layout.preferredWidth:  {
+            Layout.preferredWidth:  {
-//                if (page.width > 560) {
+                if (page.width > 560) {
-//                    return page.width * 0.4;
+                    return page.width * 0.4;
-//                } else {
+                } else {
-//                    return 80;
+                    return 80;
-//                }
+                }
-//            }
+            }
-            Layout.preferredWidth: 320
             Layout.maximumWidth: 360
 
             listModel: roomListModel

qml/form/ListForm.qml

@@ -45,6 +45,8 @@ Item {
                     Layout.fillHeight: true
                     Layout.alignment: Qt.AlignHCenter
 
+                    visible: parent.width > 80
+
                     Label {
                         Layout.fillWidth: true
                         Layout.fillHeight: true
@@ -79,9 +81,9 @@ Item {
             var roomCount = listModel.rowCount();
             for (var i = 0; i < roomCount; i++){
                 var roomName = "";
-                if (listModel.roomAt(i).name != "") {
+                if (listModel.roomAt(i).name !== "") {
                     roomName = listModel.roomAt(i).name;
-                } else if (model.alias != "") {
+                } else if (model.alias !== "") {
                     roomName = listModel.roomAt(i).alias;
                 } else {
                     roomName = listModel.roomAt(i).id;

qml/form/RoomForm.qml

@@ -16,7 +16,7 @@ Item {
 
         background: Item {
             anchors.fill: parent
-            visible: currentRoom == null
+            visible: currentRoom === null
             Pane {
                 anchors.fill: parent
             }
@@ -32,7 +32,7 @@ Item {
             anchors.fill: parent
             spacing: 0
 
-            visible: currentRoom != null
+            visible: currentRoom !== null
 
             Pane {
                 z: 10
@@ -61,7 +61,7 @@ Item {
 
                         Label {
                             Layout.fillWidth: true
-                            text: currentRoom != null ? currentRoom.name : ""
+                            text: currentRoom !== null ? currentRoom.displayName : ""
                             font.pointSize: 16
                             elide: Text.ElideRight
                             wrapMode: Text.NoWrap
@@ -69,7 +69,7 @@ Item {
 
                         Label {
                             Layout.fillWidth: true
-                            text: currentRoom != null ? currentRoom.topic : ""
+                            text: currentRoom !== null ? currentRoom.topic : ""
                             elide: Text.ElideRight
                             wrapMode: Text.NoWrap
                         }

qml/main.qml

@@ -138,7 +138,9 @@ ApplicationWindow {
 
                 SideNavButton {
                     contentItem: MaterialIcon { icon: "\ue879"; color: "white" }
-                    onClicked: Qt.quit()
+                    onClicked: {
+                        Qt.quit();
+                    }
                 }
             }
         }
@@ -153,7 +155,6 @@ ApplicationWindow {
     }
 
     Component.onCompleted: {
-        imageProvider.setConnection(matriqueController.connection)
         imageProvider.connection = matriqueController.connection
 
         console.log(matriqueController.homeserver, matriqueController.userID, matriqueController.token)