From be730cf29cc554bb9b59ac1102bb63e2d2997fe3 Mon Sep 17 00:00:00 2001 From: Jeremy Borgman Date: Mon, 15 Feb 2021 19:56:15 -0600 Subject: [PATCH] Fixed bug related to save path --- src/config/geneneralconf.cpp | 6 +++--- src/utils/confighandler.cpp | 10 ---------- src/utils/confighandler.h | 3 --- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/src/config/geneneralconf.cpp b/src/config/geneneralconf.cpp index e9d6a18d..9d06def2 100644 --- a/src/config/geneneralconf.cpp +++ b/src/config/geneneralconf.cpp @@ -57,10 +57,10 @@ void GeneneralConf::updateComponents() m_saveAfterCopy->setChecked(config.saveAfterCopyValue()); m_useJpgForClipboard->setChecked(config.useJpgForClipboard()); - if (!config.saveAfterCopyPathValue().isEmpty()) { - m_savePath->setText(config.saveAfterCopyPathValue()); + if (!config.savePath().isEmpty()) { + m_savePath->setText(config.savePath()); } else { - ConfigHandler().setSaveAfterCopyPath( + ConfigHandler().setSavePath( QStandardPaths::writableLocation(QStandardPaths::PicturesLocation)); } #if defined(Q_OS_LINUX) || defined(Q_OS_UNIX) diff --git a/src/utils/confighandler.cpp b/src/utils/confighandler.cpp index 1c0a6b92..33cfd8bb 100644 --- a/src/utils/confighandler.cpp +++ b/src/utils/confighandler.cpp @@ -444,16 +444,6 @@ void ConfigHandler::setUseJpgForClipboard(const bool value) m_settings.setValue(QStringLiteral("useJpgForClipboard"), value); } -QString ConfigHandler::saveAfterCopyPathValue() -{ - return m_settings.value(QStringLiteral("saveAfterCopyPath")).toString(); -} - -void ConfigHandler::setSaveAfterCopyPath(const QString& path) -{ - m_settings.setValue(QStringLiteral("saveAfterCopyPath"), path); -} - void ConfigHandler::setDefaults() { m_settings.clear(); diff --git a/src/utils/confighandler.h b/src/utils/confighandler.h index e39de691..2e9080b0 100644 --- a/src/utils/confighandler.h +++ b/src/utils/confighandler.h @@ -80,9 +80,6 @@ public: bool saveAfterCopyValue(); void setSaveAfterCopy(const bool); - QString saveAfterCopyPathValue(); - void setSaveAfterCopyPath(const QString&); - bool copyPathAfterSaveEnabled(); void setCopyPathAfterSaveEnabled(const bool);