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,13 @@ private: - QButtonGroup* mPrintKeyActionGroup; - QRadioButton* mRememberAlways; - QRadioButton* mRememberUntilClosed; + QButtonGroup *mPrintKeyActionGroup; + QRadioButton *mRememberAlways; + QRadioButton *mRememberUntilClosed; + QButtonGroup *mCopyToClipboardGroup; + QRadioButton *mNothingToCopy; + QRadioButton *mCopySaveLocationToClipboard; + QRadioButton *mCopyImageToClipboard; 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,23 @@ 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 + mCopyToClipboardGroup = new QButtonGroup(this); + mCopyToClipboardGroup->setExclusive(true); + mNothingToCopy = new QRadioButton(i18n("Don't change the clipboard content"), this); + mCopyImageToClipboard = new QRadioButton(i18n("Copy image to clipboard"), this); + mCopySaveLocationToClipboard = new QRadioButton(i18n("Copy file location to clipboard after saving"), this); + mCopyToClipboardGroup->addButton(mNothingToCopy); + mCopyToClipboardGroup->addButton(mCopySaveLocationToClipboard); + mCopyToClipboardGroup->addButton(mCopyImageToClipboard); + mNothingToCopy->setChecked(true); + connect(mCopyToClipboardGroup, qOverload(&QButtonGroup::buttonToggled), this, &GeneralOptionsPage::markDirty); + mainLayout->addRow(i18n("After taking screenshot:"), mNothingToCopy); + mainLayout->addRow(QString(), mCopySaveLocationToClipboard); + mainLayout->addRow(QString(), mCopyImageToClipboard); + // Rectangular Region settings KTitleWidget *titleWidget = new KTitleWidget(this); titleWidget->setText(i18n("Rectangular Region")); @@ -114,6 +131,8 @@ cfgManager->setShowMagnifierChecked(mShowMagnifier->checkState() == Qt::Checked); cfgManager->setUseReleaseToCaptureChecked(mReleaseToCapture->checkState() == Qt::Checked); cfgManager->setPrintKeyActionRunning(static_cast(mPrintKeyActionGroup->checkedId())); + cfgManager->setCopySaveLocationToClipboard(mCopySaveLocationToClipboard->isChecked()); + cfgManager->setCopyImageToClipboard(mCopyImageToClipboard->isChecked()); mChangesMade = false; } @@ -128,6 +147,8 @@ mShowMagnifier->setChecked(cfgManager->showMagnifierChecked()); mReleaseToCapture->setChecked(cfgManager->useReleaseToCapture()); mPrintKeyActionGroup->button(cfgManager->printKeyActionRunning())->setChecked(true); + mCopySaveLocationToClipboard->setChecked(cfgManager->copySaveLocationToClipboard()); + mCopyImageToClipboard->setChecked(cfgManager->copyImageToClipboard()); mChangesMade = false; } diff --git a/src/Gui/SettingsDialog/SaveOptionsPage.h b/src/Gui/SettingsDialog/SaveOptionsPage.h --- a/src/Gui/SettingsDialog/SaveOptionsPage.h +++ b/src/Gui/SettingsDialog/SaveOptionsPage.h @@ -53,7 +53,6 @@ QLineEdit *mSaveNameFormat; KUrlRequester *mUrlRequester; QComboBox *mSaveImageFormat; - QCheckBox *mCopyPathToClipboard; QSlider *mQualitySlider; QLabel *mPreviewLabel; }; 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,6 @@ connect(mUrlRequester, &KUrlRequester::textChanged, this, &SaveOptionsPage::markDirty); mainLayout->addRow(i18n("Save Location:"), mUrlRequester); - // 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 @@ -167,7 +161,6 @@ cfgManager->setDefaultSaveLocation(mUrlRequester->url()); cfgManager->setAutoSaveFilenameFormat(mSaveNameFormat->text()); cfgManager->setSaveImageFormat(mSaveImageFormat->currentText().toLower()); - cfgManager->setCopySaveLocationToClipboard(mCopyPathToClipboard->checkState() == Qt::Checked); cfgManager->setCompressionQuality(mQualitySlider->value()); // done @@ -185,7 +178,6 @@ mSaveNameFormat->setText(cfgManager->autoSaveFilenameFormat()); mUrlRequester->setUrl(cfgManager->defaultSaveLocation()); - mCopyPathToClipboard->setChecked(cfgManager->copySaveLocationToClipboard()); mQualitySlider->setSliderPosition(cfgManager->compressionQuality()); // read in the save image format and calculate its index 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 copyImageToClipboard() const; + void setCopyImageToClipboard(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::copyImageToClipboard() const +{ + return mGeneralConfig.readEntry(QStringLiteral("copyImageToClipboard"), false); +} + +void SpectacleConfig::setCopyImageToClipboard(bool enabled) +{ + mGeneralConfig.writeEntry(QStringLiteral("copyImageToClipboard"), enabled); + mGeneralConfig.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,10 @@ break; case StartMode::Gui: mMainWindow->setScreenshotAndShow(thePixmap); + mCopyImageToClipboard = SpectacleConfig::instance()->copyImageToClipboard(); + if (mCopyImageToClipboard) { + lExportManager->doCopyToClipboard(true); + } } } @@ -313,26 +318,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 (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) { 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(); }