tan
/
Spectral
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Code reformatting && tooltip.

This commit is contained in:
Black Hat 2018-07-09 10:45:26 +08:00
parent d6b5cba61f
commit 6bd059ce63
22 changed files with 826 additions and 854 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
main.cpp
View File

@ -1,18 +1,17 @@
#include <QGuiApplication>
#include <QQmlApplicationEngine>
#include <QNetworkProxy>
#include <QQmlApplicationEngine>
#include <QQmlContext>
#include "room.h"
#include "matrix/controller.h"
#include "matrix/roomlistmodel.h"
#include "matrix/imageprovider.h"
#include "matrix/messageeventmodel.h"
#include "matrix/roomlistmodel.h"
#include "room.h"
using namespace QMatrixClient;
int main(int argc, char *argv[])
{
int main(int argc, char *argv[]) {
#if defined(Q_OS_WIN)
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
#endif
@ -26,7 +25,8 @@ int main(int argc, char *argv[])
// proxy.setPort(1082);
// QNetworkProxy::setApplicationProxy(proxy);
qmlRegisterType<Room>(); qRegisterMetaType<Room*> ("Room*");
qmlRegisterType<Room>();
qRegisterMetaType<Room *>("Room*");
qmlRegisterType<Controller>("Matrique", 0, 1, "Controller");
qmlRegisterType<RoomListModel>("Matrique", 0, 1, "RoomListModel");
@ -37,14 +37,14 @@ int main(int argc, char *argv[])
ImageProvider *m_provider = new ImageProvider();
engine.rootContext()->setContextProperty("imageProvider", m_provider->getConnection());
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())
return -1;
if (engine.rootObjects().isEmpty()) return -1;
return app.exec();
}

22
matrix/controller.cpp
View File

@ -3,16 +3,19 @@
#include "connection.h"
Controller::Controller(QObject *parent) : QObject(parent) {
connect(m_connection, &QMatrixClient::Connection::connected, this, &Controller::connected);
connect(m_connection, &QMatrixClient::Connection::resolveError, this, &Controller::reconnect);
connect(m_connection, &QMatrixClient::Connection::syncError, this, &Controller::reconnect);
connect(m_connection, &QMatrixClient::Connection::syncDone, this, &Controller::resync);
connect(m_connection, &QMatrixClient::Connection::connected, this, &Controller::connectionChanged);
connect(m_connection, &QMatrixClient::Connection::connected, this,
&Controller::connected);
connect(m_connection, &QMatrixClient::Connection::resolveError, this,
&Controller::reconnect);
connect(m_connection, &QMatrixClient::Connection::syncError, this,
&Controller::reconnect);
connect(m_connection, &QMatrixClient::Connection::syncDone, this,
&Controller::resync);
connect(m_connection, &QMatrixClient::Connection::connected, this,
&Controller::connectionChanged);
}
Controller::~Controller() {
m_connection->stopSync();
}
Controller::~Controller() { m_connection->stopSync(); }
void Controller::login() {
if (!isLogin) {
@ -24,7 +27,8 @@ void Controller::login() {
}
}
void Controller::loginWithCredentials(QString serverAddr, QString user, QString pass) {
void Controller::loginWithCredentials(QString serverAddr, QString user,
QString pass) {
if (!isLogin) {
qDebug() << "Server:" << serverAddr;
qDebug() << "User:" << user;

14
matrix/controller.h
View File

@ -3,20 +3,22 @@
#include <QObject>
#include "connection.h"
#include "user.h"
#include "roomlistmodel.h"
#include "user.h"
namespace QMatrixClient {
class Connection;
}
class Controller : public QObject
{
class Controller : public QObject {
Q_OBJECT
Q_PROPERTY(QMatrixClient::Connection* connection READ getConnection NOTIFY connectionChanged)
Q_PROPERTY(bool isLogin READ getIsLogin WRITE setIsLogin NOTIFY isLoginChanged)
Q_PROPERTY(QString homeserver READ getHomeserver WRITE setHomeserver NOTIFY homeserverChanged)
Q_PROPERTY(QMatrixClient::Connection* connection READ getConnection NOTIFY
connectionChanged)
Q_PROPERTY(
bool isLogin READ getIsLogin WRITE setIsLogin NOTIFY isLoginChanged)
Q_PROPERTY(QString homeserver READ getHomeserver WRITE setHomeserver NOTIFY
homeserverChanged)
Q_PROPERTY(QString userID READ getUserID WRITE setUserID NOTIFY userIDChanged)
Q_PROPERTY(QByteArray token READ getToken WRITE setToken NOTIFY tokenChanged)
Q_PROPERTY(bool busy READ getBusy WRITE setBusy NOTIFY busyChanged)

37
matrix/imageprovider.cpp
View File

@ -1,8 +1,8 @@
#include "imageprovider.h"
#include <QtCore/QWaitCondition>
#include <QtCore/QDebug>
#include <QMetaObject>
#include <QtCore/QDebug>
#include <QtCore/QWaitCondition>
#include "jobs/mediathumbnailjob.h"
@ -11,42 +11,43 @@
using QMatrixClient::MediaThumbnailJob;
ImageProvider::ImageProvider(QObject* parent)
: QQuickImageProvider(QQmlImageProviderBase::Image,
QQmlImageProviderBase::ForceAsynchronousImageLoading)
{
: QQuickImageProvider(
QQmlImageProviderBase::Image,
QQmlImageProviderBase::ForceAsynchronousImageLoading) {
#if (QT_VERSION < QT_VERSION_CHECK(5, 10, 0))
qRegisterMetaType<MediaThumbnailJob*>();
#endif
m_connection = new ImageProviderConnection();
}
QImage ImageProvider::requestImage(const QString& id,
QSize* pSize, const QSize& requestedSize)
{
if (!id.startsWith("mxc://"))
{
QImage ImageProvider::requestImage(const QString& id, QSize* pSize,
const QSize& requestedSize) {
if (!id.startsWith("mxc://")) {
qWarning() << "ImageProvider: won't fetch an invalid id:" << id
<< "doesn't follow server/mediaId pattern";
return {};
}
QUrl mxcUri{id};
qDebug() << "ImageProvider::requestImage:" << mxcUri.toString();
MediaThumbnailJob* job = nullptr;
QReadLocker locker(&m_lock);
#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
QMetaObject::invokeMethod(m_connection,
[=] { return m_connection->getConnection()->getThumbnail(mxcUri, requestedSize); },
QMetaObject::invokeMethod(
m_connection,
[=] {
return m_connection->getConnection()->getThumbnail(mxcUri,
requestedSize);
},
Qt::BlockingQueuedConnection, &job);
#else
QMetaObject::invokeMethod(m_connection, "getThumbnail",
Qt::BlockingQueuedConnection, Q_RETURN_ARG(MediaThumbnailJob*, job),
Qt::BlockingQueuedConnection,
Q_RETURN_ARG(MediaThumbnailJob*, job),
Q_ARG(QUrl, mxcUri), Q_ARG(QSize, requestedSize));
#endif
if (!job)
{
if (!job) {
qDebug() << "ImageProvider: failed to send a request";
return {};
}
@ -60,9 +61,7 @@ QImage ImageProvider::requestImage(const QString& id,
condition.wait(&m_lock);
}
if(pSize != nullptr)
*pSize = result.size();
if (pSize != nullptr) *pSize = result.size();
return result;
}

7
matrix/imageprovider.h
View File

@ -1,15 +1,14 @@
#ifndef IMAGEPROVIDER_H
#define IMAGEPROVIDER_H
#include <QtQuick/QQuickImageProvider>
#include <QtCore/QReadWriteLock>
#include <QObject>
#include <QtCore/QReadWriteLock>
#include <QtQuick/QQuickImageProvider>
#include "connection.h"
#include "imageproviderconnection.h"
class ImageProvider: public QQuickImageProvider
{
class ImageProvider : public QQuickImageProvider {
public:
explicit ImageProvider(QObject* parent = nullptr);

9
matrix/imageproviderconnection.cpp
View File

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

7
matrix/imageproviderconnection.h
View File

@ -5,11 +5,11 @@
#include "connection.h"
class ImageProviderConnection : public QObject
{
class ImageProviderConnection : public QObject {
Q_OBJECT
Q_PROPERTY(QMatrixClient::Connection* connection READ getConnection WRITE setConnection NOTIFY connectionChanged)
Q_PROPERTY(QMatrixClient::Connection* connection READ getConnection WRITE
setConnection NOTIFY connectionChanged)
public:
explicit ImageProviderConnection(QObject* parent = nullptr);
@ -20,6 +20,7 @@ class ImageProviderConnection : public QObject
emit connectionChanged();
m_connection = connection;
}
private:
QMatrixClient::Connection* m_connection;
signals:

261
matrix/messageeventmodel.cpp
View File

@ -1,64 +1,51 @@
#include "messageeventmodel.h"
#include <QtCore/QSettings>
#include <QtCore/QDebug>
#include <QtCore/QSettings>
#include <QtQml> // for qmlRegisterType()
#include "events/roommemberevent.h"
#include "events/simplestateevents.h"
#include "events/redactionevent.h"
#include "events/roomavatarevent.h"
#include "events/roommemberevent.h"
#include "events/simplestateevents.h"
#include "connection.h"
#include "user.h"
#include "settings.h"
#include "user.h"
MessageEventModel::MessageEventModel(QObject* parent)
: QAbstractListModel(parent)
{
: QAbstractListModel(parent) {
qmlRegisterType<QMatrixClient::FileTransferInfo>();
qRegisterMetaType<QMatrixClient::FileTransferInfo>();
}
MessageEventModel::~MessageEventModel()
{
MessageEventModel::~MessageEventModel() {}
}
void MessageEventModel::setRoom(QMatrixClient::Room* room)
{
if (room == m_currentRoom)
return;
void MessageEventModel::setRoom(QMatrixClient::Room* room) {
if (room == m_currentRoom) return;
beginResetModel();
if( m_currentRoom )
{
if (m_currentRoom) {
m_currentRoom->disconnect(this);
qDebug() << "Disconnected from" << m_currentRoom->id();
}
m_currentRoom = room;
if( room )
{
if (room) {
lastReadEventId = room->readMarkerEventId();
using namespace QMatrixClient;
connect(m_currentRoom, &Room::aboutToAddNewMessages, this,
[=](RoomEventsRange events)
{
[=](RoomEventsRange events) {
beginInsertRows(QModelIndex(), 0, int(events.size()) - 1);
});
connect(m_currentRoom, &Room::aboutToAddHistoricalMessages, this,
[=](RoomEventsRange events)
{
if (rowCount() > 0)
nextNewerRow = rowCount() - 1;
[=](RoomEventsRange events) {
if (rowCount() > 0) nextNewerRow = rowCount() - 1;
beginInsertRows(QModelIndex(), rowCount(),
rowCount() + int(events.size()) - 1);
});
connect(m_currentRoom, &Room::addedMessages, this,
[=] {
if (nextNewerRow > -1)
{
connect(m_currentRoom, &Room::addedMessages, this, [=] {
if (nextNewerRow > -1) {
const auto idx = index(nextNewerRow);
emit dataChanged(idx, idx);
nextNewerRow = -1;
@ -67,64 +54,56 @@ void MessageEventModel::setRoom(QMatrixClient::Room* room)
});
connect(m_currentRoom, &Room::readMarkerMoved, this, [this] {
refreshEventRoles(
std::exchange(lastReadEventId,
m_currentRoom->readMarkerEventId()),
std::exchange(lastReadEventId, m_currentRoom->readMarkerEventId()),
{ReadMarkerRole});
refreshEventRoles(lastReadEventId, {ReadMarkerRole});
});
connect(m_currentRoom, &Room::replacedEvent, this,
[this] (const RoomEvent* newEvent) {
refreshEvent(newEvent->id());
});
connect(m_currentRoom, &Room::fileTransferProgress,
this, &MessageEventModel::refreshEvent);
connect(m_currentRoom, &Room::fileTransferCompleted,
this, &MessageEventModel::refreshEvent);
connect(m_currentRoom, &Room::fileTransferFailed,
this, &MessageEventModel::refreshEvent);
connect(m_currentRoom, &Room::fileTransferCancelled,
this, &MessageEventModel::refreshEvent);
qDebug() << "Connected to room" << room->id()
<< "as" << room->localUser()->id();
connect(
m_currentRoom, &Room::replacedEvent, this,
[this](const RoomEvent* newEvent) { refreshEvent(newEvent->id()); });
connect(m_currentRoom, &Room::fileTransferProgress, this,
&MessageEventModel::refreshEvent);
connect(m_currentRoom, &Room::fileTransferCompleted, this,
&MessageEventModel::refreshEvent);
connect(m_currentRoom, &Room::fileTransferFailed, this,
&MessageEventModel::refreshEvent);
connect(m_currentRoom, &Room::fileTransferCancelled, this,
&MessageEventModel::refreshEvent);
qDebug() << "Connected to room" << room->id() << "as"
<< room->localUser()->id();
} else
lastReadEventId.clear();
endResetModel();
emit roomChanged();
}
void MessageEventModel::refreshEvent(const QString& eventId)
{
void MessageEventModel::refreshEvent(const QString& eventId) {
refreshEventRoles(eventId, {});
}
void MessageEventModel::refreshEventRoles(const QString& eventId,
const QVector<int> roles)
{
const QVector<int> roles) {
const auto it = m_currentRoom->findInTimeline(eventId);
if (it != m_currentRoom->timelineEdge())
{
if (it != m_currentRoom->timelineEdge()) {
const auto row = it - m_currentRoom->messageEvents().rbegin();
emit dataChanged(index(row), index(row), roles);
}
}
inline bool hasValidTimestamp(const QMatrixClient::TimelineItem& ti)
{
inline bool hasValidTimestamp(const QMatrixClient::TimelineItem& ti) {
return ti->timestamp().isValid();
}
QDateTime MessageEventModel::makeMessageTimestamp(QMatrixClient::Room::rev_iter_t baseIt) const
{
QDateTime MessageEventModel::makeMessageTimestamp(
QMatrixClient::Room::rev_iter_t baseIt) const {
const auto& timeline = m_currentRoom->messageEvents();
auto ts = baseIt->event()->timestamp();
if (ts.isValid())
return ts;
if (ts.isValid()) return ts;
// The event is most likely redacted or just invalid.
// Look for the nearest date around and slap zero time to it.
using QMatrixClient::TimelineItem;
auto rit = std::find_if(baseIt, timeline.rend(),
hasValidTimestamp);
auto rit = std::find_if(baseIt, timeline.rend(), hasValidTimestamp);
if (rit != timeline.rend())
return {rit->event()->timestamp().date(), {0, 0}, Qt::LocalTime};
auto it = std::find_if(baseIt.base(), timeline.end(), hasValidTimestamp);
@ -136,106 +115,85 @@ QDateTime MessageEventModel::makeMessageTimestamp(QMatrixClient::Room::rev_iter_
return {};
}
QString MessageEventModel::makeDateString(QMatrixClient::Room::rev_iter_t baseIt) const
{
QString MessageEventModel::makeDateString(
QMatrixClient::Room::rev_iter_t baseIt) const {
auto date = makeMessageTimestamp(baseIt).toLocalTime().date();
if (QMatrixClient::SettingsGroup("UI")
.value("banner_human_friendly_date", true).toBool())
{
if (date == QDate::currentDate())
return tr("Today");
if (date == QDate::currentDate().addDays(-1))
return tr("Yesterday");
.value("banner_human_friendly_date", true)
.toBool()) {
if (date == QDate::currentDate()) return tr("Today");
if (date == QDate::currentDate().addDays(-1)) return tr("Yesterday");
if (date == QDate::currentDate().addDays(-2))
return tr("The day before yesterday");
if (date > QDate::currentDate().addDays(-7))
return date.toString("dddd");
if (date > QDate::currentDate().addDays(-7)) return date.toString("dddd");
}
return date.toString(Qt::DefaultLocaleShortDate);
}
int MessageEventModel::rowCount(const QModelIndex& parent) const
{
if(!m_currentRoom || parent.isValid())
return 0;
int MessageEventModel::rowCount(const QModelIndex& parent) const {
if (!m_currentRoom || parent.isValid()) return 0;
return m_currentRoom->timelineSize();
}
QVariant MessageEventModel::data(const QModelIndex& index, int role) const
{
if( !m_currentRoom ||
index.row() < 0 || index.row() >= m_currentRoom->timelineSize())
QVariant MessageEventModel::data(const QModelIndex& index, int role) const {
if (!m_currentRoom || index.row() < 0 ||
index.row() >= m_currentRoom->timelineSize())
return QVariant();
const auto timelineIt = m_currentRoom->messageEvents().rbegin() + index.row();
const auto& ti = *timelineIt;
using namespace QMatrixClient;
if( role == Qt::DisplayRole )
{
if (ti->isRedacted())
{
if (role == Qt::DisplayRole) {
if (ti->isRedacted()) {
auto reason = ti->redactedBecause()->reason();
if (reason.isEmpty())
return tr("Redacted");
else
return tr("Redacted: %1")
.arg(ti->redactedBecause()->reason());
return tr("Redacted: %1").arg(ti->redactedBecause()->reason());
}
if( ti->type() == EventType::RoomMessage )
{
if (ti->type() == EventType::RoomMessage) {
using namespace MessageEventContent;
auto* e = ti.viewAs<RoomMessageEvent>();
if (e->hasTextContent() && e->mimeType().name() != "text/plain")
return static_cast<const TextContent*>(e->content())->body;
if (e->hasFileContent())
{
if (e->hasFileContent()) {
auto fileCaption = e->content()->fileInfo()->originalName;
if (fileCaption.isEmpty())
fileCaption = m_currentRoom->prettyPrint(e->plainBody());
if (fileCaption.isEmpty())
return tr("a file");
if (fileCaption.isEmpty()) return tr("a file");
}
return m_currentRoom->prettyPrint(e->plainBody());
}
if( ti->type() == EventType::RoomMember )
{
if (ti->type() == EventType::RoomMember) {
auto* e = ti.viewAs<RoomMemberEvent>();
// FIXME: Rewind to the name that was at the time of this event
QString subjectName = m_currentRoom->roomMembername(e->userId());
// The below code assumes senderName output in AuthorRole
switch( e->membership() )
{
switch (e->membership()) {
case MembershipType::Invite:
if (e->repeatsState())
return tr("reinvited %1 to the room").arg(subjectName);
// [[fallthrough]]
case MembershipType::Join:
{
if (e->repeatsState())
return tr("joined the room (repeated)");
case MembershipType::Join: {
if (e->repeatsState()) return tr("joined the room (repeated)");
if (!e->prev_content() ||
e->membership() != e->prev_content()->membership)
{
e->membership() != e->prev_content()->membership) {
return e->membership() == MembershipType::Invite
? tr("invited %1 to the room").arg(subjectName)
: tr("joined the room");
}
QString text{};
if (e->displayName() != e->prev_content()->displayName)
{
if (e->displayName() != e->prev_content()->displayName) {
if (e->displayName().isEmpty())
text = tr("cleared the display name");
else
text = tr("changed the display name to %1")
.arg(e->displayName());
text = tr("changed the display name to %1").arg(e->displayName());
}
if (e->avatarUrl() != e->prev_content()->avatarUrl)
{
if (!text.isEmpty())
text += " and ";
if (e->avatarUrl() != e->prev_content()->avatarUrl) {
if (!text.isEmpty()) text += " and ";
if (e->avatarUrl().isEmpty())
text += tr("cleared the avatar");
else
@ -245,8 +203,7 @@ QVariant MessageEventModel::data(const QModelIndex& index, int role) const
}
case MembershipType::Leave:
if (e->prev_content() &&
e->prev_content()->membership == MembershipType::Ban)
{
e->prev_content()->membership == MembershipType::Ban) {
if (e->senderId() != e->userId())
return tr("unbanned %1").arg(subjectName);
else
@ -267,60 +224,49 @@ QVariant MessageEventModel::data(const QModelIndex& index, int role) const
return tr("made something unknown");
}
}
if( ti->type() == EventType::RoomAliases )
{
if (ti->type() == EventType::RoomAliases) {
auto* e = ti.viewAs<RoomAliasesEvent>();
return tr("set aliases to: %1").arg(e->aliases().join(", "));
}
if( ti->type() == EventType::RoomCanonicalAlias )
{
if (ti->type() == EventType::RoomCanonicalAlias) {
auto* e = ti.viewAs<RoomCanonicalAliasEvent>();
if (e->alias().isEmpty())
return tr("cleared the room main alias");
else
return tr("set the room main alias to: %1").arg(e->alias());
}
if( ti->type() == EventType::RoomName )
{
if (ti->type() == EventType::RoomName) {
auto* e = ti.viewAs<RoomNameEvent>();
if (e->name().isEmpty())
return tr("cleared the room name");
else
return tr("set the room name to: %1").arg(e->name());
}
if( ti->type() == EventType::RoomTopic )
{
if (ti->type() == EventType::RoomTopic) {
auto* e = ti.viewAs<RoomTopicEvent>();
if (e->topic().isEmpty())
return tr("cleared the topic");
else
return tr("set the topic to: %1").arg(e->topic());
}
if( ti->type() == EventType::RoomAvatar )
{
if (ti->type() == EventType::RoomAvatar) {
return tr("changed the room avatar");
}
if( ti->type() == EventType::RoomEncryption )
{
if (ti->type() == EventType::RoomEncryption) {
return tr("activated End-to-End Encryption");
}
return tr("Unknown Event");
}
if( role == Qt::ToolTipRole )
{
if (role == Qt::ToolTipRole) {
return ti->originalJson();
}
if( role == EventTypeRole )
{
if (ti->isStateEvent())
return "state";
if (role == EventTypeRole) {
if (ti->isStateEvent()) return "state";
if (ti->type() == EventType::RoomMessage)
{
switch (ti.viewAs<RoomMessageEvent>()->msgtype())
{
if (ti->type() == EventType::RoomMessage) {
switch (ti.viewAs<RoomMessageEvent>()->msgtype()) {
case MessageEventType::Emote:
return "emote";
case MessageEventType::Notice:
@ -339,23 +285,19 @@ QVariant MessageEventModel::data(const QModelIndex& index, int role) const
return "other";
}
if( role == TimeRole )
return makeMessageTimestamp(timelineIt);
if (role == TimeRole) return makeMessageTimestamp(timelineIt);
if (role == SectionRole)
return makeDateString(timelineIt); // FIXME: move date rendering to QML
if( role == AuthorRole )
{
if (role == AuthorRole) {
auto userId = ti->senderId();
// FIXME: It shouldn't be User, it should be its state "as of event"
return QVariant::fromValue(m_currentRoom->user(userId));
}
if (role == ContentTypeRole)
{
if (ti->type() == EventType::RoomMessage)
{
if (role == ContentTypeRole) {
if (ti->type() == EventType::RoomMessage) {
const auto& contentType =
ti.viewAs<RoomMessageEvent>()->mimeType().name();
return contentType == "text/plain" ? "text/html" : contentType;
@ -363,64 +305,51 @@ QVariant MessageEventModel::data(const QModelIndex& index, int role) const
return "text/plain";
}
if (role == ContentRole)
{
if (ti->isRedacted())
{
if (role == ContentRole) {
if (ti->isRedacted()) {
auto reason = ti->redactedBecause()->reason();
if (reason.isEmpty())
return tr("Redacted");
else
return tr("Redacted: %1")
.arg(ti->redactedBecause()->reason());
return tr("Redacted: %1").arg(ti->redactedBecause()->reason());
}
if( ti->type() == EventType::RoomMessage )
{
if (ti->type() == EventType::RoomMessage) {
using namespace MessageEventContent;
auto* e = ti.viewAs<RoomMessageEvent>();
switch (e->msgtype())
{
switch (e->msgtype()) {
case MessageEventType::Image:
case MessageEventType::File:
case MessageEventType::Audio:
case MessageEventType::Video:
return QVariant::fromValue(e->content()->originalJson);
default:
;
default:;
}
}
}
if( role == ReadMarkerRole )
return ti->id() == lastReadEventId;
if (role == ReadMarkerRole) return ti->id() == lastReadEventId;
if( role == SpecialMarksRole )
{
if (role == SpecialMarksRole) {
if (ti->isStateEvent() && ti.viewAs<StateEventBase>()->repeatsState())
return "hidden";
return ti->isRedacted() ? "redacted" : "";
}
if( role == EventIdRole )
return ti->id();
if (role == EventIdRole) return ti->id();
if( role == LongOperationRole )
{
if (role == LongOperationRole) {
if (ti->type() == EventType::RoomMessage &&
ti.viewAs<RoomMessageEvent>()->hasFileContent())
{
ti.viewAs<RoomMessageEvent>()->hasFileContent()) {
auto info = m_currentRoom->fileTransferInfo(ti->id());
return QVariant::fromValue(info);
}
}
auto aboveEventIt = timelineIt + 1; // FIXME: shouldn't be here, because #312
if (aboveEventIt != m_currentRoom->timelineEdge())
{
if( role == AboveSectionRole )
return makeDateString(aboveEventIt);
if (aboveEventIt != m_currentRoom->timelineEdge()) {
if (role == AboveSectionRole) return makeDateString(aboveEventIt);
if (role == AboveAuthorRole)
return QVariant::fromValue(
@ -430,9 +359,7 @@ QVariant MessageEventModel::data(const QModelIndex& index, int role) const
return QVariant();
}
QHash<int, QByteArray> MessageEventModel::roleNames() const
{
QHash<int, QByteArray> MessageEventModel::roleNames() const {
QHash<int, QByteArray> roles = QAbstractItemModel::roleNames();
roles[EventTypeRole] = "eventType";
roles[EventIdRole] = "eventId";

9
matrix/messageeventmodel.h
View File

@ -4,10 +4,10 @@
#include <QtCore/QAbstractListModel>
#include "room.h"
class MessageEventModel: public QAbstractListModel
{
class MessageEventModel : public QAbstractListModel {
Q_OBJECT
Q_PROPERTY(QMatrixClient::Room* room READ getRoom WRITE setRoom NOTIFY roomChanged)
Q_PROPERTY(
QMatrixClient::Room* room READ getRoom WRITE setRoom NOTIFY roomChanged)
public:
enum EventRoles {
@ -34,7 +34,8 @@ class MessageEventModel: public QAbstractListModel
QMatrixClient::Room* getRoom() { return m_currentRoom; }
void setRoom(QMatrixClient::Room* room);
Q_INVOKABLE int rowCount(const QModelIndex& parent = QModelIndex()) const override;
Q_INVOKABLE int rowCount(
const QModelIndex& parent = QModelIndex()) const override;
QVariant data(const QModelIndex& index, int role) const override;
QHash<int, QByteArray> roleNames() const;

68
matrix/roomlistmodel.cpp
View File

@ -1,95 +1,75 @@
#include "roomlistmodel.h"
#include <QtCore/QDebug>
#include <QtGui/QBrush>
#include <QtGui/QColor>
#include <QtCore/QDebug>
RoomListModel::RoomListModel(QObject* parent)
: QAbstractListModel(parent)
{
RoomListModel::RoomListModel(QObject* parent) : QAbstractListModel(parent) {}
}
RoomListModel::~RoomListModel() {}
RoomListModel::~RoomListModel()
{
}
void RoomListModel::setConnection(QMatrixClient::Connection* connection)
{
void RoomListModel::setConnection(QMatrixClient::Connection* connection) {
beginResetModel();
m_connection = connection;
m_rooms.clear();
connect( connection, &QMatrixClient::Connection::newRoom, this, &RoomListModel::addRoom );
connect(connection, &QMatrixClient::Connection::newRoom, this,
&RoomListModel::addRoom);
for (QMatrixClient::Room* room : connection->roomMap().values()) {
connect( room, &QMatrixClient::Room::namesChanged, this, &RoomListModel::namesChanged );
connect(room, &QMatrixClient::Room::namesChanged, this,
&RoomListModel::namesChanged);
m_rooms.append(room);
}
endResetModel();
}
QMatrixClient::Room* RoomListModel::roomAt(int row)
{
return m_rooms.at(row);
}
QMatrixClient::Room* RoomListModel::roomAt(int row) { return m_rooms.at(row); }
void RoomListModel::addRoom(QMatrixClient::Room* room)
{
void RoomListModel::addRoom(QMatrixClient::Room* room) {
beginInsertRows(QModelIndex(), m_rooms.count(), m_rooms.count());
connect( room, &QMatrixClient::Room::namesChanged, this, &RoomListModel::namesChanged );
connect(room, &QMatrixClient::Room::namesChanged, this,
&RoomListModel::namesChanged);
m_rooms.append(room);
endInsertRows();
}
int RoomListModel::rowCount(const QModelIndex& parent) const
{
if( parent.isValid() )
return 0;
int RoomListModel::rowCount(const QModelIndex& parent) const {
if (parent.isValid()) return 0;
return m_rooms.count();
}
QVariant RoomListModel::data(const QModelIndex& index, int role) const
{
if( !index.isValid() )
return QVariant();
QVariant RoomListModel::data(const QModelIndex& index, int role) const {
if (!index.isValid()) return QVariant();
if( index.row() >= m_rooms.count() )
{
if (index.row() >= m_rooms.count()) {
qDebug() << "UserListModel: something wrong here...";
return QVariant();
}
QMatrixClient::Room* room = m_rooms.at(index.row());
if( role == Qt::DisplayRole )
{
if (role == Qt::DisplayRole) {
return room->displayName();
}
if( role == Qt::ForegroundRole )
{
if( room->highlightCount() > 0 )
return QBrush(QColor("orange"));
if (role == Qt::ForegroundRole) {
if (room->highlightCount() > 0) return QBrush(QColor("orange"));
return QVariant();
}
if( role == Qt::DecorationRole )
{
if (role == Qt::DecorationRole) {
if (room->avatarUrl().toString() != "") {
return room->avatarUrl();
}
return QVariant();
}
if ( role == Qt::StatusTipRole )
{
if (role == Qt::StatusTipRole) {
return room->topic();
}
return QVariant();
}
void RoomListModel::namesChanged(QMatrixClient::Room* room)
{
void RoomListModel::namesChanged(QMatrixClient::Room* room) {
int row = m_rooms.indexOf(room);
emit dataChanged(index(row), index(row));
}
void RoomListModel::unreadMessagesChanged(QMatrixClient::Room* room)
{
void RoomListModel::unreadMessagesChanged(QMatrixClient::Room* room) {
int row = m_rooms.indexOf(room);
emit dataChanged(index(row), index(row));
}

14
matrix/roomlistmodel.h
View File

@ -2,13 +2,13 @@
#define ROOMLISTMODEL_H
#include <QtCore/QAbstractListModel>
#include "room.h"
#include "connection.h"
#include "room.h"
class RoomListModel: public QAbstractListModel
{
class RoomListModel : public QAbstractListModel {
Q_OBJECT
Q_PROPERTY(QMatrixClient::Connection *connection READ getConnection WRITE setConnection)
Q_PROPERTY(QMatrixClient::Connection* connection READ getConnection WRITE
setConnection)
public:
RoomListModel(QObject* parent = 0);
@ -19,8 +19,10 @@ class RoomListModel: public QAbstractListModel
Q_INVOKABLE QMatrixClient::Room* roomAt(int row);
QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
Q_INVOKABLE int rowCount(const QModelIndex& parent=QModelIndex()) const override;
QVariant data(const QModelIndex& index,
int role = Qt::DisplayRole) const override;
Q_INVOKABLE int rowCount(
const QModelIndex& parent = QModelIndex()) const override;
QHash<int, QByteArray> roleNames() const;

20
qml/Login.qml
View File

@ -1,8 +1,8 @@
import QtQuick 2.10
import QtQuick.Layouts 1.3
import QtQuick 2.11
import QtQuick.Layouts 1.11
import QtGraphicalEffects 1.0
import QtQuick.Controls 2.3
import QtQuick.Controls.Material 2.3
import QtQuick.Controls 2.4
import QtQuick.Controls.Material 2.4
import Qt.labs.settings 1.0
import "qrc:/qml/component"
@ -60,13 +60,13 @@ Page {
id: mainCol
width: parent.width
ImageStatus {
Layout.preferredWidth: 96
Layout.preferredHeight: 96
Layout.alignment: Qt.AlignHCenter
// ImageStatus {
// Layout.preferredWidth: 96
// Layout.preferredHeight: 96
// Layout.alignment: Qt.AlignHCenter
source: "qrc:/asset/img/avatar.png"
}
// source: "qrc:/asset/img/avatar.png"
// }
TextField {
id: serverField

4
qml/Room.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.11
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import QtQuick.Controls 2.4
import QtQuick.Layouts 1.11
import Matrique 0.1
import "qrc:/qml/form"

4
qml/component/ButtonDelegate.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.3
import QtQuick.Controls 2.3
import QtQuick 2.11
import QtQuick.Controls 2.4
ItemDelegate {
id: itemDelegate

46
qml/component/ImageStatus.qml
View File

@ -1,17 +1,22 @@
import QtQuick 2.11
import QtQuick.Controls 2.4
import QtGraphicalEffects 1.0
import QtQuick.Controls.Material 2.4
Item {
property bool opaqueBackground: false
property alias source: avatar.source
property bool round: true
property string source: ""
property string displayText: ""
readonly property bool showImage: source
readonly property bool showInitial: !showImage && displayText
id: item
Rectangle {
width: item.width
height: item.width
radius: item.width / 2
radius: round ? item.width / 2 : 0
color: "white"
visible: opaqueBackground
}
@ -20,6 +25,8 @@ Item {
id: avatar
width: item.width
height: item.width
visible: showImage
source: item.source
mipmap: true
layer.enabled: true
@ -35,9 +42,42 @@ Item {
anchors.centerIn: parent
width: avatar.width
height: avatar.width
radius: avatar.width / 2
radius: round? avatar.width / 2 : 0
}
}
}
}
Label {
anchors.fill: parent
color: "white"
visible: showInitial
text: showInitial ? getInitials(displayText)[0] : ""
font.pixelSize: 22
font.bold: true
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
background: Rectangle {
anchors.fill: parent
radius: round? width / 2 : 0
color: showInitial ? stringToColor(displayText) : Material.accent
}
}
function getInitials(text) {
return text.toUpperCase().replace(/[^a-zA-Z- ]/g, "").match(/\b\w/g);
}
function stringToColor(str) {
var hash = 0;
for (var i = 0; i < str.length; i++) {
hash = str.charCodeAt(i) + ((hash << 5) - hash);
}
var colour = '#';
for (var i = 0; i < 3; i++) {
var value = (hash >> (i * 8)) & 0xFF;
colour += ('00' + value.toString(16)).substr(-2);
}
return colour;
}
}

8
qml/component/MaterialIcon.qml
View File

@ -1,7 +1,7 @@
import QtQuick 2.10
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import QtQuick.Controls.Material 2.3
import QtQuick 2.11
import QtQuick.Controls 2.4
import QtQuick.Layouts 1.11
import QtQuick.Controls.Material 2.4
Item {
property alias icon: iconText.text

8
qml/component/SideNav.qml
View File

@ -1,7 +1,7 @@
import QtQuick 2.10
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import QtQuick.Controls.Material 2.3
import QtQuick 2.11
import QtQuick.Controls 2.4
import QtQuick.Layouts 1.11
import QtQuick.Controls.Material 2.4
Item {
Rectangle {

10
qml/component/SideNavButton.qml
View File

@ -1,7 +1,7 @@
import QtQuick 2.10
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import QtQuick.Controls.Material 2.3
import QtQuick 2.11
import QtQuick.Controls 2.4
import QtQuick.Layouts 1.11
import QtQuick.Controls.Material 2.4
Item {
property var page
@ -29,7 +29,7 @@ Item {
anchors.fill: parent
onClicked: {
if(page != null && stackView.currentItem !== page) {
if(!page && stackView.currentItem !== page) {
if(stackView.depth === 1) {
stackView.replace(page)
} else {

8
qml/form/DetailForm.qml
View File

@ -1,7 +1,7 @@
import QtQuick 2.10
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import QtQuick.Controls.Material 2.3
import QtQuick 2.11
import QtQuick.Controls 2.4
import QtQuick.Layouts 1.4
import QtQuick.Controls.Material 2.4
import "qrc:/qml/component"
Item {

19
qml/form/ListForm.qml
View File

@ -2,8 +2,8 @@ import QtQuick 2.11
import QtQuick.Controls 2.4
import QtQuick.Layouts 1.11
import QtGraphicalEffects 1.0
import QtQuick.Controls.Material 2.3
import QtQml.Models 2.3
import QtQuick.Controls.Material 2.4
import QtQml.Models 2.4
import Matrique 0.1
import "qrc:/qml/component"
@ -27,6 +27,10 @@ Item {
height: 80
onClicked: listView.currentIndex = index
ToolTip.visible: pressed
ToolTip.delay: Qt.styleHints.mousePressAndHoldInterval
ToolTip.text: name
contentItem: RowLayout {
anchors.fill: parent
anchors.margins: 16
@ -36,7 +40,8 @@ Item {
Layout.preferredWidth: height
Layout.fillHeight: true
source: avatar == null || avatar == "" ? "qrc:/asset/img/avatar.png" : "image://mxc/" + avatar
source: avatar ? "image://mxc/" + avatar : ""
displayText: name
opaqueBackground: true
}
@ -52,10 +57,10 @@ Item {
Layout.fillHeight: true
text: {
if (name != "") {
if (name) {
return name;
}
if (alias != "") {
if (alias) {
return alias;
}
return id
@ -69,7 +74,7 @@ Item {
Layout.fillWidth: true
Layout.fillHeight: true
text: topic === "" ? "No topic yet." : topic
text: topic ? topic : "No topic yet."
elide: Text.ElideRight
wrapMode: Text.NoWrap
}
@ -133,7 +138,7 @@ Item {
}
Rectangle {
width: searchField.activeFocus || searchField.text != "" ? parent.width : 0
width: searchField.activeFocus || searchField.text ? parent.width : 0
height: parent.height
color: "white"

38
qml/form/RoomForm.qml
View File

@ -1,7 +1,7 @@
import QtQuick 2.10
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import QtQuick.Controls.Material 2.3
import QtQuick 2.11
import QtQuick.Controls 2.4
import QtQuick.Layouts 1.11
import QtQuick.Controls.Material 2.4
import QtGraphicalEffects 1.0
import Matrique 0.1
import "qrc:/qml/component"
@ -16,7 +16,7 @@ Item {
background: Item {
anchors.fill: parent
visible: currentRoom == null
visible: !currentRoom
Pane {
anchors.fill: parent
}
@ -32,7 +32,7 @@ Item {
anchors.fill: parent
spacing: 0
visible: currentRoom != null
visible: currentRoom
Pane {
z: 10
@ -52,7 +52,8 @@ Item {
ImageStatus {
Layout.preferredWidth: parent.height
Layout.fillHeight: true
source: currentRoom != null && currentRoom.avatarUrl != "" ? "image://mxc/" + currentRoom.avatarUrl : "qrc:/asset/img/avatar.png"
source: currentRoom && currentRoom.avatarUrl != "" ? "image://mxc/" + currentRoom.avatarUrl : null
displayText: currentRoom ? currentRoom.displayName : ""
}
ColumnLayout {
@ -61,7 +62,7 @@ Item {
Label {
Layout.fillWidth: true
text: currentRoom != null ? currentRoom.displayName : ""
text: currentRoom ? currentRoom.displayName : ""
font.pointSize: 16
elide: Text.ElideRight
wrapMode: Text.NoWrap
@ -69,7 +70,7 @@ Item {
Label {
Layout.fillWidth: true
text: currentRoom != null ? currentRoom.topic : ""
text: currentRoom ? currentRoom.topic : ""
elide: Text.ElideRight
wrapMode: Text.NoWrap
}
@ -88,12 +89,14 @@ Item {
displayMarginEnd: 40
verticalLayoutDirection: ListView.BottomToTop
spacing: 12
model: MessageEventModel{
id: messageEventModel
room: currentRoom
onModelReset: currentRoom.getPreviousContent(50)
}
delegate: Row {
readonly property bool sentByMe: author === currentRoom.localUser
@ -102,13 +105,23 @@ Item {
anchors.right: sentByMe ? parent.right : undefined
spacing: 6
Image {
ImageStatus {
id: avatar
width: height
height: 40
mipmap: true
round: false
visible: !sentByMe
source: author.avatarUrl != "" ? "image://mxc/" + author.avatarUrl : "qrc:/asset/img/avatar.png"
source: author.avatarUrl != "" ? "image://mxc/" + author.avatarUrl : null
displayText: author.displayName
MouseArea {
id: mouseArea
anchors.fill: parent
ToolTip.visible: pressed
ToolTip.delay: Qt.styleHints.mousePressAndHoldInterval
ToolTip.text: author.displayName
}
}
Rectangle {
@ -121,6 +134,7 @@ Item {
id: messageText
text: display
color: sentByMe ? "black" : "white"
linkColor: sentByMe ? Material.accent : "white"
anchors.fill: parent
anchors.margins: 12
wrapMode: Label.Wrap

7
qml/main.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.11
import QtQuick.Controls 2.4
import QtQuick.Layouts 1.4
import QtQuick.Layouts 1.11
import QtQuick.Controls.Material 2.4
import QtGraphicalEffects 1.0
import Qt.labs.settings 1.0
@ -118,7 +118,8 @@ ApplicationWindow {
anchors.fill: parent
anchors.margins: 15
source: matriqueController.connection.localUser != null ? "image://mxc/" + matriqueController.connection.localUser.avatarUrl : "qrc:/asset/img/avatar.png"
source: matriqueController.connection.localUser && matriqueController.connection.localUser.avatarUrl ? "image://mxc/" + matriqueController.connection.localUser.avatarUrl : ""
displayText: matriqueController.connection.localUser && matriqueController.connection.localUser.displayText ? matriqueController.connection.localUser.displayText : "N"
opaqueBackground: false
}
@ -158,7 +159,7 @@ ApplicationWindow {
imageProvider.connection = matriqueController.connection
console.log(matriqueController.homeserver, matriqueController.userID, matriqueController.token)
if (matriqueController.userID != "" && matriqueController.token != "") {
if (matriqueController.userID && matriqueController.token) {
console.log("Perform auto-login.");
matriqueController.login();
} else {