diff --git a/qml/overlays/BulletinOverlay.qml b/qml/overlays/BulletinOverlay.qml index fa96953e..ec81da4d 100644 --- a/qml/overlays/BulletinOverlay.qml +++ b/qml/overlays/BulletinOverlay.qml @@ -59,9 +59,13 @@ ColumnLayout { 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) { var msg diff --git a/qml/overlays/Game1Overlay.qml b/qml/overlays/Game1Overlay.qml index 3f0da0d8..53967364 100644 --- a/qml/overlays/Game1Overlay.qml +++ b/qml/overlays/Game1Overlay.qml @@ -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) { var msg @@ -254,4 +259,4 @@ ColumnLayout { } } -} \ No newline at end of file +} diff --git a/qml/overlays/ListOverlay.qml b/qml/overlays/ListOverlay.qml index a9fbdf16..6ad77add 100644 --- a/qml/overlays/ListOverlay.qml +++ b/qml/overlays/ListOverlay.qml @@ -58,9 +58,14 @@ ColumnLayout { 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) { var msg diff --git a/qml/overlays/MembershipOverlay.qml b/qml/overlays/MembershipOverlay.qml index 6717a863..fafde2f1 100644 --- a/qml/overlays/MembershipOverlay.qml +++ b/qml/overlays/MembershipOverlay.qml @@ -52,8 +52,17 @@ ColumnLayout { contactsModel.clear() } - onAppendMessage: function(handle, from, displayName, message, image, mid, fromMe, ts, ack, error) { - var msg + 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) + } + + + function handle(handle, from, displayName, message, image, mid, fromMe, ts, ack, error) { + var msg try { msg = JSON.parse(message) } catch (e) { @@ -83,7 +92,7 @@ ColumnLayout { "_image": image, }) } - } + } } ListModel { // CONTACT OBJECTS ARE STORED HERE ...