parent
878bcaa84d
commit
babe614555
|
@ -74,6 +74,10 @@ void Controller::loginWithCredentials(QString serverAddr, QString user,
|
||||||
account.sync();
|
account.sync();
|
||||||
addConnection(m_connection);
|
addConnection(m_connection);
|
||||||
});
|
});
|
||||||
|
connect(m_connection, &Connection::networkError,
|
||||||
|
[=](QString error, QByteArray detail) {
|
||||||
|
emit errorOccured("Network", error);
|
||||||
|
});
|
||||||
connect(m_connection, &Connection::loginError,
|
connect(m_connection, &Connection::loginError,
|
||||||
[=](QString error, QByteArray detail) {
|
[=](QString error, QByteArray detail) {
|
||||||
emit errorOccured("Login Failed", error);
|
emit errorOccured("Login Failed", error);
|
||||||
|
@ -141,6 +145,14 @@ void Controller::invokeLogin() {
|
||||||
c->loadState();
|
c->loadState();
|
||||||
addConnection(c);
|
addConnection(c);
|
||||||
});
|
});
|
||||||
|
connect(c, &Connection::loginError,
|
||||||
|
[=](QString error, QByteArray detail) {
|
||||||
|
emit errorOccured("Login Failed", error);
|
||||||
|
});
|
||||||
|
connect(c, &Connection::networkError,
|
||||||
|
[=](QString error, QByteArray detail) {
|
||||||
|
emit errorOccured("Network", error);
|
||||||
|
});
|
||||||
c->connectWithToken(account.userId(), accessToken, account.deviceId());
|
c->connectWithToken(account.userId(), accessToken, account.deviceId());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,6 +14,8 @@
|
||||||
SpectralRoom::SpectralRoom(Connection* connection, QString roomId,
|
SpectralRoom::SpectralRoom(Connection* connection, QString roomId,
|
||||||
JoinState joinState)
|
JoinState joinState)
|
||||||
: Room(connection, std::move(roomId), joinState) {
|
: Room(connection, std::move(roomId), joinState) {
|
||||||
|
connect(this, &Room::avatarChanged, this,
|
||||||
|
&SpectralRoom::inheritedAvatarChanged);
|
||||||
connect(this, &SpectralRoom::notificationCountChanged, this,
|
connect(this, &SpectralRoom::notificationCountChanged, this,
|
||||||
&SpectralRoom::countChanged);
|
&SpectralRoom::countChanged);
|
||||||
connect(this, &SpectralRoom::highlightCountChanged, this,
|
connect(this, &SpectralRoom::highlightCountChanged, this,
|
||||||
|
|
|
@ -10,7 +10,7 @@ using namespace QMatrixClient;
|
||||||
|
|
||||||
class SpectralRoom : public Room {
|
class SpectralRoom : public Room {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
Q_PROPERTY(QImage avatar READ getAvatar NOTIFY avatarChanged)
|
Q_PROPERTY(QImage avatar READ getAvatar NOTIFY inheritedAvatarChanged)
|
||||||
Q_PROPERTY(bool hasUsersTyping READ hasUsersTyping NOTIFY typingChanged)
|
Q_PROPERTY(bool hasUsersTyping READ hasUsersTyping NOTIFY typingChanged)
|
||||||
Q_PROPERTY(QString usersTyping READ getUsersTyping NOTIFY typingChanged)
|
Q_PROPERTY(QString usersTyping READ getUsersTyping NOTIFY typingChanged)
|
||||||
Q_PROPERTY(QString cachedInput READ cachedInput WRITE setCachedInput NOTIFY
|
Q_PROPERTY(QString cachedInput READ cachedInput WRITE setCachedInput NOTIFY
|
||||||
|
@ -74,6 +74,7 @@ class SpectralRoom : public Room {
|
||||||
signals:
|
signals:
|
||||||
void cachedInputChanged();
|
void cachedInputChanged();
|
||||||
void busyChanged();
|
void busyChanged();
|
||||||
|
void inheritedAvatarChanged(); // https://bugreports.qt.io/browse/QTBUG-7684
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void chooseAndUploadFile();
|
void chooseAndUploadFile();
|
||||||
|
|
Loading…
Reference in New Issue