Merge pull request #621 from GriffinRichards/file-dialogs

Correctly restore window focus for file dialogs

include/core/filedialog.h

@@ -0,0 +1,65 @@
+#ifndef FILEDIALOG_H
+#define FILEDIALOG_H
+
+#include <QFileDialog>
+
+/*
+    Static QFileDialog functions will (unless otherwise specified) use native file dialogs.
+    In general this is good (we want our file dialogs to be visually seamless) but unfortunately
+    the native file dialogs ignore the parent widget, so in some cases they'll return focus to
+    the main window rather than the window that opened the file dialog.
+
+    To make working around this a little easier we use this class, which will use the native
+    file dialog and manually return focus to the parent widget.
+
+    It will also save the directory of the previous file selected in a file dialog, and if
+    no 'dir' argument is specified it will open new dialogs at that directory.
+
+*/
+
+class FileDialog : public QFileDialog
+{
+public:
+    FileDialog(QWidget *parent, Qt::WindowFlags flags) : QFileDialog(parent, flags) {};
+    FileDialog(QWidget *parent = nullptr,
+               const QString &caption = QString(),
+               const QString &directory = QString(),
+               const QString &filter = QString()) : QFileDialog(parent, caption, directory, filter) {};
+
+    static void setDirectory(const QString &dir) { FileDialog::prevDirectory = dir; }
+    static QString getDirectory() { return FileDialog::prevDirectory; }
+
+    static QString getOpenFileName(QWidget *parent = nullptr,
+                                   const QString &caption = QString(),
+                                   const QString &dir = QString(),
+                                   const QString &filter = QString(),
+                                   QString *selectedFilter = nullptr,
+                                   QFileDialog::Options options = Options());
+
+    static QStringList getOpenFileNames(QWidget *parent = nullptr,
+                                        const QString &caption = QString(),
+                                        const QString &dir = QString(),
+                                        const QString &filter = QString(),
+                                        QString *selectedFilter = nullptr,
+                                        QFileDialog::Options options = Options());
+
+    static QString getExistingDirectory(QWidget *parent = nullptr,
+                                        const QString &caption = QString(),
+                                        const QString &dir = QString(),
+                                        QFileDialog::Options options = ShowDirsOnly);
+
+    static QString getSaveFileName(QWidget *parent = nullptr,
+                                   const QString &caption = QString(),
+                                   const QString &dir = QString(),
+                                   const QString &filter = QString(),
+                                   QString *selectedFilter = nullptr,
+                                   QFileDialog::Options options = Options());
+
+private:
+    static QString prevDirectory;
+    static QString getDirectoryFromInput(const QString &dir);
+    static void setDirectoryFromFile(const QString &fileName);
+    static void restoreFocus(QWidget *parent);
+};
+
+#endif // FILEDIALOG_H

include/project.h

@@ -76,7 +76,6 @@ public:
     QFileSystemWatcher fileWatcher;
     QMap<QString, qint64> modifiedFileTimestamps;
     bool usingAsmTilesets;
-    QString importExportPath;
     QSet<QString> disabledSettingsNames;
     int pokemonMinLevel;
     int pokemonMaxLevel;
@@ -216,7 +215,6 @@ public:
     QString buildMetatileLabelsText(const QMap<QString, uint16_t> defines);
     QString findMetatileLabelsTileset(QString label);
 
-    void setImportExportPath(QString filename);
     static QString getExistingFilepath(QString filepath);
     void applyParsedLimits();
 

include/ui/customscriptseditor.h

@@ -31,7 +31,6 @@ private:
     Ui::CustomScriptsEditor *ui;
 
     bool hasUnsavedChanges = false;
-    QString fileDialogDir;
     const QString baseDir;
 
     void displayScript(const QString &filepath, bool enabled);

include/ui/regionmappropertiesdialog.h

@@ -4,7 +4,6 @@
 #include "orderedjson.h"
 
 #include <QDialog>
-#include <QFileDialog>
 
 class Project;
 
@@ -33,7 +32,7 @@ private:
 
     void hideMessages();
 
-    QString browse(QString filter, QFileDialog::FileMode mode);
+    QString browse(QString filter);
 
 private slots:
     void on_browse_tilesetImagePath_clicked();