fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2026-02-04 09:37:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add --pin, --upload, --accept-on-select to CLI (#1970)

Browse Source 
* Add --pin option

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Add --upload option

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Add --accept-on-select option

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix failing build on MacOS

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Clean up option variable names in main

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Remove missing --path error

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Add tests for action options

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix file extension config option

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix --print-geometry bug

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Replace Qt::endl with "\n"

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix copy/upload task clipboard conflict

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix endless loop when using --raw and --delay

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix bug in upload handling

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Show dialog after upload if --clipboard is set

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>

* Fix failing build on Mac and Win

Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
This commit is contained in:
Haris Gušić
2021-10-20 18:48:54 +02:00
committed by GitHub
parent 94ed574f35
commit 988dcab9de
30 changed files with 409 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/core/controller.cpp
View File

@@ -51,7 +51,6 @@
Controller::Controller()
: m_captureWindow(nullptr)
, m_history(nullptr)
, m_trayIcon(nullptr)
, m_trayIconMenu(nullptr)
, m_networkCheckUpdates(nullptr)
@@ -101,7 +100,7 @@ Controller::Controller()
QObject::connect(m_HotkeyScreenshotHistory,
&QHotkey::activated,
qApp,
[&]() { this->showRecentScreenshots(); });
[&]() { this->showRecentUploads(); });
#endif
if (ConfigHandler().checkForUpdates()) {
@@ -111,7 +110,6 @@ Controller::Controller()
Controller::~Controller()
{
delete m_history;
delete m_trayIconMenu;
}
@@ -330,8 +328,13 @@ void Controller::startScreenGrab(const uint id, const int screenNumber)
}
QPixmap p(ScreenGrabber().grabScreen(n, ok));
if (ok) {
QRect selection; // `flameshot screen` does not support --selection
emit captureTaken(id, p, selection);
CaptureRequest& request = *requests().find(id);
QRect geometry = ScreenGrabber().screenGeometry(n);
if (request.tasks() & CaptureRequest::PIN) {
// change geometry for pin task
request.addPinTask(geometry);
}
emit captureTaken(id, p, geometry);
} else {
emit captureFailed(id);
}
@@ -421,8 +424,7 @@ void Controller::enableTrayIcon()
// recent screenshots
QAction* recentAction = new QAction(tr("&Latest Uploads"), this);
connect(
recentAction, SIGNAL(triggered()), this, SLOT(showRecentScreenshots()));
connect(recentAction, SIGNAL(triggered()), this, SLOT(showRecentUploads()));
// generate menu
m_trayIconMenu->addAction(captureAction);
@@ -528,25 +530,20 @@ void Controller::updateConfigComponents()
}
}
void Controller::updateRecentScreenshots()
void Controller::showRecentUploads()
{
if (nullptr != m_history) {
if (m_history->isVisible()) {
m_history->loadHistory();
}
static HistoryWidget* historyWidget = nullptr;
if (nullptr == historyWidget) {
historyWidget = new HistoryWidget();
connect(historyWidget, &QObject::destroyed, this, []() {
historyWidget = nullptr;
});
}
}
void Controller::showRecentScreenshots()
{
if (nullptr == m_history) {
m_history = new HistoryWidget();
}
m_history->loadHistory();
m_history->show();
historyWidget->loadHistory();
historyWidget->show();
#if defined(Q_OS_MACOS)
m_history->activateWindow();
m_history->raise();
historyWidget->activateWindow();
historyWidget->raise();
#endif
}
@@ -560,14 +557,14 @@ void Controller::startFullscreenCapture(const uint id)
bool ok = true;
QPixmap p(ScreenGrabber().grabEntireDesktop(ok));
if (ok) {
QRect selection; // `flameshot full` does not support --selection
emit captureTaken(id, p, selection);
// selection parameter is unused here
emit captureTaken(id, p, {});
} else {
emit captureFailed(id);
}
}
void Controller::handleCaptureTaken(uint id, QPixmap p, QRect selection)
void Controller::handleCaptureTaken(uint id, QPixmap p)
{
auto it = m_requestMap.find(id);
if (it != m_requestMap.end()) {