mirror of
https://github.com/fergalmoran/flameshot.git
synced 2025-12-22 09:51:06 +00:00
* Handle captures without sigslots Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Set {app,organization}Name and version consistently Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Make 'full' dbus-free Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Move CaptureRequest::exportCapture to Controller We need to wait until the upload widget (or similar widgets) have finished before exiting. This must be done using a signal. The problem is that CaptureRequest can't be guaranteed to survive until the widget has finished what it's doing. Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Use QApplication with the 'full' subcommand Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Do unto 'screen' as we did to 'full' Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Add FlameshotDaemon singleton class Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Support clipboard hosting for both pixmaps and text * Fix upload handling Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Do not show tray icon if not daemon Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Clean up handling of pin task Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Remove annoying Qt warning messages The messages were caused by the color wheel. Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Fix small bug in Controller::exportCapture * Fix --raw output * Make 'gui' dbus-independent Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Fix accept on select bug Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Fix compile error on Windows Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Make it work on Windows * Remove obsolete function in main.cpp Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Make 'launcher' work without dbus Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * clang-format, sigh Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Enable CLI parsing on MacOS Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Make 'config' work without dbus Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Small refactor of capture request handling Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Remove obsolete DBusUtils Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Remove unused D-Bus sigslots Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Remove D-Bus methods openConfig, autostartEnabled and trayIconEnabled Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Remove D-Bus method requestCapture Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Remove CaptureRequest id mechanism Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Fix 'launcher' crash Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Handle clipboard notifications properly Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Add 'autoCloseIdleDaemon' option Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Document FlameshotDaemon class Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Make 'flameshot gui' run in single-application mode Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Add `allowmultipleGuiInstances` config option Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Fix endless loop with multiple GUI instances Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Move upload confirmation dialog where it belongs Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Add the new config options to the GUI as well Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Fix failing build on Windows Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Handle persistence on MacOS Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * fixed notifications on macos * Fixed display on macos * Reformat tests/action_options.sh Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Fix infinite recursion in tests/action_options.sh Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> Co-authored-by: Dearsh Oberoi <59907159+deo002@users.noreply.github.com> Co-authored-by: Jeremy Borgman <borgman.jeremy@pm.me>
87 lines
1.8 KiB
C++
87 lines
1.8 KiB
C++
// SPDX-License-Identifier: GPL-3.0-or-later
|
|
// SPDX-FileCopyrightText: 2017-2019 Alejandro Sirgo Rica & Contributors
|
|
|
|
#include "capturerequest.h"
|
|
#include "confighandler.h"
|
|
#include "controller.h"
|
|
#include "imgupload/imguploadermanager.h"
|
|
#include "pinwidget.h"
|
|
#include "src/utils/screenshotsaver.h"
|
|
#include "src/widgets/imguploaddialog.h"
|
|
#include "systemnotification.h"
|
|
#include <QApplication>
|
|
#include <QClipboard>
|
|
#include <QDateTime>
|
|
#include <QVector>
|
|
#include <stdexcept>
|
|
|
|
CaptureRequest::CaptureRequest(CaptureRequest::CaptureMode mode,
|
|
const uint delay,
|
|
const QVariant& data,
|
|
CaptureRequest::ExportTask tasks)
|
|
: m_mode(mode)
|
|
, m_delay(delay)
|
|
, m_tasks(tasks)
|
|
, m_data(data)
|
|
{}
|
|
|
|
CaptureRequest::CaptureMode CaptureRequest::captureMode() const
|
|
{
|
|
return m_mode;
|
|
}
|
|
|
|
uint CaptureRequest::delay() const
|
|
{
|
|
return m_delay;
|
|
}
|
|
|
|
QString CaptureRequest::path() const
|
|
{
|
|
return m_path;
|
|
}
|
|
|
|
QVariant CaptureRequest::data() const
|
|
{
|
|
return m_data;
|
|
}
|
|
|
|
CaptureRequest::ExportTask CaptureRequest::tasks() const
|
|
{
|
|
return m_tasks;
|
|
}
|
|
|
|
QRect CaptureRequest::initialSelection() const
|
|
{
|
|
return m_initialSelection;
|
|
}
|
|
|
|
void CaptureRequest::addTask(CaptureRequest::ExportTask task)
|
|
{
|
|
if (task == SAVE) {
|
|
throw std::logic_error("SAVE task must be added using addSaveTask");
|
|
}
|
|
m_tasks |= task;
|
|
}
|
|
|
|
void CaptureRequest::removeTask(ExportTask task)
|
|
{
|
|
((int&)m_tasks) &= ~task;
|
|
}
|
|
|
|
void CaptureRequest::addSaveTask(const QString& path)
|
|
{
|
|
m_tasks |= SAVE;
|
|
m_path = path;
|
|
}
|
|
|
|
void CaptureRequest::addPinTask(const QRect& pinWindowGeometry)
|
|
{
|
|
m_tasks |= PIN;
|
|
m_pinWindowGeometry = pinWindowGeometry;
|
|
}
|
|
|
|
void CaptureRequest::setInitialSelection(const QRect& selection)
|
|
{
|
|
m_initialSelection = selection;
|
|
}
|