Mercurial Repositories > eric / file diff

--- a/eric7/E5Gui/E5FileDialog.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/E5Gui/E5FileDialog.py	Sun May 16 20:07:24 2021 +0200
@@ -8,11 +8,11 @@
 to cope with distributor's usage of KDE wrapper dialogs for Qt file dialogs.
 """
 
-from PyQt5.QtWidgets import QFileDialog
+from PyQt6.QtWidgets import QFileDialog
 
 import Globals
 
-Options = QFileDialog.Options
+##Options = QFileDialog.Options
 Option = QFileDialog.Option
 
 ShowDirsOnly = QFileDialog.Option.ShowDirsOnly
@@ -21,7 +21,7 @@
 DontUseNativeDialog = QFileDialog.Option.DontUseNativeDialog
 ReadOnly = QFileDialog.Option.ReadOnly
 HideNameFilterDetails = QFileDialog.Option.HideNameFilterDetails
-DontUseSheet = QFileDialog.Option.DontUseSheet
+##DontUseSheet = QFileDialog.Option.DontUseSheet
 DontUseCustomDirectoryIcons = QFileDialog.Option.DontUseCustomDirectoryIcons
 
 
@@ -56,10 +56,13 @@
     @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.Options()
     if Globals.isLinuxPlatform():
-        options |= QFileDialog.Option.DontUseNativeDialog
+        if options is None:
+            options = QFileDialog.Option.DontUseNativeDialog
+        else:
+            options |= QFileDialog.Option.DontUseNativeDialog
     return QFileDialog.getOpenFileName(
         parent, caption, directory, filterStr, "", options)[0]
 
@@ -79,10 +82,13 @@
     @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.Options()
     if Globals.isLinuxPlatform():
-        options |= QFileDialog.Option.DontUseNativeDialog
+        if options is None:
+            options = QFileDialog.Option.DontUseNativeDialog
+        else:
+            options |= QFileDialog.Option.DontUseNativeDialog
     newfilter = __reorderFilter(filterStr, initialFilter)
     return QFileDialog.getOpenFileName(
         parent, caption, directory, newfilter, initialFilter, options)
@@ -100,10 +106,13 @@
     @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.Options()
     if Globals.isLinuxPlatform():
-        options |= QFileDialog.Option.DontUseNativeDialog
+        if options is None:
+            options = QFileDialog.Option.DontUseNativeDialog
+        else:
+            options |= QFileDialog.Option.DontUseNativeDialog
     return QFileDialog.getOpenFileNames(
         parent, caption, directory, filterStr, "", options)[0]
 
@@ -124,10 +133,13 @@
     @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.Options()
     if Globals.isLinuxPlatform():
-        options |= QFileDialog.Option.DontUseNativeDialog
+        if options is None:
+            options = QFileDialog.Option.DontUseNativeDialog
+        else:
+            options |= QFileDialog.Option.DontUseNativeDialog
     newfilter = __reorderFilter(filterStr, initialFilter)
     return QFileDialog.getOpenFileNames(
         parent, caption, directory, newfilter, initialFilter, options)
@@ -145,10 +157,13 @@
     @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.Options()
     if Globals.isLinuxPlatform():
-        options |= QFileDialog.Option.DontUseNativeDialog
+        if options is None:
+            options = QFileDialog.Option.DontUseNativeDialog
+        else:
+            options |= QFileDialog.Option.DontUseNativeDialog
     return QFileDialog.getSaveFileName(
         parent, caption, directory, filterStr, "", options)[0]
 
@@ -168,10 +183,13 @@
     @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.Options()
     if Globals.isLinuxPlatform():
-        options |= QFileDialog.Option.DontUseNativeDialog
+        if options is None:
+            options = QFileDialog.Option.DontUseNativeDialog
+        else:
+            options |= QFileDialog.Option.DontUseNativeDialog
     newfilter = __reorderFilter(filterStr, initialFilter)
     return QFileDialog.getSaveFileName(
         parent, caption, directory, newfilter, initialFilter, options)