Mirrors/telephant
2
0
Fork 0
mirror of https://github.com/muesli/telephant synced 2025-02-16 19:48:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't use messageid to check a message's validity

Browse source
This commit is contained in:
Christian Muehlhaeuser 2019-05-09 06:19:52 +02:00
parent b4575ab2ba
commit 81d2eadc45
No known key found for this signature in database
GPG key ID: 3CF9FA45CA1EBB7E
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
qml/MessagePopup.qml
View file

@ -24,7 +24,7 @@ Popup {
width: parent.width
MessageView {
showActionButtons: false
visible: message.messageid > 0
visible: message != null
name: message.name
messageid: message.messageid
posturl: message.posturl
@ -49,7 +49,7 @@ Popup {
}
Label {
visible: message.messageid > 0
visible: message != null
text: qsTr("Replying to %1").arg(name)
opacity: 0.3
}
@ -60,7 +60,7 @@ Popup {
Layout.minimumHeight: 128
focus: true
selectByMouse: true
placeholderText: message.messageid > 0 ? qsTr("Post your reply") : qsTr("What's happening?")
placeholderText: message != null ? qsTr("Post your reply") : qsTr("What's happening?")
wrapMode: TextArea.Wrap
}
@ -81,12 +81,12 @@ Popup {
enabled: remCharsLabel.text >= 0 && messageArea.text.length > 0
Layout.alignment: Qt.AlignBottom | Qt.AlignRight
highlighted: true
text: message.messageid > 0 ? qsTr("Reply") : qsTr("Post")
text: message != null ? qsTr("Reply") : qsTr("Post")
onClicked: {
popup.close()
var msg = messageArea.text
if (message.messageid > 0) {
if (message != null) {
msg = "@" + author + " " + msg
}
uiBridge.postButton(message.messageid, msg)

4
qml/chirp.qml
View file

@ -141,7 +141,7 @@ ApplicationWindow {
source: "images/post.png"
}
onClicked: {
messagePopup.messageid = 0
messagePopup.message = null
messagePopup.open()
}
}
@ -208,7 +208,7 @@ ApplicationWindow {
connectDialog.open()
break
case 1:
messagePopup.messageid = 0
messagePopup.message = null
messagePopup.open()
break
case 2: