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

Upload screenshot to S3 on Enter after capture

Browse Source
This commit is contained in:
Yuriy Puchkov
2020-07-02 21:21:32 +03:00
parent c4a745d838
commit ceadb0d833
5 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/widgets/capture/capturewidget.cpp
View File

@@ -33,6 +33,8 @@
#include "src/utils/screenshotsaver.h"
#include "src/core/controller.h"
#include "src/widgets/capture/modificationcommand.h"
#include "src/tools/imgs3/imgs3uploadertool.h"
#include "src/tools/toolfactory.h"
#include <QUndoView>
#include <QScreen>
#include <QGuiApplication>
@@ -778,8 +780,11 @@ void CaptureWidget::initShortcuts() {
new QShortcut(QKeySequence(Qt::SHIFT + Qt::Key_Down), this, SLOT(downResize()));
new QShortcut(Qt::Key_Space, this, SLOT(togglePanel()));
new QShortcut(Qt::Key_Escape, this, SLOT(deleteToolwidgetOrClose()));
new QShortcut(Qt::Key_Return, this, SLOT(copyScreenshot()));
new QShortcut(Qt::Key_Enter, this, SLOT(copyScreenshot()));
// new QShortcut(Qt::Key_Return, this, SLOT(copyScreenshot()));
// new QShortcut(Qt::Key_Enter, this, SLOT(copyScreenshot()));
new QShortcut(Qt::Key_Return, this, SLOT(uploadScreenshot()));
new QShortcut(Qt::Key_Enter, this, SLOT(uploadScreenshot()));
}
void CaptureWidget::updateSizeIndicator() {
@@ -861,6 +866,13 @@ void CaptureWidget::childLeave() {
update();
}
void CaptureWidget::uploadScreenshot() {
m_activeTool = new ImgS3UploaderTool();
m_activeTool->setCapture(pixmap());
handleButtonSignal(CaptureTool::REQ_ADD_EXTERNAL_WIDGETS);
close();
}
void CaptureWidget::copyScreenshot() {
m_captureDone = true;
ScreenshotSaver().saveToClipboard(pixmap());