summary refs log tree commit diff
path: root/include
diff options
context:
space:
mode:
authorKonstantinos Sideris <sideris.konstantin@gmail.com>2017-12-25 23:02:33 +0200
committerKonstantinos Sideris <sideris.konstantin@gmail.com>2017-12-25 23:02:33 +0200
commit1ab55d4732a875d6f4004c57ab49fee157fa28e5 (patch)
tree0a0639fe8e80c182ec4997b6e51668ee297c9cd9 /include
parentUse a better regex to identify URLs (diff)
downloadnheko-1ab55d4732a875d6f4004c57ab49fee157fa28e5.tar.xz
Add date separator in the timeline
fixes #157
Diffstat (limited to 'include')
-rw-r--r--include/Config.h3
-rw-r--r--include/RoomInfoListItem.h2
-rw-r--r--include/timeline/TimelineItem.h5
-rw-r--r--include/timeline/TimelineView.h1
4 files changed, 8 insertions, 3 deletions
diff --git a/include/Config.h b/include/Config.h

index 805e7c02..7d35094e 100644 --- a/include/Config.h +++ b/include/Config.h
@@ -79,7 +79,8 @@ static constexpr int headerSpacing = 7; static constexpr int headerLeftMargin = 15; namespace fonts { -static constexpr int timestamp = 10; +static constexpr int timestamp = 10; +static constexpr int dateSeparator = conf::fontSize - 2; } // namespace fonts } // namespace timeline diff --git a/include/RoomInfoListItem.h b/include/RoomInfoListItem.h
index d4e4f983..bb8e0f1a 100644 --- a/include/RoomInfoListItem.h +++ b/include/RoomInfoListItem.h
@@ -18,6 +18,7 @@ #pragma once #include <QAction> +#include <QDateTime> #include <QSharedPointer> #include <QWidget> @@ -35,6 +36,7 @@ struct DescInfo QString userid; QString body; QString timestamp; + QDateTime datetime; }; class RoomInfoListItem : public QWidget diff --git a/include/timeline/TimelineItem.h b/include/timeline/TimelineItem.h
index 17b110fc..f1498d1b 100644 --- a/include/timeline/TimelineItem.h +++ b/include/timeline/TimelineItem.h
@@ -142,7 +142,7 @@ TimelineItem::setupLocalWidgetLayout(Widget *widget, auto timestamp = QDateTime::currentDateTime(); descriptionMsg_ = { - "You", userid, QString(" %1").arg(msgDescription), descriptiveTime(timestamp)}; + "You", userid, QString(" %1").arg(msgDescription), descriptiveTime(timestamp), timestamp}; generateTimestamp(timestamp); @@ -183,7 +183,8 @@ TimelineItem::setupWidgetLayout(Widget *widget, descriptionMsg_ = {sender == settings.value("auth/user_id") ? "You" : displayName, sender, msgDescription, - descriptiveTime(QDateTime::fromMSecsSinceEpoch(event.origin_server_ts))}; + descriptiveTime(timestamp), + timestamp}; generateTimestamp(timestamp); diff --git a/include/timeline/TimelineView.h b/include/timeline/TimelineView.h
index faada44c..caf4634a 100644 --- a/include/timeline/TimelineView.h +++ b/include/timeline/TimelineView.h
@@ -91,6 +91,7 @@ public: void addUserMessage(const QString &url, const QString &filename); void updatePendingMessage(int txn_id, QString event_id); void scrollDown(); + void addDateSeparator(QDateTime datetime, int position); public slots: void sliderRangeChanged(int min, int max);