diff options
| author | CyberLeo <cyberleo@cyberleo.net> | 2021-07-22 21:02:46 -0500 |
|---|---|---|
| committer | CyberLeo <cyberleo@cyberleo.net> | 2021-07-22 21:02:46 -0500 |
| commit | 59068642667b2748b2f24d18c58b1d2fdfed7619 (patch) | |
| tree | deca4d721637676253ed1270f252f8d389286151 /user/spectacle/no-wayland.patch | |
| parent | 4a177049e3d486da3f54d346d63ea80699c08b5b (diff) | |
| parent | 50e523c03bbcb6be1298e3dedb0441b7e47ab2eb (diff) | |
| download | packages-59068642667b2748b2f24d18c58b1d2fdfed7619.tar.gz packages-59068642667b2748b2f24d18c58b1d2fdfed7619.tar.bz2 packages-59068642667b2748b2f24d18c58b1d2fdfed7619.tar.xz packages-59068642667b2748b2f24d18c58b1d2fdfed7619.zip | |
Merge branch 'master' into kpartx
Diffstat (limited to 'user/spectacle/no-wayland.patch')
| -rw-r--r-- | user/spectacle/no-wayland.patch | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/user/spectacle/no-wayland.patch b/user/spectacle/no-wayland.patch index 50c7cc8b7..300c50b8d 100644 --- a/user/spectacle/no-wayland.patch +++ b/user/spectacle/no-wayland.patch @@ -119,17 +119,16 @@ index 7024750..40417bb 100644 #include <KWindowSystem> #include <QApplication> -@@ -54,8 +51,7 @@ SpectacleCore::SpectacleCore(StartMode theStartMode, - mPlatform(loadPlatform()), +@@ -46,7 +46,6 @@ + QObject(parent), mMainWindow(nullptr), - mIsGuiInited(false), -- mCopyToClipboard(theCopyToClipboard), +- mIsGuiInited(false), - mWaylandPlasmashell(nullptr) -+ mCopyToClipboard(theCopyToClipboard) ++ mIsGuiInited(false) { - auto lConfig = KSharedConfig::openConfig(QStringLiteral("spectaclerc")); - KConfigGroup lGuiConfig(lConfig, "GuiConfig"); -@@ -92,24 +88,6 @@ SpectacleCore::SpectacleCore(StartMode theStartMode, + } + +@@ -66,23 +65,6 @@ connect(lExportManager, &ExportManager::forceNotify, this, &SpectacleCore::doNotify); connect(mPlatform.get(), &Platform::windowTitleChanged, lExportManager, &ExportManager::setWindowTitle); @@ -150,10 +149,9 @@ index 7024750..40417bb 100644 - registry->setup(); - connection->roundtrip(); - } -- - switch (theStartMode) { - case StartMode::DBus: - break; + setUpShortcuts(); + } + @@ -245,7 +223,7 @@ void SpectacleCore::screenshotUpdated(const QPixmap &thePixmap) if (lExportManager->captureMode() == Spectacle::CaptureMode::RectangularRegion) { |