Index: src/Gui/SettingsDialog/GeneralOptionsPage.h =================================================================== --- src/Gui/SettingsDialog/GeneralOptionsPage.h +++ src/Gui/SettingsDialog/GeneralOptionsPage.h @@ -45,7 +45,6 @@ QCheckBox *mRememberRect; QCheckBox *mUseLightBackground; - QCheckBox *mCopyPathToClipboard; QCheckBox *mShowMagnifier; }; Index: src/Gui/SettingsDialog/GeneralOptionsPage.cpp =================================================================== --- src/Gui/SettingsDialog/GeneralOptionsPage.cpp +++ src/Gui/SettingsDialog/GeneralOptionsPage.cpp @@ -34,12 +34,6 @@ QVBoxLayout *mainLayout = new QVBoxLayout(this); - // copy file location to clipboard after saving - - mCopyPathToClipboard = new QCheckBox(i18n("Copy file location to clipboard after saving"), this); - connect(mCopyPathToClipboard, &QCheckBox::toggled, this, &GeneralOptionsPage::markDirty); - mainLayout->addWidget(mCopyPathToClipboard, 1); - // Rectangular Region settings QGroupBox *rrGroup = new QGroupBox(i18n("Rectangular Region")); @@ -93,7 +87,6 @@ cfgManager->setUseLightRegionMaskColour(mUseLightBackground->checkState() == Qt::Checked); cfgManager->setRememberLastRectangularRegion(mRememberRect->checkState() == Qt::Checked); cfgManager->setShowMagnifierChecked(mShowMagnifier->checkState() == Qt::Checked); - cfgManager->setCopySaveLocationToClipboard(mCopyPathToClipboard->checkState() == Qt::Checked); mChangesMade = false; } @@ -105,7 +98,6 @@ mUseLightBackground->setChecked(cfgManager->useLightRegionMaskColour()); mRememberRect->setChecked(cfgManager->rememberLastRectangularRegion()); mShowMagnifier->setChecked(cfgManager->showMagnifierChecked()); - mCopyPathToClipboard->setChecked(cfgManager->copySaveLocationToClipboard()); mChangesMade = false; } Index: src/Gui/SettingsDialog/SaveOptionsPage.h =================================================================== --- src/Gui/SettingsDialog/SaveOptionsPage.h +++ src/Gui/SettingsDialog/SaveOptionsPage.h @@ -26,6 +26,7 @@ class QLineEdit; class QComboBox; class KUrlRequester; +class QCheckBox; class SaveOptionsPage : public SettingsPage { @@ -42,7 +43,7 @@ private slots: - void markDirty(const QString &text); + void markDirty(); private: @@ -50,6 +51,8 @@ QLineEdit *mSaveNameFormat; KUrlRequester *mUrlRequester; QComboBox *mSaveImageFormat; + QCheckBox *mCopyPathToClipboard; + }; #endif // SAVEOPTIONSPAGE_H Index: src/Gui/SettingsDialog/SaveOptionsPage.cpp =================================================================== --- src/Gui/SettingsDialog/SaveOptionsPage.cpp +++ src/Gui/SettingsDialog/SaveOptionsPage.cpp @@ -30,6 +30,7 @@ #include #include #include +#include SaveOptionsPage::SaveOptionsPage(QWidget *parent) : SettingsPage(parent) @@ -50,6 +51,12 @@ dirLayout->addLayout(urlRequesterLayout); + // 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); + dirLayout->addWidget(mCopyPathToClipboard, 1); + // filename chooser text field QGroupBox *fmtGroup = new QGroupBox(i18n("Default Save Filename")); @@ -133,9 +140,8 @@ setLayout(mainLayout); } -void SaveOptionsPage::markDirty(const QString &text) +void SaveOptionsPage::markDirty() { - Q_UNUSED(text); mChangesMade = true; } @@ -150,6 +156,7 @@ cfgManager->setAutoSaveLocation(mUrlRequester->url().toDisplayString(QUrl::PreferLocalFile)); cfgManager->setAutoSaveFilenameFormat(mSaveNameFormat->text()); cfgManager->setSaveImageFormat(mSaveImageFormat->currentText().toLower()); + cfgManager->setCopySaveLocationToClipboard(mCopyPathToClipboard->checkState() == Qt::Checked); // done @@ -166,6 +173,7 @@ mSaveNameFormat->setText(cfgManager->autoSaveFilenameFormat()); mUrlRequester->setUrl(QUrl::fromUserInput(cfgManager->autoSaveLocation())); + mCopyPathToClipboard->setChecked(cfgManager->copySaveLocationToClipboard()); // read in the save image format and calculate its index