diff -r 547319e56c60 -r 666c2b81cbb7 eric7/E5Gui/E5PathPicker.py
--- 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,
