d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-25 04:28:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix a few missing properties

Browse source
This commit is contained in:
Nicolas Werner 2021-07-12 01:28:09 +02:00
parent 801af1864c
commit f704e381c3
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
5 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -169,7 +169,7 @@ appimage-amd64:
# update appimage-builder (optional)
- pip3 install --upgrade git+https://www.opencode.net/azubieta/appimagecraft.git
- apt-get update && apt-get -y install --no-install-recommends g++-7 build-essential ninja-build qt${QT_PKG}{base,declarative,tools,multimedia,script,quickcontrols2,svg} liblmdb-dev libssl-dev git ninja-build qt5keychain-dev libgtest-dev ccache libevent-dev libcurl4-openssl-dev
- apt-get update && apt-get -y install --no-install-recommends g++-7 build-essential ninja-build qt${QT_PKG}{base,declarative,tools,multimedia,script,quickcontrols2,svg} liblmdb-dev libssl-dev git ninja-build qt5keychain-dev libgtest-dev ccache libevent-dev libcurl4-openssl-dev libgl1-mesa-dev
- wget https://github.com/Kitware/CMake/releases/download/v3.19.0/cmake-3.19.0-Linux-x86_64.sh && sh cmake-3.19.0-Linux-x86_64.sh --skip-license --prefix=/usr/local
- /usr/sbin/update-ccache-symlinks
script:

6
resources/qml/MessageView.qml
View file

@ -329,6 +329,9 @@ ScrollView {
required property bool isEdited
required property string replyTo
required property string userId
required property string roomTopic
required property string roomName
required property string callType
required property var reactions
required property int trustlevel
required property var timestamp
@ -432,6 +435,9 @@ ScrollView {
replyTo: wrapper.replyTo
userId: wrapper.userId
userName: wrapper.userName
roomTopic: wrapper.roomTopic
roomName: wrapper.roomName
callType: wrapper.callType
reactions: wrapper.reactions
trustlevel: wrapper.trustlevel
timestamp: wrapper.timestamp

9
resources/qml/TimelineRow.qml
View file

@ -33,6 +33,9 @@ Item {
required property string replyTo
required property string userId
required property string userName
required property string roomTopic
required property string roomName
required property string callType
required property var reactions
required property int trustlevel
required property var timestamp
@ -101,6 +104,9 @@ Item {
userId: row.replyData.userId ?? ""
userName: row.replyData.userName ?? ""
thumbnailUrl: row.replyData.thumbnailUrl ?? ""
roomTopic: row.replyData.roomTopic ?? ""
roomName: row.replyData.roomName ?? ""
callType: row.replyData.callType ?? ""
}
// actual message content
@ -123,6 +129,9 @@ Item {
isOnlyEmoji: r.isOnlyEmoji
userId: r.userId
userName: r.userName
roomTopic: r.roomTopic
roomName: r.roomName
callType: r.callType
isReply: false
}

11
resources/qml/delegates/MessageDelegate.qml
View file

@ -26,6 +26,9 @@ Item {
required property bool isOnlyEmoji
required property string userId
required property string userName
required property string roomTopic
required property string roomName
required property string callType
height: chooser.childrenRect.height
@ -192,7 +195,7 @@ Item {
body: formatted
isOnlyEmoji: false
isReply: d.isReply
formatted: model.data.roomName ? qsTr("room name changed to: %1").arg(model.data.roomName) : qsTr("removed room name")
formatted: d.roomName ? qsTr("room name changed to: %1").arg(d.roomName) : qsTr("removed room name")
}
}
@ -204,7 +207,7 @@ Item {
body: formatted
isOnlyEmoji: false
isReply: d.isReply
formatted: model.data.roomTopic ? qsTr("topic changed to: %1").arg(model.data.roomTopic) : qsTr("removed topic")
formatted: d.roomTopic ? qsTr("topic changed to: %1").arg(d.roomTopic) : qsTr("removed topic")
}
}
@ -228,7 +231,7 @@ Item {
body: formatted
isOnlyEmoji: false
isReply: d.isReply
formatted: qsTr("%1 created and configured room: %2").arg(d.userName).arg(model.data.roomId)
formatted: qsTr("%1 created and configured room: %2").arg(d.userName).arg(room.roomId())
}
}
@ -241,7 +244,7 @@ Item {
isOnlyEmoji: false
isReply: d.isReply
formatted: {
switch (model.data.callType) {
switch (d.callType) {
case "voice":
return qsTr("%1 placed a voice call.").arg(d.userName);
case "video":

6
resources/qml/delegates/Reply.qml
View file

@ -27,6 +27,9 @@ Item {
property string userId
property string userName
property string thumbnailUrl
property string roomTopic
property string roomName
property string callType
width: parent.width
height: replyContainer.height
@ -89,6 +92,9 @@ Item {
isOnlyEmoji: r.isOnlyEmoji
userId: r.userId
userName: r.userName
roomTopic: r.roomTopic
roomName: r.roomName
callType: r.callType
enabled: false
width: parent.width
isReply: true