cwtch.im
/
ui
Archived
6
7
Fork 2
Code Issues 64 Pull Requests 2 Releases 9 Wiki Activity

Merge branch 'qt512fix' of dan/ui into master

This commit is contained in:
erinn 2019-04-10 10:59:47 -07:00 committed by Gogs
parent 37f5cbc9b4 4b9f3f136e
commit 7ce73ec89d
4 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qml/overlays/BulletinOverlay.qml
View File

@ -59,9 +59,13 @@ ColumnLayout {
jsonModel4.clear() jsonModel4.clear()
} }
onAppendMessage: handle onAppendMessage: function(handle, from, displayName, message, image, mid, fromMe, ts, ack, error) {
handle(handle, from, displayName, message, image, mid, fromMe, ts, ack, error)
}
onPrependMessage: handle onPrependMessage: function(handle, from, displayName, message, image, mid, fromMe, ts, ack, error) {
handle(handle, from, displayName, message, image, mid, fromMe, ts, ack, error)
}
function handle(handle, from, displayName, message, image, mid, fromMe, ts, ack, error) { function handle(handle, from, displayName, message, image, mid, fromMe, ts, ack, error) {
var msg var msg

11
qml/overlays/Game1Overlay.qml
View File

@ -24,9 +24,14 @@ ColumnLayout {
} }
onAppendMessage: handle onAppendMessage: function(handle, from, displayName, message, image, mid, fromMe, ts, ack, error) {
handle(handle, from, displayName, message, image, mid, fromMe, ts, ack, error)
}
onPrependMessage: function(handle, from, displayName, message, image, mid, fromMe, ts, ack, error) {
handle(handle, from, displayName, message, image, mid, fromMe, ts, ack, error)
}
onPrependMessage: handle
function handle(handle, from, displayName, message, image, mid, fromMe, ts) { function handle(handle, from, displayName, message, image, mid, fromMe, ts) {
var msg var msg
@ -254,4 +259,4 @@ ColumnLayout {
} }
} }
} }

9
qml/overlays/ListOverlay.qml
View File

@ -58,9 +58,14 @@ ColumnLayout {
jsonModel4.clear() jsonModel4.clear()
} }
onAppendMessage: handle onAppendMessage: function(handle, from, displayName, message, image, mid, fromMe, ts, ack, error) {
handle(handle, from, displayName, message, image, mid, fromMe, ts, ack, error)
}
onPrependMessage: function(handle, from, displayName, message, image, mid, fromMe, ts, ack, error) {
handle(handle, from, displayName, message, image, mid, fromMe, ts, ack, error)
}
onPrependMessage: handle
function handle(handle, from, displayName, message, image, mid, fromMe, ts, ack, error) { function handle(handle, from, displayName, message, image, mid, fromMe, ts, ack, error) {
var msg var msg

15
qml/overlays/MembershipOverlay.qml
View File

@ -52,8 +52,17 @@ ColumnLayout {
contactsModel.clear() contactsModel.clear()
} }
onAppendMessage: function(handle, from, displayName, message, image, mid, fromMe, ts, ack, error) { onAppendMessage: function(handle, from, displayName, message, image, mid, fromMe, ts, ack, error) {
var msg handle(handle, from, displayName, message, image, mid, fromMe, ts, ack, error)
}
onPrependMessage: function(handle, from, displayName, message, image, mid, fromMe, ts, ack, error) {
handle(handle, from, displayName, message, image, mid, fromMe, ts, ack, error)
}
function handle(handle, from, displayName, message, image, mid, fromMe, ts, ack, error) {
var msg
try { try {
msg = JSON.parse(message) msg = JSON.parse(message)
} catch (e) { } catch (e) {
@ -83,7 +92,7 @@ ColumnLayout {
"_image": image, "_image": image,
}) })
} }
} }
} }
ListModel { // CONTACT OBJECTS ARE STORED HERE ... ListModel { // CONTACT OBJECTS ARE STORED HERE ...