blue/squawk
blue
/
squawk
2
3
Fork 6
Code Issues 21 Pull Requests 2 Actions Releases 10 Wiki Activity

feature: paste image in chat #51

Merged
blue merged 3 commits from shunf4/squawk:feat/paste_img into messageFeed 2021-10-16 15:34:01 +00:00
Conversation 0 Commits 3 Files Changed 7 +49 -1
2 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3a70df21f8 - Show all commits

45
ui/widgets/conversation.cpp
View File

@ -20,6 +20,7 @@
#include "ui_conversation.h"
#include <QDebug>
#include <QClipboard>
#include <QScrollBar>
#include <QTimer>
#include <QFileDialog>
@ -27,6 +28,9 @@
#include <unistd.h>
#include <QAbstractTextDocumentLayout>
#include <QCoreApplication>
#include <QTemporaryFile>
#include <QDir>
#include <QMenu>
Conversation::Conversation(bool muc, Models::Account* acc, Models::Element* el, const QString pJid, const QString pRes, QWidget* parent):
QWidget(parent),
@ -47,6 +51,7 @@ Conversation::Conversation(bool muc, Models::Account* acc, Models::Element* el,
delegate(new MessageDelegate(this)),
manualSliderChange(false),
tsb(QApplication::style()->styleHint(QStyle::SH_ScrollBar_Transient) == 1),
pasteImageAction(nullptr),
shadow(10, 1, Qt::black, this),
contextMenu(new QMenu())
{
@ -75,6 +80,7 @@ Conversation::Conversation(bool muc, Models::Account* acc, Models::Element* el,
statusLabel = m_ui->statusLabel;
connect(&ker, &KeyEnterReceiver::enterPressed, this, &Conversation::onEnterPressed);
connect(&ker, &KeyEnterReceiver::imagePasted, this, &Conversation::onImagePasted);
connect(m_ui->sendButton, &QPushButton::clicked, this, &Conversation::onEnterPressed);
connect(m_ui->attachButton, &QPushButton::clicked, this, &Conversation::onAttach);
connect(m_ui->clearButton, &QPushButton::clicked, this, &Conversation::onClearButton);
@ -82,7 +88,20 @@ Conversation::Conversation(bool muc, Models::Account* acc, Models::Element* el,
this, &Conversation::onTextEditDocSizeChanged);
m_ui->messageEditor->installEventFilter(&ker);
QAction* pasteImageAction = new QAction(tr("Paste Image"), this);
blue marked this conversation as resolved
blue commented 2021-10-11 12:29:16 +00:00
Review
Copy Link

Do you mind if we better move it to initialization block? Cuz, since you declare here that variable again as QAction* it might be even considered like another variable rather than that one declared as a property...

Do you mind if we better move it to initialization block? Cuz, since you declare here that variable again as QAction* it might be even considered like another variable rather than that one declared as a property...
shunf4 commented 2021-10-13 12:08:15 +00:00
Review
Copy Link

How about this change? 52551c1ce0

How about this change? https://git.macaw.me/blue/squawk/commit/52551c1ce0be0a223e388d339389b7a55b159b6c
blue commented 2021-10-13 12:32:55 +00:00
Review
Copy Link

That's good, thank you!

That's good, thank you!
connect(pasteImageAction, &QAction::triggered, this, &Conversation::onImagePasted);
m_ui->messageEditor->setContextMenuPolicy(Qt::CustomContextMenu);
connect(m_ui->messageEditor, &QTextEdit::customContextMenuRequested, this, [this, pasteImageAction](const QPoint &pos) {
pasteImageAction->setEnabled(Conversation::checkClipboardImage());
QMenu *editorMenu = m_ui->messageEditor->createStandardContextMenu();
editorMenu->addSeparator();
editorMenu->addAction(pasteImageAction);
editorMenu->exec(this->m_ui->messageEditor->mapToGlobal(pos));
});
//line->setAutoFillBackground(false);
//if (testAttribute(Qt::WA_TranslucentBackground)) {
@ -183,10 +202,20 @@ bool KeyEnterReceiver::eventFilter(QObject* obj, QEvent* event)
}
}
}
if (k == Qt::Key_V && key->modifiers() & Qt::CTRL) {
if (Conversation::checkClipboardImage()) {
emit imagePasted();
return true;
}
}
}
return QObject::eventFilter(obj, event);
}
bool Conversation::checkClipboardImage() {
return !QApplication::clipboard()->image().isNull();
}
QString Conversation::getPalResource() const
{
return activePalResource;
@ -218,6 +247,20 @@ void Conversation::onEnterPressed()
}
}
void Conversation::onImagePasted()
{
QImage image = QApplication::clipboard()->image();
if (image.isNull()) {
return;
}
QTemporaryFile *tempFile = new QTemporaryFile(QDir::tempPath() + QStringLiteral("/squawk_img_attach_XXXXXX.png"), QApplication::instance());
blue commented 2021-10-11 12:34:58 +00:00
Outdated
Review
Copy Link

Interestring solution...
I actually was thinking of it, but was more into may be saving it into downloads folder, for the next time. Like this way at somepoint the image is not going to be accesible, so, we're going to be forced to download it to see it.
Dunno, i really have mixed feelings about my way, what do you think?

Interestring solution... I actually was thinking of it, but was more into may be saving it into downloads folder, for the next time. Like this way at somepoint the image is not going to be accesible, so, we're going to be forced to download it to see it. Dunno, i really have mixed feelings about my way, what do you think?
shunf4 commented 2021-10-13 12:11:00 +00:00
Outdated
Review
Copy Link

I agree with you. Placing the pasted image into downloads folder is better.

Or putting it to temp folder, then moving it to downloads folder if it is sent successfully?

I agree with you. Placing the pasted image into downloads folder is better. Or putting it to temp folder, then moving it to downloads folder if it is sent successfully?
blue commented 2021-10-13 12:35:21 +00:00
Outdated
Review
Copy Link

Yeah, that would do! But if you will move the image on successfull send you're going to need to update the path to the image in databases after the image is moved, I hope I've done that handler...

Yeah, that would do! But if you will move the image on successfull send you're going to need to update the path to the image in databases after the image is moved, I hope I've done that handler...
shunf4 commented 2021-10-15 16:23:13 +00:00
Outdated
Review
Copy Link

Done in 39f2f3d975 .

The file is copied (rather than moved) because it might still be used by QImageReader in message preview widget.

Done in https://git.macaw.me/blue/squawk/commit/39f2f3d975a1ce38144ef1992506416a934e5005 . The file is copied (rather than moved) because it might still be used by `QImageReader` in message preview widget.
tempFile->open();
image.save(tempFile, "PNG");
tempFile->close();
qDebug() << "image on paste temp file: " << tempFile->fileName();
addAttachedFile(tempFile->fileName());
}
void Conversation::onAttach()
{
QFileDialog* d = new QFileDialog(this, tr("Chose a file to send"));

5
ui/widgets/conversation.h
View File

@ -60,6 +60,7 @@ protected:
signals:
void enterPressed();
void imagePasted();
};
class Conversation : public QWidget
@ -77,6 +78,7 @@ public:
void setPalResource(const QString& res);
virtual void setAvatar(const QString& path);
void setFeedFrames(bool top, bool right, bool bottom, bool left);
static bool checkClipboardImage();
signals:
void sendMessage(const Shared::Message& message);
@ -102,6 +104,7 @@ protected:
protected slots:
void onEnterPressed();
void onImagePasted();
void onAttach();
void onFileSelected();
void onBadgeClose();
@ -133,6 +136,8 @@ protected:
bool manualSliderChange;
bool tsb; //transient scroll bars
QAction* pasteImageAction;
ShadowOverlay shadow;
QMenu* contextMenu;
};