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

Init sync and listmodel function.

This commit is contained in:
Black Hat 2018-02-28 21:11:42 +08:00
parent a4b00f823e
commit c3367543bf
12 changed files with 143 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
main.cpp
View File

@ -15,11 +15,11 @@ int main(int argc, char *argv[])
QGuiApplication app(argc, argv);
// Enable this if you need proxy.
// QNetworkProxy proxy;
// proxy.setType(QNetworkProxy::HttpProxy);
// proxy.setHostName("localhost");
// proxy.setPort(1082);
// QNetworkProxy::setApplicationProxy(proxy);
QNetworkProxy proxy;
proxy.setType(QNetworkProxy::HttpProxy);
proxy.setHostName("localhost");
proxy.setPort(1082);
QNetworkProxy::setApplicationProxy(proxy);
qmlRegisterType<Controller>("Matrique", 0, 1, "Controller");
qmlRegisterType<RoomListModel>("Matrique", 0, 1, "RoomListModel");

2
matrix/controller.cpp
View File

@ -46,9 +46,11 @@ void Controller::connected() {
}
void Controller::resync() {
qDebug() << "Syncing Matrix.";
m_connection->sync(30000);
}
void Controller::reconnect() {
qDebug() << "Connection lost. Reconnecting...";
m_connection->connectWithToken(userID, token, "");
}

2
matrix/controller.h
View File

@ -29,7 +29,7 @@ public:
// All the non-Q_INVOKABLE functions.
// All the Q_PROPERTYs.
RoomListModel *roomListModel = new RoomListModel(this);
RoomListModel *roomListModel = new RoomListModel();
RoomListModel* getRoomListModel() { return roomListModel; }
bool isLogin = false;

62
matrix/roomlistmodel.cpp
View File

@ -1,24 +1,30 @@
#include <QtGui/QBrush>
#include <QtGui/QColor>
#include "roomlistmodel.h"
#include "controller.h"
RoomListModel::RoomListModel(QObject *parent) : QObject(parent)
RoomListModel::RoomListModel(QObject *parent)
{
}
RoomListModel::~RoomListModel() {
}
void RoomListModel::init(QMatrixClient::Connection *conn) {
qDebug() << "Registering connection.";
beginResetModel();
m_connection = conn;
m_rooms.clear();
connect(m_connection, &QMatrixClient::Connection::newRoom, this, &RoomListModel::addRoom);
for(QMatrixClient::Room* room: m_connection->roomMap().values()) {
connect(room, &QMatrixClient::Room::namesChanged, this, &RoomListModel::namesChanged);
m_rooms.append(room);
}
}
RoomListModel::~RoomListModel() {
endResetModel();
}
QMatrixClient::Room* RoomListModel::roomAt(int row)
@ -29,16 +35,60 @@ QMatrixClient::Room* RoomListModel::roomAt(int row)
void RoomListModel::addRoom(QMatrixClient::Room* room)
{
qDebug() << "Adding room.";
beginInsertRows(QModelIndex(), m_rooms.count(), m_rooms.count());
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;
return m_rooms.count();
}
QVariant RoomListModel::data(const QModelIndex& index, int role) const
{
if(!index.isValid())
return QVariant();
if(index.row() >= m_rooms.count())
{
qDebug() << "UserListModel: something wrong here...";
return QVariant();
}
QMatrixClient::Room* room = m_rooms.at(index.row());
if( role == NameRole )
{
return room->displayName();
}
if( role == ValueRole )
{
return room->topic();
}
return QVariant();
}
QHash<int, QByteArray> RoomListModel::roleNames() const {
QHash<int, QByteArray> roles;
roles[NameRole] = "name";
roles[ValueRole] = "value";
return roles;
}
void RoomListModel::namesChanged(QMatrixClient::Room* room)
{
int row = m_rooms.indexOf(room);
emit dataChanged(index(row), index(row));
}
void RoomListModel::unreadMessagesChanged(QMatrixClient::Room* room)
{
}
RoomModel::RoomModel(QString name, QString value) {
m_name = name;
m_value = value;
}

35
matrix/roomlistmodel.h
View File

@ -2,6 +2,7 @@
#define ROOMLISTMODEL_H
#include <QObject>
#include <QtCore/QAbstractListModel>
#include "libqmatrixclient/connection.h"
#include "libqmatrixclient/room.h"
@ -11,17 +12,49 @@ namespace QMatrixClient {
class Room;
}
class RoomListModel : public QObject
class RoomModel : public QObject
{
Q_OBJECT
Q_PROPERTY(QString name READ getName)
Q_PROPERTY(QString value READ getValue)
public:
explicit RoomModel(QString name, QString value);
QString getName() { return m_name; }
QString getValue() { return m_value; }
signals:
void nameChanged();
void valueChanged();
private:
QString m_name;
QString m_value;
};
class RoomListModel : public QAbstractListModel
{
Q_OBJECT
public:
explicit RoomListModel(QObject *parent = nullptr);
~RoomListModel();
enum RoomModelRoles {
NameRole, ValueRole
};
QHash<int, QByteArray> roleNames() const;
void init(QMatrixClient::Connection*);
Q_INVOKABLE QMatrixClient::Room* roomAt(int row);
QVariant data(const QModelIndex& index, int role) const override;
Q_INVOKABLE int rowCount(const QModelIndex& parent=QModelIndex()) const override;
signals:
public slots:

17
qml/Home.qml
View File

@ -1,17 +0,0 @@
import QtQuick 2.10
import QtQuick.Controls 2.3
import "qrc:/qml/form"
Page {
RoomListForm {
id: roomListForm
height: parent.height
width: 320
}
RoomForm {
id: roomForm
anchors.fill: parent
anchors.leftMargin: roomListForm.width
}
}

9
qml/Room.qml
View File

@ -6,14 +6,15 @@ Page {
property var roomListModel
RoomListForm {
id: contactListForm
id: roomListForm
height: parent.height
width: 320
listModel: roomListModel
}
ContactDetailForm {
id: contactDetailForm
RoomForm {
id: roomForm
anchors.fill: parent
anchors.leftMargin: contactListForm.width
anchors.leftMargin: roomListForm.width
}
}

1
qml/form/ContactDetailForm.qml
View File

@ -7,6 +7,7 @@ import "qrc:/qml/component"
Item {
ColumnLayout {
anchors.fill: parent
spacing: 0
Pane {
Layout.fillWidth: true

1
qml/form/RoomForm.qml
View File

@ -8,6 +8,7 @@ import "qrc:/qml/component"
Item {
ColumnLayout {
anchors.fill: parent
spacing: 0
Pane {
z: 10

65
qml/form/RoomListForm.qml
View File

@ -6,6 +6,7 @@ import QtQuick.Controls.Material 2.3
import "qrc:/qml/component"
Item {
property var listModel
ColumnLayout {
anchors.fill: parent
spacing: 0
@ -74,58 +75,6 @@ Item {
color: "#eaeaea"
}
ListModel {
id: listModel
ListElement {
name: "Bill Smith"
number: "555 3264"
}
ListElement {
name: "John Brown"
number: "555 8426"
}
ListElement {
name: "Sam Wise"
number: "555 0473"
}
ListElement {
name: "Bill Smith"
number: "555 3264"
}
ListElement {
name: "John Brown"
number: "555 8426"
}
ListElement {
name: "Sam Wise"
number: "555 0473"
}
ListElement {
name: "Bill Smith"
number: "555 3264"
}
ListElement {
name: "John Brown"
number: "555 8426"
}
ListElement {
name: "Sam Wise"
number: "555 0473"
}
ListElement {
name: "Bill Smith"
number: "555 3264"
}
ListElement {
name: "John Brown"
number: "555 8426"
}
ListElement {
name: "Sam Wise"
number: "555 0473"
}
}
ListView {
id: listView
width: parent.width
@ -145,8 +94,9 @@ Item {
height: 80
onClicked: listView.currentIndex = index
contentItem: Item {
Row {
contentItem: Row {
width: parent.width - 32
height: parent.height - 32
spacing: 16
ImageStatus {
@ -156,12 +106,16 @@ Item {
}
Column {
width: parent.width
height: parent.height
Text {
width: parent.width
text: name
color: "#424242"
}
Text {
text: number
width: parent.width
text: value
color: "#424242"
}
}
@ -171,4 +125,3 @@ Item {
}
}
}
}

36
qml/main.qml
View File

@ -70,22 +70,22 @@ ApplicationWindow {
}
}
// ButtonDelegate {
// index: 2
// contentItem: Text {
// text: "\ue5d2"
// font.pointSize: 16
// font.family: materialFont.name
// color: "white"
// horizontalAlignment: Text.AlignHCenter
// verticalAlignment: Text.AlignVCenter
// }
// }
ButtonDelegate {
index: 2
contentItem: Text {
text: "\ue5d2"
font.pointSize: 16
font.family: materialFont.name
color: "white"
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
}
ButtonDelegate {
index: 3
contentItem: Text {
text: "\ue8b8"
font.pointSize: 16
@ -97,7 +97,7 @@ ApplicationWindow {
}
ButtonDelegate {
index: 4
index: 3
contentItem: Text {
text: "\ue879"
@ -120,8 +120,8 @@ ApplicationWindow {
interactive: false
orientation: Qt.Vertical
Home {
Room {
roomListModel: controller.roomListModel
}
Login {
@ -130,10 +130,6 @@ ApplicationWindow {
controller: controller
}
Room {
roomListModel: controller.roomListModel
}
Setting {
}

1
res.qrc
View File

@ -4,7 +4,6 @@
<file>asset/img/avatar.png</file>
<file>asset/img/background.jpg</file>
<file>asset/font/material.ttf</file>
<file>qml/Home.qml</file>
<file>qml/Login.qml</file>
<file>qml/main.qml</file>
<file>qml/Setting.qml</file>