--- a/eric6/E5Gui/E5FileDialog.py Mon Mar 01 17:48:43 2021 +0100 +++ b/eric6/E5Gui/E5FileDialog.py Tue Mar 02 17:17:09 2021 +0100 @@ -15,14 +15,14 @@ Options = QFileDialog.Options Option = QFileDialog.Option -ShowDirsOnly = QFileDialog.ShowDirsOnly -DontResolveSymlinks = QFileDialog.DontResolveSymlinks -DontConfirmOverwrite = QFileDialog.DontConfirmOverwrite -DontUseNativeDialog = QFileDialog.DontUseNativeDialog -ReadOnly = QFileDialog.ReadOnly -HideNameFilterDetails = QFileDialog.HideNameFilterDetails -DontUseSheet = QFileDialog.DontUseSheet -DontUseCustomDirectoryIcons = QFileDialog.DontUseCustomDirectoryIcons +ShowDirsOnly = QFileDialog.Option.ShowDirsOnly +DontResolveSymlinks = QFileDialog.Option.DontResolveSymlinks +DontConfirmOverwrite = QFileDialog.Option.DontConfirmOverwrite +DontUseNativeDialog = QFileDialog.Option.DontUseNativeDialog +ReadOnly = QFileDialog.Option.ReadOnly +HideNameFilterDetails = QFileDialog.Option.HideNameFilterDetails +DontUseSheet = QFileDialog.Option.DontUseSheet +DontUseCustomDirectoryIcons = QFileDialog.Option.DontUseCustomDirectoryIcons def __reorderFilter(filterStr, initialFilter=""): @@ -59,7 +59,7 @@ if options is None: options = QFileDialog.Options() if Globals.isLinuxPlatform(): - options |= QFileDialog.DontUseNativeDialog + options |= QFileDialog.Option.DontUseNativeDialog return QFileDialog.getOpenFileName( parent, caption, directory, filterStr, "", options)[0] @@ -82,7 +82,7 @@ if options is None: options = QFileDialog.Options() if Globals.isLinuxPlatform(): - options |= QFileDialog.DontUseNativeDialog + options |= QFileDialog.Option.DontUseNativeDialog newfilter = __reorderFilter(filterStr, initialFilter) return QFileDialog.getOpenFileName( parent, caption, directory, newfilter, initialFilter, options) @@ -103,7 +103,7 @@ if options is None: options = QFileDialog.Options() if Globals.isLinuxPlatform(): - options |= QFileDialog.DontUseNativeDialog + options |= QFileDialog.Option.DontUseNativeDialog return QFileDialog.getOpenFileNames( parent, caption, directory, filterStr, "", options)[0] @@ -127,7 +127,7 @@ if options is None: options = QFileDialog.Options() if Globals.isLinuxPlatform(): - options |= QFileDialog.DontUseNativeDialog + options |= QFileDialog.Option.DontUseNativeDialog newfilter = __reorderFilter(filterStr, initialFilter) return QFileDialog.getOpenFileNames( parent, caption, directory, newfilter, initialFilter, options) @@ -148,7 +148,7 @@ if options is None: options = QFileDialog.Options() if Globals.isLinuxPlatform(): - options |= QFileDialog.DontUseNativeDialog + options |= QFileDialog.Option.DontUseNativeDialog return QFileDialog.getSaveFileName( parent, caption, directory, filterStr, "", options)[0] @@ -171,14 +171,15 @@ if options is None: options = QFileDialog.Options() if Globals.isLinuxPlatform(): - options |= QFileDialog.DontUseNativeDialog + options |= QFileDialog.Option.DontUseNativeDialog newfilter = __reorderFilter(filterStr, initialFilter) return QFileDialog.getSaveFileName( parent, caption, directory, newfilter, initialFilter, options) def getExistingDirectory(parent=None, caption="", - directory="", options=QFileDialog.ShowDirsOnly): + directory="", + options=QFileDialog.Option.ShowDirsOnly): """ Module function to get the name of a directory. @@ -189,6 +190,6 @@ @return name of selected directory (string) """ if Globals.isLinuxPlatform(): - options |= QFileDialog.DontUseNativeDialog + options |= QFileDialog.Option.DontUseNativeDialog return QFileDialog.getExistingDirectory(parent, caption, directory, options)