Fixed file dialog start location

It was using Session.activeFile, which only gets updated when switching the session. In addition, since recent files now only get added when closing files, the file dialog would repeatedly open in the user's HOME folder, which is just annoying.
jack416 · Jun 25, 2020 · 8b8a7ee · 8b8a7ee
1 parent 8376b44
commit 8b8a7ee
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 16 deletions.
diff --git a/src/tiled/documentmanager.cpp b/src/tiled/documentmanager.cpp
@@ -38,6 +38,7 @@
 #include "mapview.h"
 #include "noeditorwidget.h"
 #include "preferences.h"
+#include "projectmanager.h"
 #include "session.h"
 #include "tabbar.h"
 #include "terrain.h"
@@ -61,6 +62,7 @@
 #include <QMessageBox>
 #include <QScrollBar>
 #include <QStackedLayout>
+#include <QStandardPaths>
 #include <QTabBar>
 #include <QTabWidget>
 #include <QUndoGroup>
@@ -714,7 +716,7 @@ bool DocumentManager::saveDocumentAs(Document *document)
 
     auto getSaveFileName = [&](const QString &filter, const QString &defaultFileName) {
         if (fileName.isEmpty()) {
-            fileName = Preferences::instance()->fileDialogStartLocation();
+            fileName = fileDialogStartLocation();
             fileName += QLatin1Char('/');
             fileName += defaultFileName;
             fileName += Utils::firstExtension(selectedFilter);
@@ -1270,6 +1272,30 @@ bool DocumentManager::isWorldModified(const QString &fileName) const
     return false;
 }
 
+/**
+ * Returns a logical start location for a file dialog to open a file, based on
+ * the currently selected file, a recent file, the project path or finally, the
+ * home location.
+ */
+QString DocumentManager::fileDialogStartLocation() const
+{
+    if (auto doc = currentDocument()) {
+        QString path = QFileInfo(doc->fileName()).path();
+        if (!path.isEmpty())
+            return path;
+    }
+
+    const auto &session = Session::current();
+    if (!session.recentFiles.isEmpty())
+        return QFileInfo(session.recentFiles.first()).path();
+
+    const auto &project = ProjectManager::instance()->project();
+    if (!project.fileName().isEmpty())
+        return QFileInfo(project.fileName()).path();
+
+    return QStandardPaths::writableLocation(QStandardPaths::HomeLocation);
+}
+
 void DocumentManager::onWorldUnloaded(const QString &worldFile)
 {
     delete mWorldDocuments.take(worldFile);

diff --git a/src/tiled/documentmanager.h b/src/tiled/documentmanager.h
@@ -140,6 +140,8 @@ class DocumentManager : public QObject
     bool isAnyWorldModified() const;
     bool isWorldModified(const QString &fileName) const;
 
+    QString fileDialogStartLocation() const;
+
 signals:
     void documentCreated(Document *document);
     void documentOpened(Document *document);

diff --git a/src/tiled/mainwindow.cpp b/src/tiled/mainwindow.cpp
@@ -1048,9 +1048,8 @@ void MainWindow::openFileDialog()
 
     FormatHelper<FileFormat> helper(FileFormat::Read, allFilesFilter);
 
-    auto preferences = Preferences::instance();
     const auto fileNames = QFileDialog::getOpenFileNames(this, tr("Open File"),
-                                                         preferences->fileDialogStartLocation(),
+                                                         mDocumentManager->fileDialogStartLocation(),
                                                          helper.filter(),
                                                          &selectedFilter);
     if (fileNames.isEmpty())

diff --git a/src/tiled/preferences.cpp b/src/tiled/preferences.cpp
@@ -570,18 +570,6 @@ void Preferences::setDonationDialogReminder(const QDate &date)
     setValue(QLatin1String("Install/DonationDialogTime"), date.toString(Qt::ISODate));
 }
 
-QString Preferences::fileDialogStartLocation() const
-{
-    const auto &session = Session::current();
-    if (!session.activeFile.isEmpty())
-        return QFileInfo(session.activeFile).path();
-
-    if (!session.recentFiles.isEmpty())
-        return QFileInfo(session.recentFiles.first()).path();
-
-    return QStandardPaths::writableLocation(QStandardPaths::HomeLocation);
-}
-
 /**
  * Adds the given file to the recent files list.
  */

diff --git a/src/tiled/preferences.h b/src/tiled/preferences.h
@@ -158,7 +158,6 @@ class Preferences : public QSettings
     void setDonationDialogReminder(const QDate &date);
 
     enum { MaxRecentFiles = 12 };
-    QString fileDialogStartLocation() const;
     void addRecentFile(const QString &fileName);
 
     QStringList recentProjects() const;