From fdb76bb5c1bdce765479442a70ddca80b867caa6 Mon Sep 17 00:00:00 2001
From: Konstantinos Sideris <sideris.konstantin@gmail.com>
Date: Wed, 29 Nov 2017 23:39:35 +0200
Subject: Implement file uploads

fixes #24
---
 src/TimelineItem.cc | 33 ++++++++-------------------------
 1 file changed, 8 insertions(+), 25 deletions(-)

(limited to 'src/TimelineItem.cc')

diff --git a/src/TimelineItem.cc b/src/TimelineItem.cc
index b57f5118..7297abc3 100644
--- a/src/TimelineItem.cc
+++ b/src/TimelineItem.cc
@@ -15,20 +15,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QDateTime>
 #include <QFontDatabase>
 #include <QRegExp>
 #include <QSettings>
 #include <QTextEdit>
 
 #include "Avatar.h"
-#include "AvatarProvider.h"
 #include "Config.h"
 #include "FileItem.h"
 #include "ImageItem.h"
 #include "Sync.h"
 #include "TimelineItem.h"
-#include "TimelineViewManager.h"
 
 static const QRegExp URL_REGEX("((?:https?|ftp)://\\S+)");
 static const QString URL_HTML = "<a href=\"\\1\">\\1</a>";
@@ -119,29 +116,15 @@ TimelineItem::TimelineItem(ImageItem *image,
 {
         init();
 
-        auto displayName = TimelineViewManager::displayName(userid);
-        auto timestamp   = QDateTime::currentDateTime();
-
-        descriptionMsg_ = {"You", userid, " sent an image", descriptiveTime(timestamp)};
-
-        generateTimestamp(timestamp);
-
-        auto imageLayout = new QHBoxLayout();
-        imageLayout->setMargin(0);
-        imageLayout->addWidget(image);
-        imageLayout->addStretch(1);
-
-        if (withSender) {
-                generateBody(displayName, "");
-                setupAvatarLayout(displayName);
-                mainLayout_->addLayout(headerLayout_);
+        setupLocalWidgetLayout<ImageItem>(image, userid, "sent an image", withSender);
+}
 
-                AvatarProvider::resolve(userid, this);
-        } else {
-                setupSimpleLayout();
-        }
+TimelineItem::TimelineItem(FileItem *file, const QString &userid, bool withSender, QWidget *parent)
+  : QWidget{parent}
+{
+        init();
 
-        mainLayout_->addLayout(imageLayout);
+        setupLocalWidgetLayout<FileItem>(file, userid, "sent a file", withSender);
 }
 
 /*
@@ -169,7 +152,7 @@ TimelineItem::TimelineItem(ImageItem *image,
         generateTimestamp(timestamp);
 
         auto imageLayout = new QHBoxLayout();
-        imageLayout->setMargin(0);
+        imageLayout->setContentsMargins(0, 5, 0, 0);
         imageLayout->addWidget(image);
         imageLayout->addStretch(1);
 
-- 
cgit 1.5.1