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

Update libqmatrixclient && basic working messageeventmodel && room

Browse Source 
search.
This commit is contained in:
Black Hat
2018-07-08 13:25:46 +08:00
parent b3c0dc9421
commit a19364610a
13 changed files with 236 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
qml/form/ListForm.qml
View File

@@ -80,14 +80,7 @@ Item {
function applyFilter(filterName){
var roomCount = listModel.rowCount();
for (var i = 0; i < roomCount; i++){
var roomName = "";
if (listModel.roomAt(i).name !== "") {
roomName = listModel.roomAt(i).name;
} else if (model.alias !== "") {
roomName = listModel.roomAt(i).alias;
} else {
roomName = listModel.roomAt(i).id;
}
var roomName = listModel.roomAt(i).displayName;
if (roomName.toLowerCase().indexOf(filterName.toLowerCase()) !== -1) {
items.addGroups(i, 1, "filterGroup");
} else {items.removeGroups(i, 1, "filterGroup");}

27
qml/form/RoomForm.qml
View File

@@ -52,7 +52,7 @@ Item {
ImageStatus {
Layout.preferredWidth: parent.height
Layout.fillHeight: true
source: "qrc:/asset/img/avatar.png"
source: currentRoom != null && currentRoom.avatarUrl != "" ? "image://mxc/" + currentRoom.avatarUrl : "qrc:/asset/img/avatar.png"
}
ColumnLayout {
@@ -88,34 +88,35 @@ Item {
displayMarginEnd: 40
verticalLayoutDirection: ListView.BottomToTop
spacing: 12
// model: MessageEventModel{ currentRoom: item.currentRoom }
model: 10
model: MessageEventModel{
id: messageEventModel
room: currentRoom
}
delegate: Row {
readonly property bool sentByMe: index % 2 == 0
readonly property bool sentByMe: author === currentRoom.localUser
id: messageRow
height: 40
anchors.right: sentByMe ? parent.right : undefined
spacing: 6
Rectangle {
Image {
id: avatar
width: height
height: parent.height
color: "grey"
height: 40
visible: !sentByMe
source: author.avatarUrl != "" ? "image://mxc/" + author.avatarUrl : "qrc:/asset/img/avatar.png"
}
Rectangle {
width: Math.min(messageText.implicitWidth + 24,
messageListView.width - (!sentByMe ? avatar.width + messageRow.spacing : 0))
height: parent.height
height: messageText.implicitHeight + 24
color: sentByMe ? "lightgrey" : Material.accent
Label {
id: messageText
text: index
text: display
color: sentByMe ? "black" : "white"
anchors.fill: parent
anchors.margins: 12
@@ -146,6 +147,7 @@ Item {
}
TextField {
id: inputField
Layout.fillWidth: true
Layout.fillHeight: true
placeholderText: "Send a Message"
@@ -157,6 +159,11 @@ Item {
background: Rectangle {
color: Material.theme == Material.Light ? "#eaeaea" : "#242424"
}
Keys.onReturnPressed: {
currentRoom.postMessage("text", inputField.text)
inputField.text = ""
}
}
ItemDelegate {