From f5a7b56de9ee94e0b89b54dbf93b62449373c374 Mon Sep 17 00:00:00 2001 From: Gurkengewuerz Date: Sat, 18 May 2019 15:52:44 +0200 Subject: [PATCH] why image clipboard didnt work. lel --- src/clipboard/clipboardcopy.cpp | 1 + src/uploaders/uploadersingleton.cpp | 8 ++++++-- src/uploaders/uploadersingleton.hpp | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/clipboard/clipboardcopy.cpp b/src/clipboard/clipboardcopy.cpp index d079f3c..372cb0a 100644 --- a/src/clipboard/clipboardcopy.cpp +++ b/src/clipboard/clipboardcopy.cpp @@ -23,6 +23,7 @@ void clipboardcopy::copyClipboard() { if(mimeData->hasImage()) { QPixmap map = qvariant_cast(mimeData->imageData()); + UploaderSingleton::inst().upload(map, false); } else if(mimeData->hasText()) { #ifdef Q_OS_WIN QUrl fileUrl(mimeData->text()); diff --git a/src/uploaders/uploadersingleton.cpp b/src/uploaders/uploadersingleton.cpp index 9f9589b..c3548ee 100644 --- a/src/uploaders/uploadersingleton.cpp +++ b/src/uploaders/uploadersingleton.cpp @@ -53,7 +53,7 @@ void UploaderSingleton::registerUploader(Uploader *uploader) { emit newUploader(uploader); } -void UploaderSingleton::upload(QPixmap pixmap) { +void UploaderSingleton::upload(QPixmap pixmap, bool save) { updateSaveSettings(); auto u = uploaders.value(uploader); if (!u->validate()) { @@ -63,7 +63,7 @@ void UploaderSingleton::upload(QPixmap pixmap) { } QString format = settings::settings().value("captureformat", "PNG").toString(); QFile *file = nullptr; - if (saveImages) { + if (saveImages && save) { file = new QFile(saveDir.absoluteFilePath( formatter::format(settings::settings().value("fileFormat", "Screenshot %(yyyy-MM-dd HH-mm-ss)date.%ext").toString(), format.toLower()))); @@ -80,6 +80,10 @@ void UploaderSingleton::upload(QPixmap pixmap) { delete file; } +void UploaderSingleton::upload(QPixmap pixmap) { + UploaderSingleton::upload(pixmap, true); +} + void UploaderSingleton::upload(QByteArray img, QString format) { updateSaveSettings(); if (img.isEmpty()) return; diff --git a/src/uploaders/uploadersingleton.hpp b/src/uploaders/uploadersingleton.hpp index d1212f4..c4dc91a 100644 --- a/src/uploaders/uploadersingleton.hpp +++ b/src/uploaders/uploadersingleton.hpp @@ -14,6 +14,7 @@ public: return inst; } void registerUploader(Uploader *uploader); + void upload(QPixmap pixmap, bool save); void upload(QPixmap pixmap); void upload(QByteArray img, QString format); void upload(QFile &img, QString format);