Mercurial Repositories > eric / file diff

--- a/eric7/E5Gui/E5FileDialog.py	Sun May 16 20:07:24 2021 +0200
+++ b/eric7/E5Gui/E5FileDialog.py	Mon May 17 19:58:15 2021 +0200
@@ -56,13 +56,10 @@
     @param options various options for the dialog (QFileDialog.Options)
     @return name of file to be opened (string)
     """
-##    if options is None:
-##        options = QFileDialog.Options()
+    if options is None:
+        options = QFileDialog.Option(0)
     if Globals.isLinuxPlatform():
-        if options is None:
-            options = QFileDialog.Option.DontUseNativeDialog
-        else:
-            options |= QFileDialog.Option.DontUseNativeDialog
+        options |= QFileDialog.Option.DontUseNativeDialog
     return QFileDialog.getOpenFileName(
         parent, caption, directory, filterStr, "", options)[0]
 
@@ -82,13 +79,10 @@
     @param options various options for the dialog (QFileDialog.Options)
     @return name of file to be opened and selected filter (string, string)
     """
-##    if options is None:
-##        options = QFileDialog.Options()
+    if options is None:
+        options = QFileDialog.Option(0)
     if Globals.isLinuxPlatform():
-        if options is None:
-            options = QFileDialog.Option.DontUseNativeDialog
-        else:
-            options |= QFileDialog.Option.DontUseNativeDialog
+        options |= QFileDialog.Option.DontUseNativeDialog
     newfilter = __reorderFilter(filterStr, initialFilter)
     return QFileDialog.getOpenFileName(
         parent, caption, directory, newfilter, initialFilter, options)
@@ -106,13 +100,10 @@
     @param options various options for the dialog (QFileDialog.Options)
     @return list of file names to be opened (list of string)
     """
-##    if options is None:
-##        options = QFileDialog.Options()
+    if options is None:
+        options = QFileDialog.Option(0)
     if Globals.isLinuxPlatform():
-        if options is None:
-            options = QFileDialog.Option.DontUseNativeDialog
-        else:
-            options |= QFileDialog.Option.DontUseNativeDialog
+        options |= QFileDialog.Option.DontUseNativeDialog
     return QFileDialog.getOpenFileNames(
         parent, caption, directory, filterStr, "", options)[0]
 
@@ -133,13 +124,10 @@
     @return list of file names to be opened and selected filter
         (list of string, string)
     """
-##    if options is None:
-##        options = QFileDialog.Options()
+    if options is None:
+        options = QFileDialog.Option(0)
     if Globals.isLinuxPlatform():
-        if options is None:
-            options = QFileDialog.Option.DontUseNativeDialog
-        else:
-            options |= QFileDialog.Option.DontUseNativeDialog
+        options |= QFileDialog.Option.DontUseNativeDialog
     newfilter = __reorderFilter(filterStr, initialFilter)
     return QFileDialog.getOpenFileNames(
         parent, caption, directory, newfilter, initialFilter, options)
@@ -157,13 +145,10 @@
     @param options various options for the dialog (QFileDialog.Options)
     @return name of file to be saved (string)
     """
-##    if options is None:
-##        options = QFileDialog.Options()
+    if options is None:
+        options = QFileDialog.Option(0)
     if Globals.isLinuxPlatform():
-        if options is None:
-            options = QFileDialog.Option.DontUseNativeDialog
-        else:
-            options |= QFileDialog.Option.DontUseNativeDialog
+        options |= QFileDialog.Option.DontUseNativeDialog
     return QFileDialog.getSaveFileName(
         parent, caption, directory, filterStr, "", options)[0]
 
@@ -183,13 +168,10 @@
     @param options various options for the dialog (QFileDialog.Options)
     @return name of file to be saved and selected filter (string, string)
     """
-##    if options is None:
-##        options = QFileDialog.Options()
+    if options is None:
+        options = QFileDialog.Option(0)
     if Globals.isLinuxPlatform():
-        if options is None:
-            options = QFileDialog.Option.DontUseNativeDialog
-        else:
-            options |= QFileDialog.Option.DontUseNativeDialog
+        options |= QFileDialog.Option.DontUseNativeDialog
     newfilter = __reorderFilter(filterStr, initialFilter)
     return QFileDialog.getSaveFileName(
         parent, caption, directory, newfilter, initialFilter, options)
@@ -207,6 +189,8 @@
     @param options various options for the dialog (QFileDialog.Options)
     @return name of selected directory (string)
     """
+    if options is None:
+        options = QFileDialog.Option(0)
     if Globals.isLinuxPlatform():
         options |= QFileDialog.Option.DontUseNativeDialog
     return QFileDialog.getExistingDirectory(parent, caption, directory,