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 @@ -51,6 +51,7 @@ QCheckBox *mUseLightBackground; QCheckBox *mShowMagnifier; QCheckBox *mReleaseToCapture; + QCheckBox *mCopyFileToClipboard; }; #endif // GENERALOPTIONSPAGE_H 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 @@ -56,6 +56,10 @@ mPrintKeyActionGroup->addButton( focusWindow, SpectacleConfig::PrintKeyActionRunning::FocusWindow); mainLayout->addRow(QString(), focusWindow); } + // copy file to clipboard after taking a screenshot + mCopyFileToClipboard = new QCheckBox(i18n("Copy file to clipboard after taking a screenshot"), this); + connect(mCopyFileToClipboard, &QCheckBox::toggled, this, &GeneralOptionsPage::markDirty); + mainLayout->addRow(QString(), mCopyFileToClipboard); // Rectangular Region settings KTitleWidget *titleWidget = new KTitleWidget(this); @@ -114,6 +118,7 @@ cfgManager->setShowMagnifierChecked(mShowMagnifier->checkState() == Qt::Checked); cfgManager->setUseReleaseToCaptureChecked(mReleaseToCapture->checkState() == Qt::Checked); cfgManager->setPrintKeyActionRunning(static_cast(mPrintKeyActionGroup->checkedId())); + cfgManager->setCopyFileToClipboard(mCopyFileToClipboard->checkState() == Qt::Checked); mChangesMade = false; } @@ -128,6 +133,7 @@ mShowMagnifier->setChecked(cfgManager->showMagnifierChecked()); mReleaseToCapture->setChecked(cfgManager->useReleaseToCapture()); mPrintKeyActionGroup->button(cfgManager->printKeyActionRunning())->setChecked(true); + mCopyFileToClipboard->setChecked(cfgManager->copyFileToClipboard()); mChangesMade = false; } diff --git a/src/SpectacleConfig.h b/src/SpectacleConfig.h --- a/src/SpectacleConfig.h +++ b/src/SpectacleConfig.h @@ -126,6 +126,9 @@ QUrl defaultSaveLocation() const; void setDefaultSaveLocation(const QUrl &location); + bool copyFileToClipboard() const; + void setCopyFileToClipboard(bool 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,19 @@ mGeneralConfig.sync(); } +// copy file to clipboard after the screenshot has been made + +bool SpectacleConfig::copyFileToClipboard() const +{ + return mGeneralConfig.readEntry(QStringLiteral("copyFileToClipboard"), false); +} + +void SpectacleConfig::setCopyFileToClipboard(bool enabled) +{ + mGeneralConfig.writeEntry(QStringLiteral("copyFileToClipboard"), enabled); + mGeneralConfig.sync(); +} + // copy file location to clipboard after saving bool SpectacleConfig::copySaveLocationToClipboard() const diff --git a/src/SpectacleCore.cpp b/src/SpectacleCore.cpp --- a/src/SpectacleCore.cpp +++ b/src/SpectacleCore.cpp @@ -262,6 +262,9 @@ break; case StartMode::Gui: mMainWindow->setScreenshotAndShow(thePixmap); + if (SpectacleConfig::instance()->copyFileToClipboard()) { + lExportManager->doCopyToClipboard(true); + } } } @@ -313,26 +316,26 @@ // 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 (mCopyToClipboard || SpectacleConfig::instance()->copyFileToClipboard()) { 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 (!mCopyToClipboard && !SpectacleConfig::instance()->copyFileToClipboard()) { lNotify->setUrls({theSavedAt}); lNotify->setDefaultAction(i18nc("Open the screenshot we just saved", "Open")); connect(lNotify, QOverload::of(&KNotification::activated), this, [this, theSavedAt](uint index) { if (index == 0) { new KRun(theSavedAt, nullptr); QTimer::singleShot(250, this, &SpectacleCore::allDone); } }); + connect(lNotify, &QObject::destroyed, this, &SpectacleCore::allDone); } - connect(lNotify, &QObject::destroyed, this, &SpectacleCore::allDone); lNotify->sendEvent(); }