Merge branch 'main' into editor_features

2020-10-07 19:32:56 +02:00
parent 0c1aaecd78 585be8fb57
commit dc5da378ed
10 changed files with 235 additions and 200 deletions
@@ -559,16 +559,15 @@ class GuiMain(QMainWindow):
        extFilter = [
            "Text files (*.txt)",
            "Markdown files (*.md)",
+            "novelWriter files (*.nwd)",
            "All files (*.*)",
        ]
        dlgOpt  = QFileDialog.Options()
        dlgOpt |= QFileDialog.DontUseNativeDialog
-        inPath  = QFileDialog.getOpenFileName(
+        loadFile, _ = QFileDialog.getOpenFileName(
            self, "Import File", lastPath, options=dlgOpt, filter=";;".join(extFilter)
        )
-        if inPath:
-            loadFile = inPath[0]
-        else:
+        if not loadFile:
            return False

        if loadFile.strip() == "":