mirror of
https://github.com/fergalmoran/flameshot.git
synced 2025-12-22 09:51:06 +00:00
working on wayland clipboard (#2284)
This commit is contained in:
1
.github/workflows/Linux-pack.yml
vendored
1
.github/workflows/Linux-pack.yml
vendored
@@ -484,6 +484,7 @@ jobs:
|
|||||||
fcitx-frontend-qt5 \
|
fcitx-frontend-qt5 \
|
||||||
openssl \
|
openssl \
|
||||||
ca-certificates
|
ca-certificates
|
||||||
|
|
||||||
- name: Get go-appimage tool
|
- name: Get go-appimage tool
|
||||||
# Will not use linuxdeployqt anymore, because it suopprts currently still-supported mainstream distribution,
|
# Will not use linuxdeployqt anymore, because it suopprts currently still-supported mainstream distribution,
|
||||||
# which is glibc 2.23. For more information, please see https://github.com/probonopd/linuxdeployqt/issues/340.
|
# which is glibc 2.23. For more information, please see https://github.com/probonopd/linuxdeployqt/issues/340.
|
||||||
|
|||||||
@@ -67,6 +67,7 @@ option(USE_MONOCHROME_ICON "Build using monochrome icon as default" OFF)
|
|||||||
option(GENERATE_TS "Regenerate translation source files" OFF)
|
option(GENERATE_TS "Regenerate translation source files" OFF)
|
||||||
option(USE_EXTERNAL_SINGLEAPPLICATION "Use external QtSingleApplication library" OFF)
|
option(USE_EXTERNAL_SINGLEAPPLICATION "Use external QtSingleApplication library" OFF)
|
||||||
option(USE_LAUNCHER_ABSOLUTE_PATH "Use absolute path for the desktop launcher" ON)
|
option(USE_LAUNCHER_ABSOLUTE_PATH "Use absolute path for the desktop launcher" ON)
|
||||||
|
option(USE_WAYLAND_CLIPBOARD "USE KF Gui Wayland Clipboard" OFF)
|
||||||
|
|
||||||
include(cmake/StandardProjectSettings.cmake)
|
include(cmake/StandardProjectSettings.cmake)
|
||||||
|
|
||||||
@@ -108,6 +109,7 @@ option(BUILD_STATIC_LIBS ON)
|
|||||||
option(BUILD_SHARED_LIBS OFF)
|
option(BUILD_SHARED_LIBS OFF)
|
||||||
add_subdirectory(external/Qt-Color-Widgets EXCLUDE_FROM_ALL)
|
add_subdirectory(external/Qt-Color-Widgets EXCLUDE_FROM_ALL)
|
||||||
|
|
||||||
|
|
||||||
if (APPLE)
|
if (APPLE)
|
||||||
add_subdirectory(external/QHotkey)
|
add_subdirectory(external/QHotkey)
|
||||||
endif()
|
endif()
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ modules:
|
|||||||
buildsystem: cmake-ninja
|
buildsystem: cmake-ninja
|
||||||
config-opts:
|
config-opts:
|
||||||
- -DCMAKE_BUILD_TYPE=Release
|
- -DCMAKE_BUILD_TYPE=Release
|
||||||
|
- -DUSE_WAYLAND_CLIPBOARD=1
|
||||||
sources:
|
sources:
|
||||||
- type: git
|
- type: git
|
||||||
url: https://github.com/flameshot-org/flameshot.git
|
url: https://github.com/flameshot-org/flameshot.git
|
||||||
|
|||||||
@@ -46,6 +46,8 @@ parts:
|
|||||||
- kde-frameworks-5-qt-5-15-core20
|
- kde-frameworks-5-qt-5-15-core20
|
||||||
source: https://github.com/flameshot-org/flameshot.git
|
source: https://github.com/flameshot-org/flameshot.git
|
||||||
plugin: cmake
|
plugin: cmake
|
||||||
|
cmake-parameters:
|
||||||
|
- -DUSE_WAYLAND_CLIPBOARD=1
|
||||||
source-type: git
|
source-type: git
|
||||||
override-pull: |
|
override-pull: |
|
||||||
snapcraftctl pull
|
snapcraftctl pull
|
||||||
|
|||||||
@@ -10,6 +10,10 @@ find_package(
|
|||||||
DBus
|
DBus
|
||||||
LinguistTools)
|
LinguistTools)
|
||||||
|
|
||||||
|
if (USE_WAYLAND_CLIPBOARD)
|
||||||
|
find_package(KF5GuiAddons)
|
||||||
|
endif()
|
||||||
|
|
||||||
set(CMAKE_AUTOMOC ON)
|
set(CMAKE_AUTOMOC ON)
|
||||||
set(CMAKE_AUTORCC ON)
|
set(CMAKE_AUTORCC ON)
|
||||||
set(CMAKE_AUTOUIC ON)
|
set(CMAKE_AUTOUIC ON)
|
||||||
@@ -190,8 +194,14 @@ target_link_libraries(
|
|||||||
Qt5::Widgets
|
Qt5::Widgets
|
||||||
${QTSINGLEAPPLICATION_LIBRARY}
|
${QTSINGLEAPPLICATION_LIBRARY}
|
||||||
QtColorWidgets
|
QtColorWidgets
|
||||||
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if (USE_WAYLAND_CLIPBOARD)
|
||||||
|
target_compile_definitions(flameshot PRIVATE USE_WAYLAND_CLIPBOARD=1)
|
||||||
|
target_link_libraries(flameshot KF5::GuiAddons)
|
||||||
|
endif()
|
||||||
|
|
||||||
if (APPLE)
|
if (APPLE)
|
||||||
set(MACOSX_BUNDLE_IDENTIFIER "org.flameshot")
|
set(MACOSX_BUNDLE_IDENTIFIER "org.flameshot")
|
||||||
set_target_properties(
|
set_target_properties(
|
||||||
|
|||||||
@@ -9,6 +9,11 @@
|
|||||||
#include "src/utils/filenamehandler.h"
|
#include "src/utils/filenamehandler.h"
|
||||||
#include "src/utils/globalvalues.h"
|
#include "src/utils/globalvalues.h"
|
||||||
#include "utils/desktopinfo.h"
|
#include "utils/desktopinfo.h"
|
||||||
|
|
||||||
|
#if USE_WAYLAND_CLIPBOARD
|
||||||
|
#include <KSystemClipboard>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QBuffer>
|
#include <QBuffer>
|
||||||
#include <QClipboard>
|
#include <QClipboard>
|
||||||
@@ -33,15 +38,26 @@ void ScreenshotSaver::saveToClipboardMime(const QPixmap& capture,
|
|||||||
QImageWriter imageWriter{ &buffer, imageType.toUpper().toUtf8() };
|
QImageWriter imageWriter{ &buffer, imageType.toUpper().toUtf8() };
|
||||||
imageWriter.write(capture.toImage());
|
imageWriter.write(capture.toImage());
|
||||||
|
|
||||||
QPixmap pngPixmap;
|
QPixmap formattedPixmap;
|
||||||
bool isLoaded =
|
bool isLoaded =
|
||||||
pngPixmap.loadFromData(reinterpret_cast<uchar*>(array.data()),
|
formattedPixmap.loadFromData(reinterpret_cast<uchar*>(array.data()),
|
||||||
array.size(),
|
array.size(),
|
||||||
imageType.toUpper().toUtf8());
|
imageType.toUpper().toUtf8());
|
||||||
if (isLoaded) {
|
if (isLoaded) {
|
||||||
QMimeData* mimeData = new QMimeData;
|
|
||||||
|
auto mimeData = new QMimeData();
|
||||||
|
|
||||||
|
#ifdef USE_WAYLAND_CLIPBOARD
|
||||||
|
mimeData->setImageData(formattedPixmap.toImage());
|
||||||
|
mimeData->setData(QStringLiteral("x-kde-force-image-copy"),
|
||||||
|
QByteArray());
|
||||||
|
KSystemClipboard::instance()->setMimeData(mimeData,
|
||||||
|
QClipboard::Clipboard);
|
||||||
|
#else
|
||||||
mimeData->setData("image/" + imageType, array);
|
mimeData->setData("image/" + imageType, array);
|
||||||
QApplication::clipboard()->setMimeData(mimeData);
|
QApplication::clipboard()->setMimeData(mimeData);
|
||||||
|
#endif
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
AbstractLogger::error()
|
AbstractLogger::error()
|
||||||
<< QObject::tr("Error while saving to clipboard");
|
<< QObject::tr("Error while saving to clipboard");
|
||||||
|
|||||||
Reference in New Issue
Block a user