diff options
| -rw-r--r-- | message.cpp | 6 | ||||
| -rw-r--r-- | message.h | 4 | ||||
| -rw-r--r-- | qml/Message.qml | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/message.cpp b/message.cpp index 90723d9..4aae043 100644 --- a/message.cpp +++ b/message.cpp @@ -46,6 +46,12 @@ DcMessage::getState() return dc_msg_get_state(m_message); } +QDateTime +DcMessage::getTimestamp() +{ + return QDateTime::fromSecsSinceEpoch (dc_msg_get_timestamp(m_message), Qt::UTC); +} + void DcMessage::setText(QString text) { @@ -1,5 +1,6 @@ #pragma once +#include <QDateTime> #include <QObject> #include <deltachat.h> @@ -13,6 +14,7 @@ class DcMessage : public QObject { Q_PROPERTY(uint32_t chatId READ getChatId CONSTANT) Q_PROPERTY(int viewtype READ getViewtype CONSTANT) Q_PROPERTY(int state READ getState CONSTANT) + Q_PROPERTY(QDateTime timestamp READ getTimestamp CONSTANT) Q_PROPERTY(QString text READ getText WRITE setText) Q_PROPERTY(QString subject READ getSubject CONSTANT) Q_PROPERTY(QString file READ getFile CONSTANT) @@ -37,7 +39,7 @@ public: Q_INVOKABLE uint32_t getChatId(); Q_INVOKABLE int getViewtype(); Q_INVOKABLE int getState(); - //Q_INVOKABLE int64_t getTimestamp(); + Q_INVOKABLE QDateTime getTimestamp(); //Q_INVOKABLE int64_t getReceivedTimestamp(); //Q_INVOKABLE int64_t getSortTimestamp(); Q_INVOKABLE void setText(QString); diff --git a/qml/Message.qml b/qml/Message.qml index 85cc2ac..c7daf07 100644 --- a/qml/Message.qml +++ b/qml/Message.qml @@ -218,10 +218,11 @@ RowLayout { } Label { Layout.fillWidth: true - text: messageObject.message.state == 26 ? "✓" + text: Qt.formatDateTime(messageObject.message.timestamp, "dd. MMM yyyy, hh:mm") + + (messageObject.message.state == 26 ? "✓" : messageObject.message.state == 28 ? "✓✓" : messageObject.message.state == 24 ? "✗" - : ""; + : ""); } } } |