diff --git a/src/Gui/SettingsDialog/GeneralOptionsPage.h b/src/Gui/SettingsDialog/GeneralOptionsPage.h --- a/src/Gui/SettingsDialog/GeneralOptionsPage.h +++ b/src/Gui/SettingsDialog/GeneralOptionsPage.h @@ -45,9 +45,10 @@ private: - QButtonGroup* mPrintKeyActionGroup; - QRadioButton* mRememberAlways; - QRadioButton* mRememberUntilClosed; + QButtonGroup *mPrintKeyActionGroup; + QRadioButton *mRememberAlways; + QRadioButton *mRememberUntilClosed; + QButtonGroup *mCopyToClipboardGroup; QCheckBox *mUseLightBackground; QCheckBox *mShowMagnifier; QCheckBox *mReleaseToCapture; diff --git a/src/Gui/SettingsDialog/GeneralOptionsPage.cpp b/src/Gui/SettingsDialog/GeneralOptionsPage.cpp --- a/src/Gui/SettingsDialog/GeneralOptionsPage.cpp +++ b/src/Gui/SettingsDialog/GeneralOptionsPage.cpp @@ -57,6 +57,20 @@ mainLayout->addRow(QString(), focusWindow); } + mainLayout->addItem(new QSpacerItem(0, 18, QSizePolicy::Fixed, QSizePolicy::Fixed)); + + // copy file or file location to clipboard after taking a screenshot + QRadioButton *nothingToCopy = new QRadioButton(i18n("Do nothing"), this); + QRadioButton *copyImageToClipboard = new QRadioButton(i18n("Copy image to clipboard"), this); + mCopyToClipboardGroup = new QButtonGroup(this); + mCopyToClipboardGroup->setExclusive(true); + mCopyToClipboardGroup->addButton(nothingToCopy, SpectacleConfig::CopyImageToClipboardSetting::DoNotChangeClipboard); + mCopyToClipboardGroup->addButton(copyImageToClipboard, SpectacleConfig::CopyImageToClipboardSetting::CopyImageToClipboard); + //mNothingToCopy->setChecked(true); + connect(mCopyToClipboardGroup, qOverload(&QButtonGroup::buttonToggled), this, &GeneralOptionsPage::markDirty); + mainLayout->addRow(i18n("After taking a screenshot:"), nothingToCopy); + mainLayout->addRow(QString(), copyImageToClipboard); + // Rectangular Region settings KTitleWidget *titleWidget = new KTitleWidget(this); titleWidget->setText(i18n("Rectangular Region")); @@ -114,6 +128,7 @@ cfgManager->setShowMagnifierChecked(mShowMagnifier->checkState() == Qt::Checked); cfgManager->setUseReleaseToCaptureChecked(mReleaseToCapture->checkState() == Qt::Checked); cfgManager->setPrintKeyActionRunning(static_cast(mPrintKeyActionGroup->checkedId())); + cfgManager->setCopyImageToClipboardSetting(static_cast(mCopyToClipboardGroup->checkedId())); mChangesMade = false; } @@ -128,6 +143,7 @@ mShowMagnifier->setChecked(cfgManager->showMagnifierChecked()); mReleaseToCapture->setChecked(cfgManager->useReleaseToCapture()); mPrintKeyActionGroup->button(cfgManager->printKeyActionRunning())->setChecked(true); + mCopyToClipboardGroup->button(cfgManager->copyImageToClipboardSetting())->setChecked(true); mChangesMade = false; } diff --git a/src/Gui/SettingsDialog/SaveOptionsPage.cpp b/src/Gui/SettingsDialog/SaveOptionsPage.cpp --- a/src/Gui/SettingsDialog/SaveOptionsPage.cpp +++ b/src/Gui/SettingsDialog/SaveOptionsPage.cpp @@ -46,12 +46,11 @@ connect(mUrlRequester, &KUrlRequester::textChanged, this, &SaveOptionsPage::markDirty); mainLayout->addRow(i18n("Save Location:"), mUrlRequester); - // copy file location to clipboard after saving + // copy file location to clipboard after saving mCopyPathToClipboard = new QCheckBox(i18n("Copy file location to clipboard after saving"), this); connect(mCopyPathToClipboard, &QCheckBox::toggled, this, &SaveOptionsPage::markDirty); mainLayout->addRow(QString(), mCopyPathToClipboard); - mainLayout->addItem(new QSpacerItem(0, 18, QSizePolicy::Fixed, QSizePolicy::Fixed)); // Compression quality slider and current value display diff --git a/src/SpectacleConfig.h b/src/SpectacleConfig.h --- a/src/SpectacleConfig.h +++ b/src/SpectacleConfig.h @@ -49,12 +49,17 @@ QUrl lastSaveAsLocation() const; QUrl lastSaveLocation() const; - enum PrintKeyActionRunning : int { + enum PrintKeyActionRunning : int { TakeNewScreenshot = 0, StartNewInstance, FocusWindow }; + enum CopyImageToClipboardSetting : int { + DoNotChangeClipboard = 0, + CopyImageToClipboard + }; + KActionCollection* shortCutActions; private: @@ -126,6 +131,9 @@ QUrl defaultSaveLocation() const; void setDefaultSaveLocation(const QUrl &location); + CopyImageToClipboardSetting copyImageToClipboardSetting() const; + void setCopyImageToClipboardSetting(CopyImageToClipboardSetting enabled); + bool copySaveLocationToClipboard() const; void setCopySaveLocationToClipboard(bool enabled); diff --git a/src/SpectacleConfig.cpp b/src/SpectacleConfig.cpp --- a/src/SpectacleConfig.cpp +++ b/src/SpectacleConfig.cpp @@ -358,6 +358,26 @@ mGeneralConfig.sync(); } +// copy file to clipboard after the screenshot has been made + +SpectacleConfig::CopyImageToClipboardSetting SpectacleConfig::copyImageToClipboardSetting() const +{ + mConfig->reparseConfiguration(); + int clipboardAction = static_cast(SpectacleConfig::CopyImageToClipboardSetting::DoNotChangeClipboard); + int readValue = mGuiConfig.readEntry(QStringLiteral("copyImageToClipboard"), clipboardAction); + if ((KWindowSystem::isPlatformWayland() || qstrcmp(qgetenv("XDG_SESSION_TYPE"), "wayland") == 0 ) + && readValue == SpectacleConfig::CopyImageToClipboardSetting::CopyImageToClipboard) { + return SpectacleConfig::CopyImageToClipboardSetting::DoNotChangeClipboard; + } + return static_cast(readValue); +} + +void SpectacleConfig::setCopyImageToClipboardSetting (SpectacleConfig::CopyImageToClipboardSetting action) +{ + mGuiConfig.writeEntry(QStringLiteral("copyImageToClipboard"), static_cast(action)); + mGuiConfig.sync(); +} + // copy file location to clipboard after saving bool SpectacleConfig::copySaveLocationToClipboard() const diff --git a/src/SpectacleCore.h b/src/SpectacleCore.h --- a/src/SpectacleCore.h +++ b/src/SpectacleCore.h @@ -90,5 +90,6 @@ MainWindowPtr mMainWindow; EditorPtr mQuickEditor; bool mIsGuiInited; - bool mCopyToClipboard; + bool mCopySaveLocationToClipboard; + bool mCopyImageToClipboard; }; diff --git a/src/SpectacleCore.cpp b/src/SpectacleCore.cpp --- a/src/SpectacleCore.cpp +++ b/src/SpectacleCore.cpp @@ -51,7 +51,8 @@ mPlatform(loadPlatform()), mMainWindow(nullptr), mIsGuiInited(false), - mCopyToClipboard(theCopyToClipboard) + mCopySaveLocationToClipboard(theCopyToClipboard), + mCopyImageToClipboard(false) { auto lConfig = KSharedConfig::openConfig(QStringLiteral("spectaclerc")); KConfigGroup lGuiConfig(lConfig, "GuiConfig"); @@ -245,7 +246,7 @@ connect(lExportManager, &ExportManager::imageSaved, this, &SpectacleCore::doNotify); } - if (mCopyToClipboard) { + if (mCopySaveLocationToClipboard) { lExportManager->doCopyToClipboard(mNotify); } else { QUrl lSavePath = (mStartMode == StartMode::Background && mFileNameUrl.isValid() && mFileNameUrl.isLocalFile()) ? @@ -262,6 +263,18 @@ break; case StartMode::Gui: mMainWindow->setScreenshotAndShow(thePixmap); + + mCopyImageToClipboard = (SpectacleConfig::instance()->copyImageToClipboardSetting() == 1); + using Actions = SpectacleConfig::CopyImageToClipboardSetting; + switch (SpectacleConfig::instance()->copyImageToClipboardSetting()) { + case Actions::DoNotChangeClipboard: + break; + case Actions::CopyImageToClipboard: + { + lExportManager->doCopyToClipboard(false); + } + break; + } } } @@ -313,15 +326,15 @@ // a speaking message is prettier than a URL, special case for copy to clipboard and the default pictures location const QString &lSavePath = theSavedAt.adjusted(QUrl::RemoveFilename | QUrl::StripTrailingSlash).path(); - if (mCopyToClipboard) { + if (mCopySaveLocationToClipboard || mCopyImageToClipboard) { lNotify->setText(i18n("A screenshot was saved to your clipboard.")); } else if (lSavePath == QStandardPaths::writableLocation(QStandardPaths::PicturesLocation)) { lNotify->setText(i18nc("Placeholder is filename", "A screenshot was saved as '%1' to your Pictures folder.", theSavedAt.fileName())); } else { lNotify->setText(i18n("A screenshot was saved as '%1' to '%2'.", theSavedAt.fileName(), lSavePath)); } - if (!mCopyToClipboard) { + if (!mCopySaveLocationToClipboard && !mCopyImageToClipboard) { lNotify->setUrls({theSavedAt}); lNotify->setDefaultAction(i18nc("Open the screenshot we just saved", "Open")); connect(lNotify, QOverload::of(&KNotification::activated), this, [this, theSavedAt](uint index) {