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

Implement single method capture request

Browse Source 
The core now has a method requestCapture, which receives a
CaptureRequest object with all the needed information.
This reduces code duplication in future features.
This commit is contained in:
lupoDharkael
2018-04-29 11:27:55 +02:00
parent 55ab65ae12
commit 48c058782a
14 changed files with 301 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/core/flameshotdbusadapter.cpp
View File

@@ -30,7 +30,7 @@ FlameshotDBusAdapter::FlameshotDBusAdapter(QObject *parent)
connect(controller, &Controller::captureFailed,
this, &FlameshotDBusAdapter::captureFailed);
connect(controller, &Controller::captureTaken,
this, &FlameshotDBusAdapter::captureTaken);
this, &FlameshotDBusAdapter::handleCaptureTaken);
}
FlameshotDBusAdapter::~FlameshotDBusAdapter() {
@@ -38,39 +38,26 @@ FlameshotDBusAdapter::~FlameshotDBusAdapter() {
}
void FlameshotDBusAdapter::graphicCapture(QString path, int delay, uint id) {
auto controller = Controller::getInstance();
auto f = [controller, id, path, this]() {
controller->createVisualCapture(id, path);
};
// QTimer::singleShot(delay, controller, f); // requires Qt 5.4
doLater(delay, controller, f);
CaptureRequest req(CaptureRequest::GRAPHICAL_MODE, delay, path);
// if (toClipboard) {
// req.addTask(CaptureRequest::CLIPBOARD_SAVE_TASK);
// }
req.setStaticID(id);
Controller::getInstance()->requestCapture(req);
}
void FlameshotDBusAdapter::fullScreen(
QString path, bool toClipboard, int delay, uint id)
{
auto f = [id, path, toClipboard, this]() {
bool ok = true;
QPixmap p(ScreenGrabber().grabEntireDesktop(ok));
if (!ok) {
SystemNotification().sendMessage(tr("Unable to capture screen"));
emit captureFailed(id);
return;
}
if(!path.isEmpty()) {
ScreenshotSaver().saveToFilesystem(p, path);
}
if(toClipboard) {
ScreenshotSaver().saveToClipboard(p);
}
QByteArray byteArray;
QBuffer buffer(&byteArray);
p.save(&buffer, "PNG");
emit captureTaken(id, byteArray);
};
//QTimer::singleShot(delay, this, f); // // requires Qt 5.4
doLater(delay, this, f);
CaptureRequest req(CaptureRequest::FULLSCREEN_MODE, delay, path);
if (toClipboard) {
req.addTask(CaptureRequest::CLIPBOARD_SAVE_TASK);
}
if (!path.isEmpty()) {
req.addTask(CaptureRequest::FILESYSTEM_SAVE_TASK);
}
req.setStaticID(id);
Controller::getInstance()->requestCapture(req);
}
void FlameshotDBusAdapter::openConfig() {
@@ -92,3 +79,10 @@ void FlameshotDBusAdapter::autostartEnabled(bool enabled) {
// Autostart is not saved in a .ini file, requires manual update
controller->updateConfigComponents();
}
void FlameshotDBusAdapter::handleCaptureTaken(uint id, QPixmap p) {
QByteArray byteArray;
QBuffer buffer(&byteArray);
p.save(&buffer, "PNG");
emit captureTaken(id, byteArray);
}