Merge pull request #1188 from keepassxreboot/feature/forget-last-path

Forget keyfile path by honoring settings

src/gui/DatabaseOpenWidget.cpp

@@ -277,6 +277,9 @@ void DatabaseOpenWidget::activateChallengeResponse()
 void DatabaseOpenWidget::browseKeyFile()
 {
     QString filters = QString("%1 (*);;%2 (*.key)").arg(tr("All files"), tr("Key files"));
+    if (!config()->get("RememberLastKeyFiles").toBool()) {
+        fileDialog()->setNextForgetDialog();
+    }
     QString filename = fileDialog()->getOpenFileName(this, tr("Select key file"), QString(), filters);
 
     if (!filename.isEmpty()) {

src/gui/FileDialog.cpp

@@ -43,10 +43,7 @@ QString FileDialog::getOpenFileName(QWidget* parent, const QString& caption, QSt
             parent->activateWindow();
         }
 
-        if (!result.isEmpty()) {
+        saveLastDir(result);
-            config()->set("LastDir", QFileInfo(result).absolutePath());
-        }
-
         return result;
     }
 }
@@ -74,9 +71,8 @@ QStringList FileDialog::getOpenFileNames(QWidget *parent, const QString &caption
         }
 
         if (!results.isEmpty()) {
-            config()->set("LastDir", QFileInfo(results[0]).absolutePath());
+            saveLastDir(results[0]);
         }
-
         return results;
     }
 }
@@ -125,10 +121,7 @@ QString FileDialog::getSaveFileName(QWidget* parent, const QString& caption, QSt
             parent->activateWindow();
         }
 
-        if (!result.isEmpty()) {
+        saveLastDir(result);
-            config()->set("LastDir", QFileInfo(result).absolutePath());
-        }
-
         return result;
     }
 }
@@ -153,10 +146,7 @@ QString FileDialog::getExistingDirectory(QWidget *parent, const QString &caption
             parent->activateWindow();
         }
 
-        if (!dir.isEmpty()) {
+        saveLastDir(dir);
-            config()->set("LastDir", QFileInfo(dir).absolutePath());
-        }
-
         return dir;
     }
 }
@@ -176,10 +166,23 @@ void FileDialog::setNextDirName(const QString &dirName)
     m_nextDirName = dirName;
 }
 
+void FileDialog::setNextForgetDialog()
+{
+    m_forgetLastDir = true;
+}
+
 FileDialog::FileDialog()
 {
 }
 
+void FileDialog::saveLastDir(QString dir) {
+    if (!dir.isEmpty() && !m_forgetLastDir) {
+        config()->set("LastDir", QFileInfo(dir).absolutePath());
+    }
+
+    m_forgetLastDir = false;
+}
+
 FileDialog* FileDialog::instance()
 {
     if (!m_instance) {

src/gui/FileDialog.h

@@ -36,6 +36,7 @@ public:
     QString getExistingDirectory(QWidget* parent = nullptr, const QString& caption = QString(),
                                  QString dir = QString(), QFileDialog::Options options = QFileDialog::ShowDirsOnly);
 
+    void setNextForgetDialog();
     /**
      * Sets the result of the next get* method call.
      * Use only for testing.
@@ -51,6 +52,9 @@ private:
     QString m_nextFileName;
     QStringList m_nextFileNames;
     QString m_nextDirName;
+    bool m_forgetLastDir = false;
+
+    void saveLastDir(QString);
 
     static FileDialog* m_instance;
 

src/gui/SettingsWidget.cpp

@@ -241,6 +241,7 @@ void SettingsWidget::saveSettings()
 
     if (!config()->get("RememberLastKeyFiles").toBool()) {
         config()->set("LastKeyFiles", QVariant());
+        config()->set("LastDir", "");
     }
 
     for (const ExtraPage& page: asConst(m_extraPages)) {