From 432a2e13548b00bbacee1f06da8e605e26006379 Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Fri, 1 Dec 2017 15:39:50 +0200 Subject: Add inline audio clip player (m.audio) (#143) --- include/timeline/TimelineItem.h | 62 ++++++++++++++++++- include/timeline/TimelineView.h | 7 ++- include/timeline/widgets/AudioItem.h | 111 +++++++++++++++++++++++++++++++++++ include/timeline/widgets/FileItem.h | 12 ---- include/timeline/widgets/VideoItem.h | 0 5 files changed, 175 insertions(+), 17 deletions(-) create mode 100644 include/timeline/widgets/AudioItem.h create mode 100644 include/timeline/widgets/VideoItem.h (limited to 'include') diff --git a/include/timeline/TimelineItem.h b/include/timeline/TimelineItem.h index 9646405c..fe265079 100644 --- a/include/timeline/TimelineItem.h +++ b/include/timeline/TimelineItem.h @@ -21,20 +21,24 @@ #include #include #include +#include #include #include -#include "AvatarProvider.h" +#include "Audio.h" #include "Emote.h" #include "File.h" #include "Image.h" -#include "MessageEvent.h" #include "Notice.h" -#include "RoomInfoListItem.h" #include "Text.h" + +#include "AvatarProvider.h" +#include "MessageEvent.h" +#include "RoomInfoListItem.h" #include "TimelineViewManager.h" class ImageItem; +class AudioItem; class FileItem; class Avatar; @@ -65,6 +69,7 @@ public: // m.image TimelineItem(ImageItem *item, const QString &userid, bool withSender, QWidget *parent = 0); TimelineItem(FileItem *item, const QString &userid, bool withSender, QWidget *parent = 0); + TimelineItem(AudioItem *item, const QString &userid, bool withSender, QWidget *parent = 0); TimelineItem(ImageItem *img, const events::MessageEvent &e, @@ -74,6 +79,10 @@ public: const events::MessageEvent &e, bool with_sender, QWidget *parent); + TimelineItem(AudioItem *audio, + const events::MessageEvent &e, + bool with_sender, + QWidget *parent); void setUserAvatar(const QImage &pixmap); DescInfo descriptionMessage() const { return descriptionMsg_; } @@ -93,6 +102,12 @@ private: const QString &msgDescription, bool withSender); + template + void setupWidgetLayout(Widget *widget, + const Event &event, + const QString &msgDescription, + bool withSender); + void generateBody(const QString &body); void generateBody(const QString &userid, const QString &body); void generateTimestamp(const QDateTime &time); @@ -153,3 +168,44 @@ TimelineItem::setupLocalWidgetLayout(Widget *widget, mainLayout_->addLayout(widgetLayout); } + +template +void +TimelineItem::setupWidgetLayout(Widget *widget, + const Event &event, + const QString &msgDescription, + bool withSender) +{ + init(); + + event_id_ = event.eventId(); + + auto timestamp = QDateTime::fromMSecsSinceEpoch(event.timestamp()); + auto displayName = TimelineViewManager::displayName(event.sender()); + + QSettings settings; + descriptionMsg_ = {event.sender() == settings.value("auth/user_id") ? "You" : displayName, + event.sender(), + msgDescription, + descriptiveTime(QDateTime::fromMSecsSinceEpoch(event.timestamp()))}; + + generateTimestamp(timestamp); + + auto widgetLayout = new QHBoxLayout(); + widgetLayout->setContentsMargins(0, 5, 0, 0); + widgetLayout->addWidget(widget); + widgetLayout->addStretch(1); + + if (withSender) { + generateBody(displayName, ""); + setupAvatarLayout(displayName); + + mainLayout_->addLayout(headerLayout_); + + AvatarProvider::resolve(event.sender(), this); + } else { + setupSimpleLayout(); + } + + mainLayout_->addLayout(widgetLayout); +} diff --git a/include/timeline/TimelineView.h b/include/timeline/TimelineView.h index 898a304e..5262d20d 100644 --- a/include/timeline/TimelineView.h +++ b/include/timeline/TimelineView.h @@ -27,13 +27,16 @@ #include #include +#include "Audio.h" #include "Emote.h" #include "File.h" #include "Image.h" -#include "MatrixClient.h" -#include "MessageEvent.h" #include "Notice.h" #include "Text.h" +#include "Video.h" + +#include "MatrixClient.h" +#include "MessageEvent.h" #include "TimelineItem.h" class FloatingButton; diff --git a/include/timeline/widgets/AudioItem.h b/include/timeline/widgets/AudioItem.h new file mode 100644 index 00000000..1104996f --- /dev/null +++ b/include/timeline/widgets/AudioItem.h @@ -0,0 +1,111 @@ +/* + * nheko Copyright (C) 2017 Konstantinos Sideris + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once + +#include +#include +#include +#include +#include +#include + +#include "Audio.h" +#include "MatrixClient.h" +#include "MessageEvent.h" + +namespace events = matrix::events; +namespace msgs = matrix::events::messages; + +class AudioItem : public QWidget +{ + Q_OBJECT + + Q_PROPERTY(QColor textColor WRITE setTextColor READ textColor) + Q_PROPERTY(QColor iconColor WRITE setIconColor READ iconColor) + Q_PROPERTY(QColor backgroundColor WRITE setBackgroundColor READ backgroundColor) + + Q_PROPERTY(QColor durationBackgroundColor WRITE setDurationBackgroundColor READ + durationBackgroundColor) + Q_PROPERTY(QColor durationForegroundColor WRITE setDurationForegroundColor READ + durationForegroundColor) + +public: + AudioItem(QSharedPointer client, + const events::MessageEvent &event, + QWidget *parent = nullptr); + + AudioItem(QSharedPointer client, + const QString &url, + const QString &filename, + QWidget *parent = nullptr); + + QSize sizeHint() const override; + + void setTextColor(const QColor &color) { textColor_ = color; } + void setIconColor(const QColor &color) { iconColor_ = color; } + void setBackgroundColor(const QColor &color) { backgroundColor_ = color; } + + void setDurationBackgroundColor(const QColor &color) { durationBgColor_ = color; } + void setDurationForegroundColor(const QColor &color) { durationFgColor_ = color; } + + QColor textColor() const { return textColor_; } + QColor iconColor() const { return iconColor_; } + QColor backgroundColor() const { return backgroundColor_; } + + QColor durationBackgroundColor() const { return durationBgColor_; } + QColor durationForegroundColor() const { return durationFgColor_; } + +protected: + void paintEvent(QPaintEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + +private slots: + void fileDownloaded(const QString &event_id, const QByteArray &data); + +private: + QString calculateFileSize(int nbytes) const; + void init(); + + enum class AudioState + { + Play, + Pause, + }; + + AudioState state_ = AudioState::Play; + + QUrl url_; + QString text_; + QString readableFileSize_; + QString filenameToSave_; + + events::MessageEvent event_; + QSharedPointer client_; + + QMediaPlayer *player_; + + QIcon playIcon_; + QIcon pauseIcon_; + + QColor textColor_ = QColor("white"); + QColor iconColor_ = QColor("#38A3D8"); + QColor backgroundColor_ = QColor("#333"); + + QColor durationBgColor_ = QColor("black"); + QColor durationFgColor_ = QColor("blue"); +}; diff --git a/include/timeline/widgets/FileItem.h b/include/timeline/widgets/FileItem.h index ebb18111..47e81867 100644 --- a/include/timeline/widgets/FileItem.h +++ b/include/timeline/widgets/FileItem.h @@ -30,18 +30,6 @@ namespace events = matrix::events; namespace msgs = matrix::events::messages; -constexpr int MaxWidth = 400; -constexpr int Height = 70; -constexpr int IconRadius = 22; -constexpr int IconDiameter = IconRadius * 2; -constexpr int HorizontalPadding = 12; -constexpr int TextPadding = 15; -constexpr int DownloadIconRadius = IconRadius - 4; - -constexpr double VerticalPadding = Height - 2 * IconRadius; -constexpr double IconYCenter = Height / 2; -constexpr double IconXCenter = HorizontalPadding + IconRadius; - class FileItem : public QWidget { Q_OBJECT diff --git a/include/timeline/widgets/VideoItem.h b/include/timeline/widgets/VideoItem.h new file mode 100644 index 00000000..e69de29b -- cgit v1.2.3