File 0002-Fix-QFileDialog-not-remembering-the-last-v... of Package plasma5-integration

Overview Repositories Revisions Requests Users Attributes Meta

File 0002-Fix-QFileDialog-not-remembering-the-last-visited-dir.patch of Package plasma5-integration (Revision 92ffc8fd7e2853bcb075336f4c918e9e)

Currently displaying revision 92ffc8fd7e2853bcb075336f4c918e9e , Show latest

From 4848bec177b2527662098f97aa745bb839bc15e3 Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Sat, 31 Mar 2018 09:45:24 +0200
Subject: [PATCH 2/2] Fix QFileDialog not remembering the last visited
 directory.

Summary:
This regression (compared to kdelibs4's direct KFileDialog usage) came
from the fact that QFileDialog's lastVisited() only gets updated if
the helper emits directoryEntered.

So QFileDialog was setting the current dir as startDir every single
time, overriding's KFileWidget's own logic for reusing the last dir
initially.

Test Plan:
QFileDialog::getOpenFileName(this, i18n("Select file"));
twice in a row, from the same process.

Reviewers: anthonyfieroni, elvisangelaccio, plasma-devel, broulik, arichardson, ngraham

Reviewed By: ngraham

Subscribers: ngraham, apol

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D14437

(cherry picked from commit b269980db1d7201a0619f3f5c6606c96b8e59d7d)
---
 autotests/kfiledialog_unittest.cpp            | 31 +++++++++++++++++++
 .../kdeplatformfiledialoghelper.cpp           |  1 +
 2 files changed, 32 insertions(+)

diff --git a/autotests/kfiledialog_unittest.cpp b/autotests/kfiledialog_unittest.cpp
index fe86bef..de1dd66 100644
--- a/autotests/kfiledialog_unittest.cpp
+++ b/autotests/kfiledialog_unittest.cpp
@@ -347,6 +347,37 @@ private Q_SLOTS:
         QTRY_VERIFY(timerRun);
     }
 
+    void testRememberLastDirectory()
+    {
+        const QUrl dir = QUrl::fromLocalFile(QDir::tempPath()).adjusted(QUrl::StripTrailingSlash);
+        // Open and navigate
+        {
+            QFileDialog dialog;
+            dialog.open();
+
+            KFileWidget *fw = findFileWidget();
+            QVERIFY(fw);
+            // real show() is delayed to next event.
+            QVERIFY(QTest::qWaitForWindowExposed(fw->window()));
+            QCOMPARE(fw->isVisible(), true);
+            fw->setUrl(dir);
+            fw->slotCancel();
+        }
+        // Open another filedialog, check that the default directory is the one from above
+        {
+            QFileDialog dialog;
+            dialog.open();
+
+            KFileWidget *fw = findFileWidget();
+            QVERIFY(fw);
+            // real show() is delayed to next event.
+            QVERIFY(QTest::qWaitForWindowExposed(fw->window()));
+            QCOMPARE(fw->isVisible(), true);
+            QCOMPARE(dialog.directoryUrl().adjusted(QUrl::StripTrailingSlash), dir);
+            fw->slotCancel();
+        }
+    }
+
 private:
     QTemporaryDir m_tempDir;
 
diff --git a/src/platformtheme/kdeplatformfiledialoghelper.cpp b/src/platformtheme/kdeplatformfiledialoghelper.cpp
index b5c9cbc..2769b93 100644
--- a/src/platformtheme/kdeplatformfiledialoghelper.cpp
+++ b/src/platformtheme/kdeplatformfiledialoghelper.cpp
@@ -110,6 +110,7 @@ KDEPlatformFileDialog::KDEPlatformFileDialog()
     connect(m_fileWidget, SIGNAL(accepted()), m_fileWidget, SLOT(accept()));
     connect(m_fileWidget, SIGNAL(accepted()), SLOT(accept()));
     connect(m_fileWidget->cancelButton(), SIGNAL(clicked(bool)), SLOT(reject()));
+    connect(m_fileWidget->dirOperator(), &KDirOperator::urlEntered, this, &KDEPlatformFileDialogBase::directoryEntered);
     layout()->addWidget(m_buttons);
 }
 
-- 
2.18.0

Places

File 0002-Fix-QFileDialog-not-remembering-the-last-visited-dir.patch of Package plasma5-integration (Revision 92ffc8fd7e2853bcb075336f4c918e9e)

Places