Remove binding between RoomListForm and RoomForm and reformat code.
This commit allows user to do a series of operations(via press and hold) on a room without entering the room in RoomForm. Fixes #14.
This commit is contained in:
parent
9c7defba16
commit
f8c89886d2
|
@ -31,6 +31,8 @@ Page {
|
|||
Layout.maximumWidth: 360
|
||||
|
||||
listModel: roomListModel
|
||||
|
||||
onEnterRoom: roomForm.currentRoom = currentRoom
|
||||
}
|
||||
|
||||
RoomForm {
|
||||
|
@ -38,8 +40,6 @@ Page {
|
|||
|
||||
Layout.fillWidth: true
|
||||
Layout.fillHeight: true
|
||||
|
||||
currentRoom: roomListForm.currentRoom
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -10,7 +10,7 @@ import "qrc:/js/md.js" as Markdown
|
|||
|
||||
Item {
|
||||
id: item
|
||||
property var currentRoom
|
||||
property var currentRoom: null
|
||||
|
||||
Pane {
|
||||
anchors.fill: parent
|
||||
|
|
|
@ -14,6 +14,7 @@ Item {
|
|||
readonly property int currentIndex: roomListProxyModel.mapToSource(listView.currentIndex)
|
||||
readonly property var currentRoom: currentIndex != -1 ? listModel.roomAt(currentIndex) : null
|
||||
readonly property bool mini: setting.miniMode // Used as an indicator of whether the listform should be displayed as "Mini mode".
|
||||
signal enterRoom()
|
||||
|
||||
ColumnLayout {
|
||||
anchors.fill: parent
|
||||
|
@ -137,6 +138,7 @@ Item {
|
|||
width: parent.width
|
||||
height: 80
|
||||
onPressed: listView.currentIndex = index
|
||||
onClicked: enterRoom()
|
||||
onPressAndHold: menuComponent.createObject(this)
|
||||
|
||||
ToolTip.visible: mini && hovered
|
||||
|
@ -208,6 +210,10 @@ Item {
|
|||
onTriggered: currentRoom.isLowPriority ? currentRoom.removeTag("m.lowpriority") : currentRoom.addTag("m.lowpriority", "1")
|
||||
}
|
||||
MenuSeparator {}
|
||||
MenuItem {
|
||||
text: "Mark as Read"
|
||||
onTriggered: currentRoom.markAllMessagesAsRead()
|
||||
}
|
||||
MenuItem {
|
||||
text: "Leave Room"
|
||||
onTriggered: matriqueController.forgetRoom(currentRoom.id)
|
||||
|
|
|
@ -63,16 +63,17 @@ void RoomListModel::connectRoomSignals(Room* room) {
|
|||
connect(room, &Room::unreadMessagesChanged, this, [=](Room* r) {
|
||||
if (r->hasUnreadMessages()) emit newMessage(r);
|
||||
});
|
||||
// connect(
|
||||
// room, &QMatrixClient::Room::aboutToAddNewMessages, this,
|
||||
// [=](QMatrixClient::RoomEventsRange eventsRange) {
|
||||
// for (QMatrixClient::RoomEvents events : eventsRange.const_iterator) {
|
||||
// for (QMatrixClient::RoomEvent event : events) {
|
||||
// qDebug() << event.fullJson();
|
||||
// }
|
||||
// }
|
||||
// emit newMessage(room);
|
||||
// });
|
||||
// connect(
|
||||
// room, &QMatrixClient::Room::aboutToAddNewMessages, this,
|
||||
// [=](QMatrixClient::RoomEventsRange eventsRange) {
|
||||
// for (QMatrixClient::RoomEvents events : eventsRange.const_iterator)
|
||||
// {
|
||||
// for (QMatrixClient::RoomEvent event : events) {
|
||||
// qDebug() << event.fullJson();
|
||||
// }
|
||||
// }
|
||||
// emit newMessage(room);
|
||||
// });
|
||||
}
|
||||
|
||||
void RoomListModel::updateRoom(Room* room, Room* prev) {
|
||||
|
|
|
@ -18,7 +18,7 @@ class RoomListModel : public QAbstractListModel {
|
|||
TopicRole,
|
||||
CategoryRole,
|
||||
HighlightRole,
|
||||
UnreadCountRole,
|
||||
UnreadCountRole
|
||||
};
|
||||
|
||||
RoomListModel(QObject* parent = 0);
|
||||
|
|
Loading…
Reference in New Issue