thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support audio, video, generic file for pasting (#220)

Browse source 
* Refactor widget items to use same interface

* Support audio, video, generic file for pasting

* Add utils function for human readable file sizes

* Set correct MIME type for media messages

This change also determines the size of the upload once from the
ContentLengthHeader, rather than seeking the QIODevice and asking for
its size. This prevents any future trouble in case the QIODevice is
sequential (cannot be seeked). The MIME type is also determined at
upload once, rather than using the QIODevice and the underlying data
inside.

* Allow for file urls to be used as fall-back

This fixes an issue on macOS which uses `text/uri-list` for copying
files to the clipboard.

fixes #228
This commit is contained in:
christarazi 2018-02-18 12:52:31 -08:00 • committed by mujx
parent c8bfb02211
commit cd9d1a2ec6
25 changed files with 552 additions and 399 deletions
Download patch file Download diff file Expand all files Collapse all files

22
include/TextInputWidget.h
View file

@ -27,12 +27,12 @@
#include "FlatButton.h"
#include "LoadingIndicator.h"
#include "dialogs/PreviewImageOverlay.h"
#include "dialogs/PreviewUploadOverlay.h"
#include "emoji/PickButton.h"
namespace dialogs {
class PreviewImageOverlay;
class PreviewUploadOverlay;
}
class FilteredTextEdit : public QTextEdit
@ -53,9 +53,13 @@ signals:
void heightChanged(int height);
void startedTyping();
void stoppedTyping();
void startedUpload();
void message(QString);
void command(QString name, QString args);
void image(const QSharedPointer<QIODevice> iodev, const QString &img_name);
void image(QSharedPointer<QIODevice> data, const QString &filename);
void audio(QSharedPointer<QIODevice> data, const QString &filename);
void video(QSharedPointer<QIODevice> data, const QString &filename);
void file(QSharedPointer<QIODevice> data, const QString &filename);
protected:
void keyPressEvent(QKeyEvent *event) override;
@ -67,11 +71,12 @@ private:
size_t history_index_;
QTimer *typingTimer_;
dialogs::PreviewImageOverlay previewDialog_;
dialogs::PreviewUploadOverlay previewDialog_;
void textChanged();
void receiveImage(const QByteArray img, const QString &img_name);
void uploadData(const QByteArray data, const QString &media, const QString &filename);
void afterCompletion(int);
void showPreview(const QMimeData *source, const QStringList &formats);
};
class TextInputWidget : public QWidget
@ -95,9 +100,10 @@ signals:
void sendTextMessage(QString msg);
void sendEmoteMessage(QString msg);
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 uploadImage(const QSharedPointer<QIODevice> data, const QString &filename);
void uploadFile(const QSharedPointer<QIODevice> data, const QString &filename);
void uploadAudio(const QSharedPointer<QIODevice> data, const QString &filename);
void uploadVideo(const QSharedPointer<QIODevice> data, const QString &filename);
void sendJoinRoomRequest(const QString &room);