Merge branch 'qt512fix' of dan/ui into master
This commit is contained in:
commit
7ce73ec89d
|
@ -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
|
||||
|
|
|
@ -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 {
|
|||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 ...
|
||||
|
|
Reference in New Issue