benkyd/flameshot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve screenshot saver copy (#1604)

Browse Source 
* small refactor to screenshotsaver clipboard

* clang-format
This commit is contained in:
nullobsi
2021-05-03 15:37:12 -07:00
committed by GitHub
parent 57dac0d73d
commit 115a3a8132
2 changed files with 19 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/utils/screenshotsaver.cpp
View File

@@ -26,28 +26,26 @@ ScreenshotSaver::ScreenshotSaver(const unsigned id)
: m_id(id)
{}
void ScreenshotSaver::saveToClipboardPng(const QPixmap& capture)
void ScreenshotSaver::saveToClipboardMime(const QPixmap& capture,
const QString& imageType)
{
QByteArray array;
QBuffer buffer{ &array };
QImageWriter imageWriter{ &buffer, "PNG" };
QImageWriter imageWriter{ &buffer, imageType.toUpper().toUtf8() };
imageWriter.write(capture.toImage());
QPixmap pngPixmap;
bool isLoaded = pngPixmap.loadFromData(
reinterpret_cast<uchar*>(array.data()), array.size(), "PNG");
bool isLoaded =
pngPixmap.loadFromData(reinterpret_cast<uchar*>(array.data()),
array.size(),
imageType.toUpper().toUtf8());
if (isLoaded) {
// Need to send message before copying to clipboard
SystemNotification().sendMessage(
QObject::tr("Capture saved to clipboard"));
QMimeData* mimeData = new QMimeData;
mimeData->setData("image/png", array);
mimeData->setData("image/" + imageType, array);
QApplication::clipboard()->setMimeData(mimeData);
} else {
SystemNotification().sendMessage(
QObject::tr("Error while saving to clipboard"));
return;
}
}
@@ -62,56 +60,24 @@ void ScreenshotSaver::saveToClipboard(const QPixmap& capture)
saveToFilesystem(capture,
ConfigHandler().savePath(),
QObject::tr("Capture saved to clipboard."));
} else {
SystemNotification().sendMessage(
QObject::tr("Capture saved to clipboard."));
}
if (ConfigHandler().useJpgForClipboard()) {
// FIXME - it doesn't work on MacOS
saveToClipboardMime(capture, "jpeg");
} else {
// Need to send message before copying to clipboard
#if defined(Q_OS_LINUX) || defined(Q_OS_UNIX)
if (DesktopInfo().waylandDectected()) {
saveToClipboardPng(capture);
saveToClipboardMime(capture, "png");
} else {
QApplication::clipboard()->setPixmap(capture);
}
#else
QApplication::clipboard()->setPixmap(capture);
#endif
}
// Otherwise only save to clipboard
else {
if (ConfigHandler().useJpgForClipboard()) {
// FIXME - it doesn't work on MacOS
QByteArray array;
QBuffer buffer{ &array };
QImageWriter imageWriter{ &buffer, "JPEG" };
imageWriter.write(capture.toImage());
QPixmap jpgPixmap;
bool isLoaded = jpgPixmap.loadFromData(
reinterpret_cast<uchar*>(array.data()), array.size(), "JPEG");
if (isLoaded) {
// Need to send message before copying to clipboard
SystemNotification().sendMessage(
QObject::tr("Capture saved to clipboard"));
QMimeData* mimeData = new QMimeData;
mimeData->setData("image/jpeg", array);
QApplication::clipboard()->setMimeData(mimeData);
} else {
SystemNotification().sendMessage(
QObject::tr("Error while saving to clipboard"));
return;
}
} else {
// Need to send message before copying to clipboard
SystemNotification().sendMessage(
QObject::tr("Capture saved to clipboard"));
#if defined(Q_OS_LINUX) || defined(Q_OS_UNIX)
if (DesktopInfo().waylandDectected()) {
saveToClipboardPng(capture);
} else {
QApplication::clipboard()->setPixmap(capture);
}
#else
QApplication::clipboard()->setPixmap(capture);
#endif
}
}
}