diff --git a/include/MatrixClient.h b/include/MatrixClient.h
index 8936003f..df21ccdb 100644
--- a/include/MatrixClient.h
+++ b/include/MatrixClient.h
@@ -55,9 +55,15 @@ public:
void downloadImage(const QString &event_id, const QUrl &url);
void downloadFile(const QString &event_id, const QUrl &url);
void messages(const QString &room_id, const QString &from_token, int limit = 30) noexcept;
- void uploadImage(const QString &roomid, const QString &filename);
- void uploadFile(const QString &roomid, const QString &filename);
- void uploadAudio(const QString &roomid, const QString &filename);
+ void uploadImage(const QString &roomid,
+ const QSharedPointer<QIODevice> data,
+ const QString &filename);
+ void uploadFile(const QString &roomid,
+ const QSharedPointer<QIODevice> data,
+ const QString &filename);
+ void uploadAudio(const QString &roomid,
+ const QSharedPointer<QIODevice> data,
+ const QString &filename);
void joinRoom(const QString &roomIdOrAlias);
void leaveRoom(const QString &roomId);
void sendTypingNotification(const QString &roomid, int timeoutInMillis = 20000);
@@ -98,7 +104,10 @@ signals:
const QString &homeserver,
const QString &token);
void versionSuccess();
- void imageUploaded(const QString &roomid, const QString &filename, const QString &url);
+ void imageUploaded(const QString &roomid,
+ const QSharedPointer<QIODevice> data,
+ const QString &filename,
+ const QString &url);
void fileUploaded(const QString &roomid, const QString &filename, const QString &url);
void audioUploaded(const QString &roomid, const QString &filename, const QString &url);
@@ -131,7 +140,7 @@ signals:
void roomCreationFailed(const QString &msg);
private:
- QNetworkReply *makeUploadRequest(const QString &filename);
+ QNetworkReply *makeUploadRequest(QSharedPointer<QIODevice> iodev);
// Client API prefix.
QString clientApiUrl_;
diff --git a/include/TextInputWidget.h b/include/TextInputWidget.h
index df309e27..cc01be69 100644
--- a/include/TextInputWidget.h
+++ b/include/TextInputWidget.h
@@ -27,8 +27,14 @@
#include "FlatButton.h"
#include "LoadingIndicator.h"
+#include "dialogs/PreviewImageOverlay.h"
+
#include "emoji/PickButton.h"
+namespace dialogs {
+class PreviewImageOverlay;
+}
+
class FilteredTextEdit : public QTextEdit
{
Q_OBJECT
@@ -48,16 +54,22 @@ signals:
void stoppedTyping();
void message(QString);
void command(QString name, QString args);
+ void image(const QSharedPointer<QIODevice> iodev, const QString &img_name);
protected:
void keyPressEvent(QKeyEvent *event) override;
+ bool canInsertFromMimeData(const QMimeData *source) const override;
+ void insertFromMimeData(const QMimeData *source) override;
private:
std::deque<QString> true_history_, working_history_;
size_t history_index_;
QTimer *typingTimer_;
+ dialogs::PreviewImageOverlay previewDialog_;
+
void textChanged();
+ void receiveImage(const QByteArray img, const QString &img_name);
void afterCompletion(int);
};
@@ -83,9 +95,9 @@ signals:
void sendTextMessage(QString msg);
void sendEmoteMessage(QString msg);
- void uploadImage(QString filename);
- void uploadFile(QString filename);
- void uploadAudio(QString filename);
+ void uploadImage(QSharedPointer<QIODevice> data, const QString &filename);
+ void uploadFile(QSharedPointer<QIODevice> data, const QString &filename);
+ void uploadAudio(QSharedPointer<QIODevice> data, const QString &filename);
void sendJoinRoomRequest(const QString &room);
diff --git a/include/dialogs/PreviewImageOverlay.h b/include/dialogs/PreviewImageOverlay.h
new file mode 100644
index 00000000..a1ab32ee
--- /dev/null
+++ b/include/dialogs/PreviewImageOverlay.h
@@ -0,0 +1,57 @@
+/*
+ * nheko Copyright (C) 2017 Konstantinos Sideris <siderisk@auth.gr>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <QLabel>
+#include <QLineEdit>
+#include <QPixmap>
+#include <QWidget>
+
+#include "FlatButton.h"
+
+class QMimeData;
+
+namespace dialogs {
+
+class PreviewImageOverlay : public QWidget
+{
+ Q_OBJECT
+public:
+ PreviewImageOverlay(QWidget *parent = nullptr);
+
+ void setImageAndCreate(const QByteArray data, const QString &type);
+ void setImageAndCreate(const QString &path);
+
+signals:
+ void confirmImageUpload(const QByteArray data, const QString &img_name);
+
+private:
+ void init();
+
+ QPixmap image_;
+ QByteArray imageData_;
+ QString imagePath_;
+
+ QLabel titleLabel_;
+ QLabel imageLabel_;
+ QLineEdit imageName_;
+
+ FlatButton upload_;
+ FlatButton cancel_;
+};
+} // dialogs
diff --git a/include/timeline/TimelineView.h b/include/timeline/TimelineView.h
index cde64148..bba40669 100644
--- a/include/timeline/TimelineView.h
+++ b/include/timeline/TimelineView.h
@@ -87,7 +87,9 @@ public:
void addUserMessage(mtx::events::MessageType ty, const QString &msg);
template<class Widget, mtx::events::MessageType MsgType>
- void addUserMessage(const QString &url, const QString &filename);
+ void addUserMessage(const QString &url,
+ const QSharedPointer<QIODevice> data,
+ const QString &filename);
void updatePendingMessage(int txn_id, QString event_id);
void scrollDown();
void addDateSeparator(QDateTime datetime, int position);
@@ -216,11 +218,13 @@ private:
template<class Widget, mtx::events::MessageType MsgType>
void
-TimelineView::addUserMessage(const QString &url, const QString &filename)
+TimelineView::addUserMessage(const QString &url,
+ const QSharedPointer<QIODevice> data,
+ const QString &filename)
{
auto with_sender = lastSender_ != local_user_;
- auto widget = new Widget(client_, url, filename, this);
+ auto widget = new Widget(client_, url, data, filename, this);
TimelineItem *view_item =
new TimelineItem(widget, local_user_, with_sender, scroll_widget_);
diff --git a/include/timeline/TimelineViewManager.h b/include/timeline/TimelineViewManager.h
index 2c32da16..c19031c6 100644
--- a/include/timeline/TimelineViewManager.h
+++ b/include/timeline/TimelineViewManager.h
@@ -23,6 +23,8 @@
#include <mtx.hpp>
+class QFile;
+
class MatrixClient;
class RoomInfoListItem;
class TimelineView;
@@ -64,7 +66,10 @@ public slots:
void setHistoryView(const QString &room_id);
void queueTextMessage(const QString &msg);
void queueEmoteMessage(const QString &msg);
- void queueImageMessage(const QString &roomid, const QString &filename, const QString &url);
+ void queueImageMessage(const QString &roomid,
+ const QSharedPointer<QIODevice> data,
+ const QString &filename,
+ const QString &url);
void queueFileMessage(const QString &roomid, const QString &filename, const QString &url);
void queueAudioMessage(const QString &roomid, const QString &filename, const QString &url);
diff --git a/include/timeline/widgets/AudioItem.h b/include/timeline/widgets/AudioItem.h
index f8e7cc07..ca81f498 100644
--- a/include/timeline/widgets/AudioItem.h
+++ b/include/timeline/widgets/AudioItem.h
@@ -48,6 +48,7 @@ public:
AudioItem(QSharedPointer<MatrixClient> client,
const QString &url,
+ const QSharedPointer<QIODevice> data,
const QString &filename,
QWidget *parent = nullptr);
diff --git a/include/timeline/widgets/FileItem.h b/include/timeline/widgets/FileItem.h
index fd0b0249..72589189 100644
--- a/include/timeline/widgets/FileItem.h
+++ b/include/timeline/widgets/FileItem.h
@@ -42,6 +42,7 @@ public:
FileItem(QSharedPointer<MatrixClient> client,
const QString &url,
+ const QSharedPointer<QIODevice> data,
const QString &filename,
QWidget *parent = nullptr);
diff --git a/include/timeline/widgets/ImageItem.h b/include/timeline/widgets/ImageItem.h
index 467c70ab..d24b7239 100644
--- a/include/timeline/widgets/ImageItem.h
+++ b/include/timeline/widgets/ImageItem.h
@@ -36,6 +36,7 @@ public:
ImageItem(QSharedPointer<MatrixClient> client,
const QString &url,
+ const QSharedPointer<QIODevice> data,
const QString &filename,
QWidget *parent = nullptr);
diff --git a/include/timeline/widgets/VideoItem.h b/include/timeline/widgets/VideoItem.h
index 88ff21ec..53c3e21a 100644
--- a/include/timeline/widgets/VideoItem.h
+++ b/include/timeline/widgets/VideoItem.h
@@ -37,6 +37,7 @@ public:
VideoItem(QSharedPointer<MatrixClient> client,
const QString &url,
+ const QSharedPointer<QIODevice> data,
const QString &filename,
QWidget *parent = nullptr);
|
