Move dialogs into a separate dir and create them dynamically.

Add "ignore user".
Update libqmatrixclient.
This commit is contained in:
Black Hat
2019-04-26 19:59:01 +08:00
parent 6a2f0c2105
commit 5ae1d41e92
23 changed files with 766 additions and 482 deletions

View File

@@ -3,9 +3,9 @@
#include "connection.h"
#include "notifications/manager.h"
#include "room.h"
#include "settings.h"
#include "user.h"
#include "room.h"
#include <QApplication>
#include <QMediaPlayer>
@@ -54,13 +54,16 @@ class Controller : public QObject {
}
Connection* connection() {
if (m_connection.isNull()) return nullptr;
if (m_connection.isNull())
return nullptr;
return m_connection;
}
void setConnection(Connection* conn) {
if (!conn) return;
if (conn == m_connection) return;
if (!conn)
return;
if (conn == m_connection)
return;
m_connection = conn;
emit connectionChanged();
}
@@ -100,9 +103,12 @@ class Controller : public QObject {
void createDirectChat(Connection* c, const QString& userID);
void copyToClipboard(const QString& text);
void playAudio(QUrl localFile);
void postNotification(const QString& roomId, const QString& eventId,
const QString& roomName, const QString& senderName,
const QString& text, const QImage& icon);
void postNotification(const QString& roomId,
const QString& eventId,
const QString& roomName,
const QString& senderName,
const QString& text,
const QImage& icon);
};
#endif // CONTROLLER_H