Mercurial Repositories > eric / changeset

--- a/eric7/CondaInterface/CondaExportDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/CondaInterface/CondaExportDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -48,7 +48,7 @@
         self.__refreshButton = self.buttonBox.addButton(
             self.tr("&Refresh"), QDialogButtonBox.ButtonRole.ActionRole)
         
-        self.requirementsFilePicker.setMode(E5PathPickerModes.SaveFileMode)
+        self.requirementsFilePicker.setMode(E5PathPickerModes.SAVE_FILE_MODE)
         self.requirementsFilePicker.setFilters(
             self.tr("Text Files (*.txt);;All Files (*)"))
         

--- a/eric7/CondaInterface/CondaNewEnvironmentDataDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/CondaInterface/CondaNewEnvironmentDataDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -38,7 +38,7 @@
         
         self.__requirementsMode = showRequirements
         
-        self.requirementsFilePicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.requirementsFilePicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         self.requirementsFilePicker.setFilters(
             self.tr("Text Files (*.txt);;All Files (*)"))
         

--- a/eric7/Debugger/EditBreakpointDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Debugger/EditBreakpointDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -43,7 +43,7 @@
             self.setObjectName(name)
         self.setModal(modal)
         
-        self.filenamePicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.filenamePicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         self.filenamePicker.setSizeAdjustPolicy(
             QComboBox.SizeAdjustPolicy.AdjustToMinimumContentsLengthWithIcon)
         

--- a/eric7/Debugger/StartDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Debugger/StartDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -102,7 +102,7 @@
             sorted(e5App().getObject("VirtualEnvManager")
                    .getVirtualenvNames()))
         
-        self.ui.workdirPicker.setMode(E5PathPickerModes.DirectoryMode)
+        self.ui.workdirPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         self.ui.workdirPicker.setDefaultDirectory(
             Preferences.getMultiProject("Workspace"))
         self.ui.workdirPicker.setInsertPolicy(

--- a/eric7/E5Gui/E5FileSaveConfirmDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/E5Gui/E5FileSaveConfirmDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -53,7 +53,7 @@
         
         if picker:
             self.__pathPicker = E5PathPicker(self)
-            self.__pathPicker.setMode(E5PathPickerModes.SaveFileMode)
+            self.__pathPicker.setMode(E5PathPickerModes.SAVE_FILE_MODE)
         else:
             self.__pathPicker = E5ClearableLineEdit(self)
         

--- a/eric7/E5Gui/E5PathPicker.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/E5Gui/E5PathPicker.py	Wed May 19 19:53:36 2021 +0200
@@ -25,17 +25,15 @@
     """
     Class implementing the path picker modes.
     """
-    # TODO: eric7: convert these to all uppercase without "Mode" when doing
-    #       the port to PyQt6
-    OpenFileMode = 0
-    OpenFilesMode = 1
-    SaveFileMode = 2
-    SaveFileEnsureExtensionMode = 3
-    SaveFileOverwriteMode = 4
-    DirectoryMode = 5
-    DirectoryShowFilesMode = 6
-    CustomMode = 99
-    NoMode = 100
+    OPEN_FILE_MODE = 0
+    OPEN_FILES_MODE = 1
+    SAVE_FILE_MODE = 2
+    SAVE_FILE_ENSURE_EXTENSION_MODE = 3
+    SAVE_FILE_OVERWRITE_MODE = 4
+    DIRECTORY_MODE = 5
+    DIRECTORY_SHOW_FILES_MODE = 6
+    CUSTOM_MODE = 99
+    NO_MODE = 100
 
 
 class E5PathPickerBase(QWidget):
@@ -53,7 +51,7 @@
     @signal pickerButtonClicked emitted when the picker button was pressed and
         the widget mode is custom
     """
-    DefaultMode = E5PathPickerModes.NoMode
+    DefaultMode = E5PathPickerModes.NO_MODE
     
     textChanged = pyqtSignal(str)
     editTextChanged = pyqtSignal(str)
@@ -115,7 +113,7 @@
         self.setSizePolicy(QSizePolicy.Policy.Expanding,
                            QSizePolicy.Policy.Preferred)
         
-        self.__button.setEnabled(self.__mode != E5PathPickerModes.NoMode)
+        self.__button.setEnabled(self.__mode != E5PathPickerModes.NO_MODE)
     
     def __pathEdited(self, path):
         """
@@ -147,22 +145,22 @@
                 self._editor.setCompleter(None)
                 self._completer = None
             
-            if mode != E5PathPickerModes.NoMode:
+            if mode != E5PathPickerModes.NO_MODE:
                 if self.__lineEditKind:
                     # Set a new completer
-                    if mode == E5PathPickerModes.DirectoryMode:
+                    if mode == E5PathPickerModes.DIRECTORY_MODE:
                         self._completer = E5DirCompleter(self._editor)
                     else:
                         self._completer = E5FileCompleter(self._editor)
                 
                 # set inactive text
-                if mode == E5PathPickerModes.OpenFilesMode:
+                if mode == E5PathPickerModes.OPEN_FILES_MODE:
                     self._editor.setInactiveText(
                         self.tr("Enter Path Names separated by ';'"))
                 else:
                     self._editor.setInactiveText(
                         self.tr("Enter Path Name"))
-        self.__button.setEnabled(self.__mode != E5PathPickerModes.NoMode)
+        self.__button.setEnabled(self.__mode != E5PathPickerModes.NO_MODE)
     
     def mode(self):
         """
@@ -240,7 +238,7 @@
             a native format
         @type bool
         """
-        if self.__mode == E5PathPickerModes.OpenFilesMode:
+        if self.__mode == E5PathPickerModes.OPEN_FILES_MODE:
             self._setEditorText(path)
         else:
             if toNative:
@@ -259,7 +257,7 @@
         @return current path
         @rtype str
         """
-        if self.__mode == E5PathPickerModes.OpenFilesMode:
+        if self.__mode == E5PathPickerModes.OPEN_FILES_MODE:
             if toNative:
                 return ";".join(
                     [QDir.toNativeSeparators(path)
@@ -331,7 +329,7 @@
         @return entered paths
         @rtype list of str
         """
-        if self.__mode == E5PathPickerModes.OpenFilesMode:
+        if self.__mode == E5PathPickerModes.OPEN_FILES_MODE:
             return self.path(toNative=toNative).split(";")
         else:
             return [self.path(toNative=toNative)]
@@ -486,10 +484,10 @@
         """
         Private slot to show the path picker dialog.
         """
-        if self.__mode == E5PathPickerModes.NoMode:
+        if self.__mode == E5PathPickerModes.NO_MODE:
             return
         
-        if self.__mode == E5PathPickerModes.CustomMode:
+        if self.__mode == E5PathPickerModes.CUSTOM_MODE:
             self.pickerButtonClicked.emit()
             return
         
@@ -497,16 +495,16 @@
         
         windowTitle = self.__windowTitle
         if not windowTitle:
-            if self.__mode == E5PathPickerModes.OpenFileMode:
+            if self.__mode == E5PathPickerModes.OPEN_FILE_MODE:
                 windowTitle = self.tr("Choose a file to open")
-            elif self.__mode == E5PathPickerModes.OpenFilesMode:
+            elif self.__mode == E5PathPickerModes.OPEN_FILES_MODE:
                 windowTitle = self.tr("Choose files to open")
             elif self.__mode in [
-                E5PathPickerModes.SaveFileMode,
-                    E5PathPickerModes.SaveFileEnsureExtensionMode,
-                    E5PathPickerModes.SaveFileOverwriteMode]:
+                E5PathPickerModes.SAVE_FILE_MODE,
+                    E5PathPickerModes.SAVE_FILE_ENSURE_EXTENSION_MODE,
+                    E5PathPickerModes.SAVE_FILE_OVERWRITE_MODE]:
                 windowTitle = self.tr("Choose a file to save")
-            elif self.__mode == E5PathPickerModes.DirectoryMode:
+            elif self.__mode == E5PathPickerModes.DIRECTORY_MODE:
                 windowTitle = self.tr("Choose a directory")
         
         directory = self._editorText()
@@ -514,21 +512,21 @@
             directory = self.__defaultDirectory
         directory = (
             os.path.expanduser(directory.split(";")[0])
-            if self.__mode == E5PathPickerModes.OpenFilesMode else
+            if self.__mode == E5PathPickerModes.OPEN_FILES_MODE else
             os.path.expanduser(directory)
         )
         if not os.path.isabs(directory) and self.__defaultDirectory:
             directory = os.path.join(self.__defaultDirectory, directory)
         directory = QDir.fromNativeSeparators(directory)
         
-        if self.__mode == E5PathPickerModes.OpenFileMode:
+        if self.__mode == E5PathPickerModes.OPEN_FILE_MODE:
             path = E5FileDialog.getOpenFileName(
                 self,
                 windowTitle,
                 directory,
                 self.__filters)
             path = QDir.toNativeSeparators(path)
-        elif self.__mode == E5PathPickerModes.OpenFilesMode:
+        elif self.__mode == E5PathPickerModes.OPEN_FILES_MODE:
             paths = E5FileDialog.getOpenFileNames(
                 self,
                 windowTitle,
@@ -536,7 +534,7 @@
                 self.__filters)
             path = ";".join([QDir.toNativeSeparators(path)
                              for path in paths])
-        elif self.__mode == E5PathPickerModes.SaveFileMode:
+        elif self.__mode == E5PathPickerModes.SAVE_FILE_MODE:
             path = E5FileDialog.getSaveFileName(
                 self,
                 windowTitle,
@@ -544,7 +542,7 @@
                 self.__filters,
                 E5FileDialog.DontConfirmOverwrite)
             path = QDir.toNativeSeparators(path)
-        elif self.__mode == E5PathPickerModes.SaveFileEnsureExtensionMode:
+        elif self.__mode == E5PathPickerModes.SAVE_FILE_ENSURE_EXTENSION_MODE:
             path, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
                 self,
                 windowTitle,
@@ -559,14 +557,14 @@
                     ex = selectedFilter.split("(*")[1].split(")")[0]
                     if ex:
                         path += ex
-        elif self.__mode == E5PathPickerModes.SaveFileOverwriteMode:
+        elif self.__mode == E5PathPickerModes.SAVE_FILE_OVERWRITE_MODE:
             path = E5FileDialog.getSaveFileName(
                 self,
                 windowTitle,
                 directory,
                 self.__filters)
             path = QDir.toNativeSeparators(path)
-        elif self.__mode == E5PathPickerModes.DirectoryMode:
+        elif self.__mode == E5PathPickerModes.DIRECTORY_MODE:
             path = E5FileDialog.getExistingDirectory(
                 self,
                 windowTitle,
@@ -575,7 +573,7 @@
             path = QDir.toNativeSeparators(path)
             while path.endswith(os.sep):
                 path = path[:-1]
-        elif self.__mode == E5PathPickerModes.DirectoryShowFilesMode:
+        elif self.__mode == E5PathPickerModes.DIRECTORY_SHOW_FILES_MODE:
             path = E5FileDialog.getExistingDirectory(
                 self,
                 windowTitle,

--- a/eric7/E5Gui/E5PathPickerDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/E5Gui/E5PathPickerDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -112,7 +112,7 @@
         return self.__pathPicker.path()
 
 
-def getPath(parent, title, label, mode=E5PathPickerModes.OpenFileMode,
+def getPath(parent, title, label, mode=E5PathPickerModes.OPEN_FILE_MODE,
             path="", defaultDirectory="", filters=None):
     """
     Function to get a file or directory path from the user.

--- a/eric7/E5Network/E5JsonClient.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/E5Network/E5JsonClient.py	Wed May 19 19:53:36 2021 +0200
@@ -155,3 +155,49 @@
         with contextlib.suppress(socket.error, OSError):
             self.__connection.shutdown(socket.SHUT_RDWR)
             self.__connection.close()
+    
+    def poll(self, waitMethod=""):
+        """
+        Public method to check and receive one message (if available).
+        
+        @param waitMethod name of a method to wait for
+        @type str
+        @return dictionary containing the data of the waited for method
+        @rtype dict
+        """
+        try:
+            if waitMethod:
+                rrdy, wrdy, xrdy = select.select(
+                    [self.__connection], [], [])
+            else:
+                rrdy, wrdy, xrdy = select.select(
+                    [self.__connection], [], [], 0)
+            
+            if self.__connection in rrdy:
+                method, params = self.__receiveJson()
+                if method is not None:
+                    if method == "Exit":
+                        self.__exitClient = True
+                    elif method == waitMethod:
+                        return params
+                    else:
+                        self.handleCall(method, params)
+        
+        except (select.error, KeyboardInterrupt, socket.error):
+            # just ignore these
+            pass
+        
+        except Exception:
+            exctype, excval, exctb = sys.exc_info()
+            tbinfofile = io.StringIO()
+            traceback.print_tb(exctb, None, tbinfofile)
+            tbinfofile.seek(0)
+            tbinfo = tbinfofile.read()
+            del exctb
+            self.sendJson("ClientException", {
+                "ExceptionType": str(exctype),
+                "ExceptionValue": str(excval),
+                "Traceback": tbinfo,
+            })
+        
+        return None

--- a/eric7/E5XML/XMLStreamReaderBase.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/E5XML/XMLStreamReaderBase.py	Wed May 19 19:53:36 2021 +0200
@@ -111,21 +111,23 @@
         @param default default value (string)
         @return value of the requested tag attribute (string)
         """
-        attributes = self.attributes()
-        for attribute in attributes:
-            if attribute.name() == name:
-                value = attribute.value()
-                if not value:
-                    value = default
-                break
-        else:
-            value = default
-        return value
-        # TODO: re-enable this code once PyQt6 is fixed and released
-##        att = self.attributes().value(name)
-##        if att == "":
-##            att = default
-##        return att
+        try:
+            att = self.attributes().value(name)
+            if att == "":
+                att = default
+            return att
+        except AttributeError:
+            # Work around for PyQt6 < 6.1.1
+            attributes = self.attributes()
+            for attribute in attributes:
+                if attribute.name() == name:
+                    value = attribute.value()
+                    if not value:
+                        value = default
+                    break
+            else:
+                value = default
+            return value
     
     def _skipUnknownElement(self):
         """

--- a/eric7/Globals/__init__.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Globals/__init__.py	Wed May 19 19:53:36 2021 +0200
@@ -326,11 +326,11 @@
     # step 1: check, if the user has configured a tools path
     path = Preferences.getQt("QtToolsDir")
     
-    # step 2: try the qt5_applications package
+    # step 2: try the qt6_applications package
     if not path:
         with contextlib.suppress(ImportError):
-            import qt5_applications
-            path = os.path.join(os.path.dirname(qt5_applications.__file__),
+            import qt6_applications
+            path = os.path.join(os.path.dirname(qt6_applications.__file__),
                                 "Qt", "bin")
             # if qt5-applications is not installed just go to the next step
     

--- a/eric7/MicroPython/EspBackupRestoreFirmwareDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/MicroPython/EspBackupRestoreFirmwareDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -72,11 +72,11 @@
             self.tr("Firmware Files (*.img);;All Files (*)"))
         if self.__isBackupMode:
             self.firmwarePicker.setMode(
-                E5PathPickerModes.SaveFileEnsureExtensionMode)
+                E5PathPickerModes.SAVE_FILE_ENSURE_EXTENSION_MODE)
             self.modeComboBox.setEnabled(False)
             self.setWindowTitle(self.tr("Backup Firmware"))
         else:
-            self.firmwarePicker.setMode(E5PathPickerModes.OpenFileMode)
+            self.firmwarePicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
             for text, mode in self.FlashModes:
                 self.modeComboBox.addItem(text, mode)
             self.setWindowTitle(self.tr("Restore Firmware"))

--- a/eric7/MicroPython/EspFirmwareSelectionDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/MicroPython/EspFirmwareSelectionDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -46,7 +46,7 @@
         
         self.__addon = addon
         
-        self.firmwarePicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.firmwarePicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         self.firmwarePicker.setFilters(
             self.tr("Firmware Files (*.bin);;All Files (*)"))
         

--- a/eric7/MicroPython/MicroPythonFileManagerWidget.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/MicroPython/MicroPythonFileManagerWidget.py	Wed May 19 19:53:36 2021 +0200
@@ -664,7 +664,7 @@
             self,
             self.tr("Change Directory"),
             self.tr("Select Directory"),
-            E5PathPickerModes.DirectoryShowFilesMode,
+            E5PathPickerModes.DIRECTORY_SHOW_FILES_MODE,
             path=cwdWidget.text(),
             defaultDirectory=cwdWidget.text(),
         )

--- a/eric7/MicroPython/UF2FlashDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/MicroPython/UF2FlashDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -518,12 +518,12 @@
         
         self.refreshButton.setIcon(UI.PixmapCache.getIcon("rescan"))
         
-        self.firmwarePicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.firmwarePicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         self.firmwarePicker.setFilters(
             self.tr("MicroPython/CircuitPython Files (*.uf2);;"
                     "All Files (*)"))
         
-        self.bootPicker.setMode(E5PathPickerModes.DirectoryShowFilesMode)
+        self.bootPicker.setMode(E5PathPickerModes.DIRECTORY_SHOW_FILES_MODE)
         self.bootPicker.setEnabled(False)
         
         self.__mandatoryStyleSheet = (

--- a/eric7/MultiProject/AddProjectDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/MultiProject/AddProjectDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -43,7 +43,7 @@
         super().__init__(parent)
         self.setupUi(self)
         
-        self.filenamePicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.filenamePicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         self.filenamePicker.setFilters(
             self.tr("Project Files (*.epj);;XML Project Files (*.e4p)"))
         self.filenamePicker.setDefaultDirectory(

--- a/eric7/MultiProject/MultiProject.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/MultiProject/MultiProject.py	Wed May 19 19:53:36 2021 +0200
@@ -391,7 +391,7 @@
                 self.tr("Copy Project"),
                 self.tr("Enter directory for the new project (must not exist"
                         " already):"),
-                mode=E5PathPickerModes.DirectoryMode,
+                mode=E5PathPickerModes.DIRECTORY_MODE,
                 path=srcProjectDirectory,
                 defaultDirectory=startdir,
             )

--- a/eric7/PipInterface/PipFileSelectionDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/PipInterface/PipFileSelectionDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -42,7 +42,7 @@
         
         if mode == "requirements":
             self.fileLabel.setText(self.tr("Enter requirements file:"))
-            self.filePicker.setMode(E5PathPickerModes.OpenFileMode)
+            self.filePicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
             self.filePicker.setToolTip(self.tr(
                 "Press to select the requirements file through a file"
                 " selection dialog."))
@@ -50,7 +50,7 @@
                 self.tr("Text Files (*.txt);;All Files (*)"))
         elif mode == "package":
             self.fileLabel.setText(self.tr("Enter package file:"))
-            self.filePicker.setMode(E5PathPickerModes.OpenFileMode)
+            self.filePicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
             self.filePicker.setToolTip(self.tr(
                 "Press to select the package file through a file"
                 " selection dialog."))
@@ -60,7 +60,7 @@
                         "All Files (*)"))
         else:
             self.fileLabel.setText(self.tr("Enter file name:"))
-            self.filePicker.setMode(E5PathPickerModes.OpenFileMode)
+            self.filePicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
             self.filePicker.setToolTip(self.tr(
                 "Press to select a file through a file selection dialog."))
             self.filePicker.setFilters(self.tr("All Files (*)"))

--- a/eric7/PipInterface/PipFreezeDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/PipInterface/PipFreezeDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -46,7 +46,7 @@
         
         self.__environmentName = ""
         
-        self.requirementsFilePicker.setMode(E5PathPickerModes.SaveFileMode)
+        self.requirementsFilePicker.setMode(E5PathPickerModes.SAVE_FILE_MODE)
         self.requirementsFilePicker.setFilters(
             self.tr("Text Files (*.txt);;All Files (*)"))
         

--- a/eric7/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -38,12 +38,12 @@
         super().__init__(parent)
         self.setupUi(self)
         
-        self.outputFilePicker.setMode(E5PathPickerModes.SaveFileMode)
+        self.outputFilePicker.setMode(E5PathPickerModes.SAVE_FILE_MODE)
         self.outputFilePicker.setDefaultDirectory(project.getProjectPath())
         self.outputFilePicker.setFilters(self.tr(
             "API files (*.api);;All files (*)"))
         
-        self.ignoreDirPicker.setMode(E5PathPickerModes.DirectoryMode)
+        self.ignoreDirPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         self.ignoreDirPicker.setDefaultDirectory(project.getProjectPath())
         
         self.buttonBox.button(

--- a/eric7/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -41,18 +41,18 @@
         super().__init__(parent)
         self.setupUi(self)
         
-        self.outputDirPicker.setMode(E5PathPickerModes.DirectoryMode)
+        self.outputDirPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         self.outputDirPicker.setDefaultDirectory(project.getProjectPath())
         
-        self.ignoreDirPicker.setMode(E5PathPickerModes.DirectoryMode)
+        self.ignoreDirPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         self.ignoreDirPicker.setDefaultDirectory(project.getProjectPath())
         
-        self.cssPicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.cssPicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         self.cssPicker.setDefaultDirectory(getConfig('ericCSSDir'))
         self.cssPicker.setFilters(self.tr(
             "Style sheet (*.css);;All files (*)"))
         
-        self.qtHelpDirPicker.setMode(E5PathPickerModes.DirectoryMode)
+        self.qtHelpDirPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         self.qtHelpDirPicker.setDefaultDirectory(project.getProjectPath())
         
         self.__okButton = self.buttonBox.button(

--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -34,7 +34,7 @@
         super().__init__(parent)
         self.setupUi(self)
         
-        self.pathPicker.setMode(E5PathPickerModes.DirectoryMode)
+        self.pathPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         self.pathPicker.setDefaultDirectory(projectPath)
         
         self.__ok = self.buttonBox.button(QDialogButtonBox.StandardButton.Ok)

--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -32,7 +32,7 @@
         self.setupUi(self)
         
         self.archivePicker.setMode(
-            E5PathPickerModes.SaveFileEnsureExtensionMode)
+            E5PathPickerModes.SAVE_FILE_ENSURE_EXTENSION_MODE)
         
         self.typeComboBox.addItem(
             self.tr("Detect Automatically"), "")
@@ -106,10 +106,10 @@
         """
         type_ = self.typeComboBox.itemData(index)
         if type_ == "files":
-            self.archivePicker.setMode(E5PathPickerModes.DirectoryMode)
+            self.archivePicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         else:
             self.archivePicker.setMode(
-                E5PathPickerModes.SaveFileEnsureExtensionMode)
+                E5PathPickerModes.SAVE_FILE_ENSURE_EXTENSION_MODE)
             if type_ in self.__typeFilters:
                 self.archivePicker.setNameFilters(
                     self.__typeFilters[type_])

--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -35,9 +35,9 @@
         
         self.source = source
         if os.path.isdir(self.source):
-            self.targetPicker.setMode(E5PathPickerModes.DirectoryMode)
+            self.targetPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         else:
-            self.targetPicker.setMode(E5PathPickerModes.SaveFileMode)
+            self.targetPicker.setMode(E5PathPickerModes.SAVE_FILE_MODE)
         
         if move:
             self.setWindowTitle(self.tr('Mercurial Move'))

--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -36,7 +36,7 @@
         super().__init__(parent)
         self.setupUi(self)
         
-        self.directoryPicker.setMode(E5PathPickerModes.DirectoryMode)
+        self.directoryPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         
         self.buttonBox.button(
             QDialogButtonBox.StandardButton.Ok).setEnabled(False)

--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -31,7 +31,7 @@
         super().__init__(parent)
         self.setupUi(self)
         
-        self.patchFilePicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.patchFilePicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         self.patchFilePicker.setFilters(self.tr(
             "Patch Files (*.diff *.patch);;All Files (*)"))
         

--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -36,13 +36,13 @@
         super().__init__(parent)
         self.setupUi(self)
         
-        self.vcsProjectDirPicker.setMode(E5PathPickerModes.DirectoryMode)
+        self.vcsProjectDirPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         
         self.__vcs = vcs
         
         vcsUrlHistory = self.__vcs.getPlugin().getPreferences(
             "RepositoryUrlHistory")
-        self.vcsUrlPicker.setMode(E5PathPickerModes.DirectoryMode)
+        self.vcsUrlPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         self.vcsUrlPicker.setInsertPolicy(QComboBox.InsertPolicy.InsertAtTop)
         self.vcsUrlPicker.setSizeAdjustPolicy(
             QComboBox.SizeAdjustPolicy.AdjustToMinimumContentsLengthWithIcon)

--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -56,7 +56,7 @@
             "tls1.2": self.tr("TLS 1.2"),
         }
         
-        self.lfUserCachePicker.setMode(E5PathPickerModes.DirectoryMode)
+        self.lfUserCachePicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         if Globals.isLinuxPlatform():
             self.lfUserCachePicker.setDefaultDirectory(os.path.expanduser(
                 "~/.cache/largefiles"))

--- a/eric7/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -36,7 +36,7 @@
         super().__init__(parent)
         self.setupUi(self)
         
-        self.newProjectPicker.setMode(E5PathPickerModes.DirectoryMode)
+        self.newProjectPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         
         self.__defaults = getDefaults()
         self.__currentPath = Utilities.toNativeSeparators(currentPath)

--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -36,7 +36,7 @@
         super().__init__(parent)
         self.setupUi(self)
         
-        self.workdirPicker.setMode(E5PathPickerModes.DirectoryMode)
+        self.workdirPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         
         self.okButton = self.buttonBox.button(
             QDialogButtonBox.StandardButton.Ok)

--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -36,9 +36,9 @@
         
         self.source = source
         if os.path.isdir(self.source):
-            self.targetPicker.setMode(E5PathPickerModes.DirectoryMode)
+            self.targetPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         else:
-            self.targetPicker.setMode(E5PathPickerModes.SaveFileMode)
+            self.targetPicker.setMode(E5PathPickerModes.SAVE_FILE_MODE)
         
         if move:
             self.setWindowTitle(self.tr('Subversion Move'))

--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -37,8 +37,8 @@
         super().__init__(parent)
         self.setupUi(self)
         
-        self.vcsProjectDirPicker.setMode(E5PathPickerModes.DirectoryMode)
-        self.vcsUrlPicker.setMode(E5PathPickerModes.DirectoryMode)
+        self.vcsProjectDirPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
+        self.vcsUrlPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         
         self.protocolCombo.addItems(ConfigSvnProtocols)
         
@@ -124,14 +124,14 @@
             self.vcsUrlPicker.setText(self.localPath)
             self.vcsUrlLabel.setText(self.tr("Pat&h:"))
             self.localProtocol = True
-            self.vcsUrlPicker.setMode(E5PathPickerModes.DirectoryMode)
+            self.vcsUrlPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         else:
             if self.localProtocol:
                 self.localPath = self.vcsUrlPicker.text()
                 self.vcsUrlPicker.setText(self.networkPath)
                 self.vcsUrlLabel.setText(self.tr("&URL:"))
                 self.localProtocol = False
-                self.vcsUrlPicker.setMode(E5PathPickerModes.CustomMode)
+                self.vcsUrlPicker.setMode(E5PathPickerModes.CUSTOM_MODE)
     
     @pyqtSlot(str)
     def on_vcsUrlPicker_textChanged(self, txt):

--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -37,7 +37,7 @@
         super().__init__(parent)
         self.setupUi(self)
         
-        self.vcsUrlPicker.setMode(E5PathPickerModes.DirectoryMode)
+        self.vcsUrlPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         
         self.project = project
         

--- a/eric7/Plugins/VcsPlugins/vcsSubversion/SvnCommandDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/SvnCommandDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -36,7 +36,7 @@
         super().__init__(parent)
         self.setupUi(self)
         
-        self.workdirPicker.setMode(E5PathPickerModes.DirectoryMode)
+        self.workdirPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         
         self.okButton = self.buttonBox.button(
             QDialogButtonBox.StandardButton.Ok)

--- a/eric7/Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -36,9 +36,9 @@
         
         self.source = source
         if os.path.isdir(self.source):
-            self.targetPicker.setMode(E5PathPickerModes.DirectoryMode)
+            self.targetPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         else:
-            self.targetPicker.setMode(E5PathPickerModes.SaveFileMode)
+            self.targetPicker.setMode(E5PathPickerModes.SAVE_FILE_MODE)
         
         if move:
             self.setWindowTitle(self.tr('Subversion Move'))

--- a/eric7/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -37,8 +37,8 @@
         super().__init__(parent)
         self.setupUi(self)
         
-        self.vcsProjectDirPicker.setMode(E5PathPickerModes.DirectoryMode)
-        self.vcsUrlPicker.setMode(E5PathPickerModes.DirectoryMode)
+        self.vcsProjectDirPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
+        self.vcsUrlPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         
         self.protocolCombo.addItems(ConfigSvnProtocols)
         
@@ -123,14 +123,14 @@
             self.vcsUrlPicker.setText(self.localPath)
             self.vcsUrlLabel.setText(self.tr("Pat&h:"))
             self.localProtocol = True
-            self.vcsUrlPicker.setMode(E5PathPickerModes.DirectoryMode)
+            self.vcsUrlPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         else:
             if self.localProtocol:
                 self.localPath = self.vcsUrlPicker.text()
                 self.vcsUrlPicker.setText(self.networkPath)
                 self.vcsUrlLabel.setText(self.tr("&URL:"))
                 self.localProtocol = False
-                self.vcsUrlPicker.setMode(E5PathPickerModes.CustomMode)
+                self.vcsUrlPicker.setMode(E5PathPickerModes.CUSTOM_MODE)
     
     @pyqtSlot(str)
     def on_vcsUrlPicker_textChanged(self, txt):

--- a/eric7/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -37,7 +37,7 @@
         super().__init__(parent)
         self.setupUi(self)
         
-        self.vcsUrlPicker.setMode(E5PathPickerModes.DirectoryMode)
+        self.vcsUrlPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         
         self.project = project
         

--- a/eric7/Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -27,7 +27,7 @@
         super().__init__(parent)
         self.setupUi(self)
         
-        self.propFilePicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.propFilePicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         
     def getData(self):
         """

--- a/eric7/Preferences/ConfigurationPages/CondaPage.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/CondaPage.py	Wed May 19 19:53:36 2021 +0200
@@ -27,7 +27,7 @@
         self.setupUi(self)
         self.setObjectName("CondaPage")
         
-        self.condaExePicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.condaExePicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         self.condaExePicker.setToolTip(self.tr(
             "Press to select the conda executable via a file selection"
             " dialog."))

--- a/eric7/Preferences/ConfigurationPages/CorbaPage.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/CorbaPage.py	Wed May 19 19:53:36 2021 +0200
@@ -27,7 +27,7 @@
         self.setupUi(self)
         self.setObjectName("CorbaPage")
         
-        self.idlPicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.idlPicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         self.idlPicker.setToolTip(self.tr(
             "Press to select the IDL compiler via a file selection dialog."))
         

--- a/eric7/Preferences/ConfigurationPages/DebuggerPython3Page.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/DebuggerPython3Page.py	Wed May 19 19:53:36 2021 +0200
@@ -39,7 +39,7 @@
         
         self.venvDlgButton.setIcon(UI.PixmapCache.getIcon("virtualenv"))
         
-        self.debugClientPicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.debugClientPicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         self.debugClientPicker.setToolTip(self.tr(
             "Press to select the Debug Client via a file selection dialog"))
         self.debugClientPicker.setFilters(self.tr("Python Files (*.py *.py3)"))

--- a/eric7/Preferences/ConfigurationPages/EditorAPIsPage.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/EditorAPIsPage.py	Wed May 19 19:53:36 2021 +0200
@@ -33,7 +33,7 @@
         self.setupUi(self)
         self.setObjectName("EditorAPIsPage")
         
-        self.apiFilePicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.apiFilePicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         self.apiFilePicker.setToolTip(self.tr(
             "Press to select an API file via a selection dialog"))
         self.apiFilePicker.setFilters(self.tr(

--- a/eric7/Preferences/ConfigurationPages/EditorSpellCheckingPage.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/EditorSpellCheckingPage.py	Wed May 19 19:53:36 2021 +0200
@@ -28,11 +28,11 @@
         self.setupUi(self)
         self.setObjectName("EditorSpellCheckingPage")
         
-        self.pwlPicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.pwlPicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         self.pwlPicker.setFilters(self.tr(
             "Dictionary File (*.dic);;All Files (*)"))
         
-        self.pelPicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.pelPicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         self.pelPicker.setFilters(self.tr(
             "Dictionary File (*.dic);;All Files (*)"))
         

--- a/eric7/Preferences/ConfigurationPages/HelpDocumentationPage.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/HelpDocumentationPage.py	Wed May 19 19:53:36 2021 +0200
@@ -27,30 +27,30 @@
         self.setupUi(self)
         self.setObjectName("HelpDocumentationPage")
         
-        self.ericDocDirPicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.ericDocDirPicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         self.ericDocDirPicker.setFilters(self.tr(
             "HTML Files (*.html *.htm);;All Files (*)"))
-        self.pythonDocDirPicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.pythonDocDirPicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         self.pythonDocDirPicker.setFilters(self.tr(
             "HTML Files (*.html *.htm);;"
             "Compressed Help Files (*.chm);;"
             "All Files (*)"))
-        self.qt5DocDirPicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.qt5DocDirPicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         self.qt5DocDirPicker.setFilters(self.tr(
             "HTML Files (*.html *.htm);;All Files (*)"))
-        self.qt6DocDirPicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.qt6DocDirPicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         self.qt6DocDirPicker.setFilters(self.tr(
             "HTML Files (*.html *.htm);;All Files (*)"))
-        self.pyqt5DocDirPicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.pyqt5DocDirPicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         self.pyqt5DocDirPicker.setFilters(self.tr(
             "HTML Files (*.html *.htm);;All Files (*)"))
-        self.pyqt6DocDirPicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.pyqt6DocDirPicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         self.pyqt6DocDirPicker.setFilters(self.tr(
             "HTML Files (*.html *.htm);;All Files (*)"))
-        self.pyside2DocDirPicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.pyside2DocDirPicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         self.pyside2DocDirPicker.setFilters(self.tr(
             "HTML Files (*.html *.htm);;All Files (*)"))
-        self.pyside6DocDirPicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.pyside6DocDirPicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         self.pyside6DocDirPicker.setFilters(self.tr(
             "HTML Files (*.html *.htm);;All Files (*)"))
         

--- a/eric7/Preferences/ConfigurationPages/HelpViewersPage.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/HelpViewersPage.py	Wed May 19 19:53:36 2021 +0200
@@ -31,7 +31,7 @@
         self.setupUi(self)
         self.setObjectName("HelpViewersPage")
         
-        self.customViewerPicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.customViewerPicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         
         self.helpViewerGroup = QButtonGroup()
         self.helpViewerGroup.addButton(self.helpBrowserButton)

--- a/eric7/Preferences/ConfigurationPages/IconsPage.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/IconsPage.py	Wed May 19 19:53:36 2021 +0200
@@ -35,7 +35,7 @@
         self.setupUi(self)
         self.setObjectName("IconsPage")
         
-        self.iconDirectoryPicker.setMode(E5PathPickerModes.DirectoryMode)
+        self.iconDirectoryPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         
         # set initial values
         defaultIconsPath = Preferences.getIcons("DefaultIconsPath")

--- a/eric7/Preferences/ConfigurationPages/InterfacePage.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/InterfacePage.py	Wed May 19 19:53:36 2021 +0200
@@ -36,7 +36,7 @@
         self.setupUi(self)
         self.setObjectName("InterfacePage")
         
-        self.styleSheetPicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.styleSheetPicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         self.styleSheetPicker.setFilters(self.tr(
             "Qt Style Sheets (*.qss);;Cascading Style Sheets (*.css);;"
             "All files (*)"))

--- a/eric7/Preferences/ConfigurationPages/MicroPythonPage.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/MicroPythonPage.py	Wed May 19 19:53:36 2021 +0200
@@ -33,7 +33,7 @@
         self.setupUi(self)
         self.setObjectName("MicroPythonPage")
         
-        self.workspacePicker.setMode(E5PathPickerModes.DirectoryMode)
+        self.workspacePicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         
         self.colorSchemeComboBox.addItems(sorted(AnsiColorSchemes.keys()))
         
@@ -70,10 +70,10 @@
         except ImportError:
             self.chartThemeComboBox.setEnabled(False)
         
-        self.mpyCrossPicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.mpyCrossPicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         self.mpyCrossPicker.setFilters(self.tr("All Files (*)"))
         
-        self.dfuUtilPathPicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.dfuUtilPathPicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         self.dfuUtilPathPicker.setFilters(self.tr("All Files (*)"))
         
         # set initial values

--- a/eric7/Preferences/ConfigurationPages/MultiProjectPage.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/MultiProjectPage.py	Wed May 19 19:53:36 2021 +0200
@@ -28,7 +28,7 @@
         self.setupUi(self)
         self.setObjectName("MultiProjectPage")
         
-        self.workspacePicker.setMode(E5PathPickerModes.DirectoryMode)
+        self.workspacePicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         
         # set initial values
         self.openMasterAutomaticallyCheckBox.setChecked(

--- a/eric7/Preferences/ConfigurationPages/NetworkPage.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/NetworkPage.py	Wed May 19 19:53:36 2021 +0200
@@ -38,7 +38,7 @@
         self.__displayMode = None
         self.__webEngine = False
         
-        self.downloadDirPicker.setMode(E5PathPickerModes.DirectoryMode)
+        self.downloadDirPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         
         self.ftpProxyTypeCombo.addItem(
             self.tr("No FTP Proxy"), E5FtpProxyType.NO_PROXY)

--- a/eric7/Preferences/ConfigurationPages/PluginManagerPage.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/PluginManagerPage.py	Wed May 19 19:53:36 2021 +0200
@@ -29,7 +29,7 @@
         self.setupUi(self)
         self.setObjectName("PluginManagerPage")
         
-        self.downloadDirPicker.setMode(E5PathPickerModes.DirectoryMode)
+        self.downloadDirPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         
         # set initial values
         self.activateExternalPluginsCheckBox.setChecked(

--- a/eric7/Preferences/ConfigurationPages/ProtobufPage.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/ProtobufPage.py	Wed May 19 19:53:36 2021 +0200
@@ -27,12 +27,12 @@
         self.setupUi(self)
         self.setObjectName("ProtobufPage")
         
-        self.protocPicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.protocPicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         self.protocPicker.setToolTip(self.tr(
             "Press to select the Protobuf compiler via a file selection"
             " dialog."))
         
-        self.grpcPythonPicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.grpcPythonPicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         self.grpcPythonPicker.setToolTip(self.tr(
             "Press to select the Python interpreter containing the gRPC"
             " compiler via a file selection dialog."))

--- a/eric7/Preferences/ConfigurationPages/QtPage.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/QtPage.py	Wed May 19 19:53:36 2021 +0200
@@ -43,7 +43,7 @@
         ):
             button.setIcon(UI.PixmapCache.getIcon("virtualenv"))
         
-        self.qtTransPicker.setMode(E5PathPickerModes.DirectoryMode)
+        self.qtTransPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         for picker in (
             self.qtToolsDirPicker,
             self.pyqtToolsDirPicker,
@@ -51,7 +51,7 @@
             self.pyside2ToolsDirPicker,
             self.pyside6ToolsDirPicker,
         ):
-            picker.setMode(E5PathPickerModes.DirectoryShowFilesMode)
+            picker.setMode(E5PathPickerModes.DIRECTORY_SHOW_FILES_MODE)
         
         self.__populateAndSetVenvComboBoxes(True)
         

--- a/eric7/Preferences/ConfigurationPages/WebBrowserAppearancePage.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/WebBrowserAppearancePage.py	Wed May 19 19:53:36 2021 +0200
@@ -30,7 +30,7 @@
         self.setupUi(self)
         self.setObjectName("WebBrowserAppearancePage")
         
-        self.styleSheetPicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.styleSheetPicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         self.styleSheetPicker.setFilters(self.tr(
             "Cascading Style Sheets (*.css);;All files (*)"))
         

--- a/eric7/Preferences/ConfigurationPages/WebBrowserInterfacePage.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/WebBrowserInterfacePage.py	Wed May 19 19:53:36 2021 +0200
@@ -31,7 +31,7 @@
         self.setupUi(self)
         self.setObjectName("InterfacePage")
         
-        self.styleSheetPicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.styleSheetPicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         self.styleSheetPicker.setFilters(self.tr(
             "Qt Style Sheets (*.qss);;Cascading Style Sheets (*.css);;"
             "All files (*)"))

--- a/eric7/Preferences/ToolConfigurationDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Preferences/ToolConfigurationDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -34,9 +34,9 @@
         super().__init__(parent)
         self.setupUi(self)
         
-        self.iconPicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.iconPicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         self.iconPicker.setFilters(self.tr("Icon files (*.png)"))
-        self.executablePicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.executablePicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         
         self.redirectionModes = [
             ("no", self.tr("no redirection")),

--- a/eric7/Project/AddDirectoryDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Project/AddDirectoryDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -35,9 +35,9 @@
             self.setObjectName(name)
         self.setupUi(self)
         
-        self.sourceDirPicker.setMode(E5PathPickerModes.DirectoryMode)
+        self.sourceDirPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         self.sourceDirPicker.setDefaultDirectory(startdir)
-        self.targetDirPicker.setMode(E5PathPickerModes.DirectoryMode)
+        self.targetDirPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         self.targetDirPicker.setDefaultDirectory(startdir)
         
         self.ppath = pro.ppath

--- a/eric7/Project/AddFileDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Project/AddFileDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -37,8 +37,8 @@
             self.setObjectName(name)
         self.setupUi(self)
         
-        self.sourceFilesPicker.setMode(E5PathPickerModes.OpenFilesMode)
-        self.targetDirPicker.setMode(E5PathPickerModes.DirectoryMode)
+        self.sourceFilesPicker.setMode(E5PathPickerModes.OPEN_FILES_MODE)
+        self.targetDirPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         self.targetDirPicker.setDefaultDirectory(startdir)
         
         self.targetDirPicker.setText(pro.ppath)

--- a/eric7/Project/DebuggerPropertiesDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Project/DebuggerPropertiesDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -45,7 +45,7 @@
         
         debugClientsHistory = Preferences.getProject(
             "DebugClientsHistory")
-        self.debugClientPicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.debugClientPicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         self.debugClientPicker.setInsertPolicy(
             QComboBox.InsertPolicy.InsertAtTop)
         self.debugClientPicker.setSizeAdjustPolicy(

--- a/eric7/Project/IdlCompilerOptionsDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Project/IdlCompilerOptionsDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -138,7 +138,7 @@
             self,
             self.tr("Include Directory"),
             self.tr("Select Include Directory"),
-            E5PathPickerModes.DirectoryShowFilesMode,
+            E5PathPickerModes.DIRECTORY_SHOW_FILES_MODE,
             defaultDirectory=defaultDirectory
         )
         if ok and path:
@@ -175,7 +175,7 @@
             self,
             self.tr("Include Directory"),
             self.tr("Select Include Directory"),
-            E5PathPickerModes.DirectoryShowFilesMode,
+            E5PathPickerModes.DIRECTORY_SHOW_FILES_MODE,
             path=path,
             defaultDirectory=defaultDirectory
         )

--- a/eric7/Project/MakePropertiesDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Project/MakePropertiesDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -34,10 +34,10 @@
         
         self.__project = project
         
-        self.makePicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.makePicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         self.makePicker.setFilters(self.tr("All Files (*)"))
         
-        self.makefilePicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.makefilePicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         self.makefilePicker.setDefaultDirectory(self.__project.ppath)
         self.makefilePicker.setFilters(self.tr(
             "Makefiles (*makefile Makefile *.mak);;All Files (*)"))

--- a/eric7/Project/NewDialogClassDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Project/NewDialogClassDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -33,7 +33,7 @@
         super().__init__(parent)
         self.setupUi(self)
         
-        self.pathnamePicker.setMode(E5PathPickerModes.DirectoryMode)
+        self.pathnamePicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         
         self.okButton = self.buttonBox.button(
             QDialogButtonBox.StandardButton.Ok)

--- a/eric7/Project/PropertiesDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Project/PropertiesDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -42,8 +42,8 @@
             self.setObjectName(name)
         self.setupUi(self)
         
-        self.dirPicker.setMode(E5PathPickerModes.DirectoryMode)
-        self.mainscriptPicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.dirPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
+        self.mainscriptPicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         
         self.makeButton.setIcon(UI.PixmapCache.getIcon("makefile"))
         

--- a/eric7/Project/SpellingPropertiesDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Project/SpellingPropertiesDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -31,12 +31,12 @@
         super().__init__(parent)
         self.setupUi(self)
         
-        self.pwlPicker.setMode(E5PathPickerModes.SaveFileMode)
+        self.pwlPicker.setMode(E5PathPickerModes.SAVE_FILE_MODE)
         self.pwlPicker.setDefaultDirectory(project.ppath)
         self.pwlPicker.setFilters(self.tr(
             "Dictionary File (*.dic);;All Files (*)"))
         
-        self.pelPicker.setMode(E5PathPickerModes.SaveFileMode)
+        self.pelPicker.setMode(E5PathPickerModes.SAVE_FILE_MODE)
         self.pelPicker.setDefaultDirectory(project.ppath)
         self.pelPicker.setFilters(self.tr(
             "Dictionary File (*.dic);;All Files (*)"))

--- a/eric7/Project/TranslationPropertiesDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/Project/TranslationPropertiesDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -36,9 +36,9 @@
         super().__init__(parent)
         self.setupUi(self)
         
-        self.transPatternPicker.setMode(E5PathPickerModes.SaveFileMode)
+        self.transPatternPicker.setMode(E5PathPickerModes.SAVE_FILE_MODE)
         self.transPatternPicker.setDefaultDirectory(project.ppath)
-        self.transBinPathPicker.setMode(E5PathPickerModes.DirectoryMode)
+        self.transBinPathPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         self.transBinPathPicker.setDefaultDirectory(project.ppath)
         
         self.project = project

--- a/eric7/PyUnit/UnittestDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/PyUnit/UnittestDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -77,13 +77,13 @@
             self.setObjectName(name)
         self.setupUi(self)
         
-        self.testsuitePicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.testsuitePicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         self.testsuitePicker.setInsertPolicy(
             QComboBox.InsertPolicy.InsertAtTop)
         self.testsuitePicker.setSizeAdjustPolicy(
             QComboBox.SizeAdjustPolicy.AdjustToMinimumContentsLengthWithIcon)
         
-        self.discoveryPicker.setMode(E5PathPickerModes.DirectoryMode)
+        self.discoveryPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         self.discoveryPicker.setInsertPolicy(
             QComboBox.InsertPolicy.InsertAtTop)
         self.discoveryPicker.setSizeAdjustPolicy(

--- a/eric7/QScintilla/MarkupProviders/ImageMarkupDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/QScintilla/MarkupProviders/ImageMarkupDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -89,7 +89,7 @@
             inputFormats.remove(filters["png"])
             inputFormats.insert(0, filters["png"])
         self.imagePicker.setFilters(';;'.join(inputFormats))
-        self.imagePicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.imagePicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         
         self.sizeCheckBox.setChecked(True)
         self.aspectRatioCheckBox.setChecked(True)

--- a/eric7/SqlBrowser/SqlConnectionDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/SqlBrowser/SqlConnectionDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -29,7 +29,7 @@
         super().__init__(parent)
         self.setupUi(self)
         
-        self.databasePicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.databasePicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         
         self.okButton = self.buttonBox.button(
             QDialogButtonBox.StandardButton.Ok)

--- a/eric7/UI/CompareDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/UI/CompareDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -101,8 +101,8 @@
         if files is None:
             files = []
         
-        self.file1Picker.setMode(E5PathPickerModes.OpenFileMode)
-        self.file2Picker.setMode(E5PathPickerModes.OpenFileMode)
+        self.file1Picker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
+        self.file2Picker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         
         self.diffButton = self.buttonBox.addButton(
             self.tr("Compare"), QDialogButtonBox.ButtonRole.ActionRole)

--- a/eric7/UI/DiffDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/UI/DiffDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -40,8 +40,8 @@
         super().__init__(parent)
         self.setupUi(self)
         
-        self.file1Picker.setMode(E5PathPickerModes.OpenFileMode)
-        self.file2Picker.setMode(E5PathPickerModes.OpenFileMode)
+        self.file1Picker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
+        self.file2Picker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         
         self.diffButton = self.buttonBox.addButton(
             self.tr("Compare"), QDialogButtonBox.ButtonRole.ActionRole)

--- a/eric7/UI/FindFileDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/UI/FindFileDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -59,7 +59,7 @@
         self.setupUi(self)
         self.setWindowFlags(Qt.WindowType.Window)
         
-        self.dirPicker.setMode(E5PathPickerModes.DirectoryMode)
+        self.dirPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         self.dirPicker.setInsertPolicy(QComboBox.InsertPolicy.InsertAtTop)
         self.dirPicker.setSizeAdjustPolicy(
             QComboBox.SizeAdjustPolicy.AdjustToMinimumContentsLengthWithIcon)

--- a/eric7/UI/FindFileNameDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/UI/FindFileNameDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -47,7 +47,7 @@
         super().__init__(parent)
         self.setupUi(self)
         
-        self.searchDirPicker.setMode(E5PathPickerModes.DirectoryMode)
+        self.searchDirPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         
         self.fileList.headerItem().setText(self.fileList.columnCount(), "")
         

--- a/eric7/ViewManager/BookmarkedFilesDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/ViewManager/BookmarkedFilesDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -30,7 +30,7 @@
         super().__init__(parent)
         self.setupUi(self)
         
-        self.filePicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.filePicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         
         self.bookmarks = bookmarks[:]
         for bookmark in self.bookmarks:

--- a/eric7/VirtualEnv/VirtualenvAddEditDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/VirtualEnv/VirtualenvAddEditDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -68,12 +68,12 @@
         if not self.__envBaseDir:
             self.__envBaseDir = Utilities.getHomeDir()
         
-        self.targetDirectoryPicker.setMode(E5PathPickerModes.DirectoryMode)
+        self.targetDirectoryPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         self.targetDirectoryPicker.setWindowTitle(
             self.tr("Virtualenv Target Directory"))
         self.targetDirectoryPicker.setDefaultDirectory(self.__envBaseDir)
         
-        self.pythonExecPicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.pythonExecPicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         self.pythonExecPicker.setWindowTitle(
             self.tr("Python Interpreter"))
         self.pythonExecPicker.setDefaultDirectory(

--- a/eric7/VirtualEnv/VirtualenvConfigurationDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/VirtualEnv/VirtualenvConfigurationDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -46,39 +46,39 @@
             baseDir = Utilities.getHomeDir()
         self.__envBaseDir = baseDir
         
-        self.targetDirectoryPicker.setMode(E5PathPickerModes.DirectoryMode)
+        self.targetDirectoryPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         self.targetDirectoryPicker.setWindowTitle(
             self.tr("Virtualenv Target Directory"))
         self.targetDirectoryPicker.setText(baseDir)
         self.targetDirectoryPicker.setDefaultDirectory(baseDir)
         
-        self.extraSearchPathPicker.setMode(E5PathPickerModes.DirectoryMode)
+        self.extraSearchPathPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         self.extraSearchPathPicker.setWindowTitle(
             self.tr("Extra Search Path for setuptools/pip"))
         self.extraSearchPathPicker.setDefaultDirectory(Utilities.getHomeDir())
         
-        self.pythonExecPicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.pythonExecPicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         self.pythonExecPicker.setWindowTitle(
             self.tr("Python Interpreter"))
         self.pythonExecPicker.setDefaultDirectory(
             sys.executable.replace("w.exe", ".exe"))
         
         self.condaTargetDirectoryPicker.setMode(
-            E5PathPickerModes.DirectoryMode)
+            E5PathPickerModes.DIRECTORY_MODE)
         self.condaTargetDirectoryPicker.setWindowTitle(
             self.tr("Conda Environment Location"))
         self.condaTargetDirectoryPicker.setDefaultDirectory(
             Utilities.getHomeDir())
         
         self.condaCloneDirectoryPicker.setMode(
-            E5PathPickerModes.DirectoryMode)
+            E5PathPickerModes.DIRECTORY_MODE)
         self.condaCloneDirectoryPicker.setWindowTitle(
             self.tr("Conda Environment Location"))
         self.condaCloneDirectoryPicker.setDefaultDirectory(
             Utilities.getHomeDir())
         
         self.condaRequirementsFilePicker.setMode(
-            E5PathPickerModes.OpenFileMode)
+            E5PathPickerModes.OPEN_FILE_MODE)
         self.condaRequirementsFilePicker.setWindowTitle(
             self.tr("Conda Requirements File"))
         self.condaRequirementsFilePicker.setDefaultDirectory(

--- a/eric7/VirtualEnv/VirtualenvInterpreterSelectionDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/VirtualEnv/VirtualenvInterpreterSelectionDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -40,7 +40,7 @@
         super().__init__(parent)
         self.setupUi(self)
         
-        self.pythonExecPicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.pythonExecPicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         self.pythonExecPicker.setWindowTitle(
             self.tr("Python Interpreter"))
         

--- a/eric7/VirtualEnv/VirtualenvManagerDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/VirtualEnv/VirtualenvManagerDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -46,7 +46,7 @@
         if not baseDir:
             baseDir = Utilities.getHomeDir()
         
-        self.envBaseDirectoryPicker.setMode(E5PathPickerModes.DirectoryMode)
+        self.envBaseDirectoryPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         self.envBaseDirectoryPicker.setWindowTitle(
             self.tr("Virtualenv Base Directory"))
         self.envBaseDirectoryPicker.setText(baseDir)

--- a/eric7/WebBrowser/Bookmarks/BookmarksImportDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/WebBrowser/Bookmarks/BookmarksImportDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -37,7 +37,7 @@
         super().__init__(parent)
         self.setupUi(self)
         
-        self.filePicker.setMode(E5PathPickerModes.OpenFileMode)
+        self.filePicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
         
         self.sourcesList.setIconSize(QSize(48, 48))
         for icon, displayText, idText in BookmarksImporters.getImporters():
@@ -109,9 +109,9 @@
             self.__enableNextButton()
             
             if self.__selectedSource == "ie":
-                self.filePicker.setMode(E5PathPickerModes.DirectoryMode)
+                self.filePicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
             else:
-                self.filePicker.setMode(E5PathPickerModes.OpenFileMode)
+                self.filePicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
                 if Globals.isMacPlatform():
                     fileFilter = "*{0}".format(
                         os.path.splitext(self.__sourceFile)[1])

--- a/eric7/WebBrowser/Sync/SyncDirectorySettingsPage.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/WebBrowser/Sync/SyncDirectorySettingsPage.py	Wed May 19 19:53:36 2021 +0200
@@ -29,7 +29,7 @@
         super().__init__(parent)
         self.setupUi(self)
         
-        self.directoryPicker.setMode(E5PathPickerModes.DirectoryMode)
+        self.directoryPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
         self.directoryPicker.setText(
             Preferences.getWebBrowser("SyncDirectoryPath"))
         

--- a/eric7/WebBrowser/Tools/PrintToPdfDialog.py	Wed May 19 18:16:45 2021 +0200
+++ b/eric7/WebBrowser/Tools/PrintToPdfDialog.py	Wed May 19 19:53:36 2021 +0200
@@ -36,7 +36,7 @@
         super().__init__(parent)
         self.setupUi(self)
         
-        self.pdfFilePicker.setMode(E5PathPickerModes.SaveFileOverwriteMode)
+        self.pdfFilePicker.setMode(E5PathPickerModes.SAVE_FILE_OVERWRITE_MODE)
         self.pdfFilePicker.setFilters(self.tr(
             "PDF Files (*.pdf);;"
             "All Files (*)"))