ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update libqmatrixclient;

Browse Source 
Force Noto Color Emoji.
This commit is contained in:
Black Hat
2018-11-23 18:01:06 +08:00
parent 38afdeeb8e
commit 24fc466630
3 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/libqmatrixclient

Submodule include/libqmatrixclient updated: f9dccac588...52081fe917

2
qtquickcontrols2.conf
View File

@@ -11,4 +11,4 @@ Primary=#344955
Accent=#673AB7 Accent=#673AB7
;Foreground=#1D333E ;Foreground=#1D333E
;Background=#161616 ;Background=#161616
Font/Family=Roboto Font/Family="Roboto,Noto Color Emoji"

19
src/controller.cpp
View File

@@ -42,7 +42,6 @@ Controller::Controller(QObject* parent)
Controller::~Controller() { Controller::~Controller() {
for (Connection* c : m_connections) { for (Connection* c : m_connections) {
c->saveState();
c->stopSync(); c->stopSync();
} }
} }
@@ -78,10 +77,9 @@ void Controller::loginWithCredentials(QString serverAddr, QString user,
[=](QString error, QString, int, int) { [=](QString error, QString, int, int) {
emit errorOccured("Network Error", error); emit errorOccured("Network Error", error);
}); });
connect(conn, &Connection::loginError, connect(conn, &Connection::loginError, [=](QString error, QString) {
[=](QString error, QString) { emit errorOccured("Login Failed", error);
emit errorOccured("Login Failed", error); });
});
} }
} }
@@ -114,9 +112,7 @@ void Controller::addConnection(Connection* c) {
connect(c, &Connection::syncDone, this, [=] { connect(c, &Connection::syncDone, this, [=] {
emit syncDone(); emit syncDone();
c->sync(30000); c->sync(30000);
c->saveState();
static int counter = 0;
if (++counter % 17 == 2) c->saveState();
}); });
connect(c, &Connection::loggedOut, this, [=] { dropConnection(c); }); connect(c, &Connection::loggedOut, this, [=] { dropConnection(c); });
@@ -149,10 +145,9 @@ void Controller::invokeLogin() {
c->loadState(); c->loadState();
addConnection(c); addConnection(c);
}); });
connect(c, &Connection::loginError, connect(c, &Connection::loginError, [=](QString error, QString) {
[=](QString error, QString) { emit errorOccured("Login Failed", error);
emit errorOccured("Login Failed", error); });
});
connect(c, &Connection::networkError, connect(c, &Connection::networkError,
[=](QString error, QString, int, int) { [=](QString error, QString, int, int) {
emit errorOccured("Network Error", error); emit errorOccured("Network Error", error);