Tweak UI.
This commit is contained in:
@@ -3,39 +3,30 @@
|
||||
#include "libqmatrixclient/connection.h"
|
||||
|
||||
Controller::Controller(QObject *parent) : QObject(parent) {
|
||||
|
||||
connect(connection, &Connection::connected, this, &Controller::connected);
|
||||
connect(connection, &Connection::resolveError, this, &Controller::reconnect);
|
||||
connect(connection, &Connection::syncError, this, &Controller::reconnect);
|
||||
connect(connection, &Connection::syncDone, this, &Controller::resync);
|
||||
}
|
||||
|
||||
Controller::~Controller() {
|
||||
|
||||
}
|
||||
|
||||
void Controller::init() {
|
||||
connect(connection, &Connection::connected,
|
||||
[=](){
|
||||
qInfo() << "Matrix connected.";
|
||||
setUserID(connection->userId());
|
||||
setToken(connection->accessToken());
|
||||
}
|
||||
);
|
||||
|
||||
connect(connection, &Connection::resolveError, this, &Controller::reconnect);
|
||||
connect(connection, &Connection::syncError, this, &Controller::reconnect);
|
||||
connect(connection, &Connection::syncDone, this, &Controller::resync);
|
||||
}
|
||||
|
||||
void Controller::login(QString home, QString user, QString pass) {
|
||||
qInfo() << "UserID:" << userID;
|
||||
qInfo() << "Token:" << token;
|
||||
qInfo() << "Home:" << home;
|
||||
qInfo() << "User:" << user;
|
||||
qInfo() << "Pass:" << pass;
|
||||
if(!userID.isEmpty() && !token.isEmpty()) {
|
||||
qInfo() << "Using token.";
|
||||
connection->connectWithToken(userID, token, "");
|
||||
if(home.isEmpty()) home = "matrix.org";
|
||||
|
||||
qDebug() << "UserID:" << userID;
|
||||
qDebug() << "Token:" << token;
|
||||
qDebug() << "Home:" << home;
|
||||
qDebug() << "User:" << user;
|
||||
qDebug() << "Pass:" << pass;
|
||||
|
||||
if(!userID.isEmpty() && !token.isEmpty()) {
|
||||
qDebug() << "Using token.";
|
||||
connection->connectWithToken(userID, token, "");
|
||||
} else if(!user.isEmpty() && !pass.isEmpty()) {
|
||||
qInfo() << "Using given credential.";
|
||||
qDebug() << "Using given credential.";
|
||||
connection->connectToServer("@"+user+":"+home, pass, "");
|
||||
}
|
||||
}
|
||||
@@ -43,6 +34,13 @@ void Controller::login(QString home, QString user, QString pass) {
|
||||
void Controller::logout() {
|
||||
userID = "";
|
||||
token = "";
|
||||
setIsLogin(false);
|
||||
}
|
||||
|
||||
void Controller::connected() {
|
||||
setUserID(connection->userId());
|
||||
setToken(connection->accessToken());
|
||||
setIsLogin(true);
|
||||
}
|
||||
|
||||
void Controller::resync() {
|
||||
|
||||
@@ -11,6 +11,7 @@ class Controller : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
Q_PROPERTY(bool isLogin READ getIsLogin WRITE setIsLogin NOTIFY isLoginChanged)
|
||||
Q_PROPERTY(QString userID READ getUserID WRITE setUserID NOTIFY userIDChanged)
|
||||
Q_PROPERTY(QByteArray token READ getToken WRITE setToken NOTIFY tokenChanged)
|
||||
public:
|
||||
@@ -18,13 +19,21 @@ public:
|
||||
~Controller();
|
||||
|
||||
// All the Q_INVOKABLEs.
|
||||
Q_INVOKABLE void init();
|
||||
Q_INVOKABLE void login(QString, QString, QString);
|
||||
Q_INVOKABLE void logout();
|
||||
|
||||
// All the non-Q_INVOKABLE functions.
|
||||
|
||||
// All the Q_PROPERTYs.
|
||||
bool isLogin = false;
|
||||
bool getIsLogin() { return isLogin; }
|
||||
void setIsLogin(bool n) {
|
||||
if(n != isLogin) {
|
||||
isLogin = n;
|
||||
emit isLoginChanged();
|
||||
}
|
||||
}
|
||||
|
||||
QString userID;
|
||||
QString getUserID() { return userID; }
|
||||
void setUserID(QString n) {
|
||||
@@ -45,10 +54,12 @@ public:
|
||||
|
||||
private:
|
||||
QMatrixClient::Connection *connection = new QMatrixClient::Connection();
|
||||
void connected();
|
||||
void resync();
|
||||
void reconnect();
|
||||
|
||||
signals:
|
||||
void isLoginChanged();
|
||||
void userIDChanged();
|
||||
void tokenChanged();
|
||||
void homeServerChanged();
|
||||
|
||||
Reference in New Issue
Block a user