--- a/src/eric7/Project/AddFileDialog.py Wed Jul 13 11:16:20 2022 +0200
+++ b/src/eric7/Project/AddFileDialog.py Wed Jul 13 14:55:47 2022 +0200
@@ -21,11 +21,11 @@
"""
Class implementing a dialog to add a file to the project.
"""
- def __init__(self, pro, parent=None, fileTypeFilter=None, name=None,
- startdir=None):
+
+ def __init__(self, pro, parent=None, fileTypeFilter=None, name=None, startdir=None):
"""
Constructor
-
+
@param pro reference to the project object
@param parent parent widget of this dialog (QWidget)
@param fileTypeFilter filter specification for the file to add (string)
@@ -36,24 +36,24 @@
if name:
self.setObjectName(name)
self.setupUi(self)
-
+
self.sourceFilesPicker.setMode(EricPathPickerModes.OPEN_FILES_MODE)
self.targetDirPicker.setMode(EricPathPickerModes.DIRECTORY_MODE)
self.targetDirPicker.setDefaultDirectory(startdir)
-
+
self.targetDirPicker.setText(pro.ppath)
self.fileTypeFilter = fileTypeFilter
self.ppath = pro.ppath
self.startdir = startdir
self.filetypes = pro.pdata["FILETYPES"]
# save a reference to the filetypes dict
-
+
if self.fileTypeFilter is not None:
self.sourcecodeCheckBox.hide()
-
+
msh = self.minimumSizeHint()
self.resize(max(self.width(), msh.width()), msh.height())
-
+
@pyqtSlot()
def on_sourceFilesPicker_aboutToShowPathPickerDialog(self):
"""
@@ -64,7 +64,7 @@
if not path:
path = self.startdir
self.sourceFilesPicker.setDefaultDirectory(path)
-
+
if self.fileTypeFilter is None:
patterns = {
"SOURCES": [],
@@ -91,77 +91,73 @@
" ".join(patterns["RESOURCES"]),
" ".join(patterns["INTERFACES"]),
" ".join(patterns["PROTOCOLS"]),
- " ".join(patterns["TRANSLATIONS"])
+ " ".join(patterns["TRANSLATIONS"]),
)
caption = self.tr("Select Files")
- elif self.fileTypeFilter == 'form':
+ elif self.fileTypeFilter == "form":
patterns = []
for pattern, filetype in list(self.filetypes.items()):
if filetype == "FORMS":
patterns.append(pattern)
- dfilter = self.tr("Forms Files ({0})").format(
- " ".join(patterns))
+ dfilter = self.tr("Forms Files ({0})").format(" ".join(patterns))
caption = self.tr("Select user-interface files")
elif self.fileTypeFilter == "resource":
patterns = []
for pattern, filetype in list(self.filetypes.items()):
if filetype == "RESOURCES":
patterns.append(pattern)
- dfilter = self.tr("Resource Files ({0})").format(
- " ".join(patterns))
+ dfilter = self.tr("Resource Files ({0})").format(" ".join(patterns))
caption = self.tr("Select resource files")
- elif self.fileTypeFilter == 'source':
+ elif self.fileTypeFilter == "source":
patterns = []
for pattern, filetype in list(self.filetypes.items()):
if filetype == "SOURCES":
patterns.append(pattern)
dfilter = self.tr("Source Files ({0});;All Files (*)").format(
- " ".join(patterns))
+ " ".join(patterns)
+ )
caption = self.tr("Select source files")
- elif self.fileTypeFilter == 'interface':
+ elif self.fileTypeFilter == "interface":
patterns = []
for pattern, filetype in list(self.filetypes.items()):
if filetype == "INTERFACES":
patterns.append(pattern)
- dfilter = self.tr("Interface Files ({0})").format(
- " ".join(patterns))
+ dfilter = self.tr("Interface Files ({0})").format(" ".join(patterns))
caption = self.tr("Select interface files")
- elif self.fileTypeFilter == 'protocol':
+ elif self.fileTypeFilter == "protocol":
patterns = []
for pattern, filetype in list(self.filetypes.items()):
if filetype == "PROTOCOLS":
patterns.append(pattern)
- dfilter = self.tr("Protocol Files ({0})").format(
- " ".join(patterns))
+ dfilter = self.tr("Protocol Files ({0})").format(" ".join(patterns))
caption = self.tr("Select protocol files")
- elif self.fileTypeFilter == 'translation':
+ elif self.fileTypeFilter == "translation":
patterns = []
for pattern, filetype in list(self.filetypes.items()):
if filetype == "TRANSLATIONS":
patterns.append(pattern)
- dfilter = self.tr("Translation Files ({0})").format(
- " ".join(patterns))
+ dfilter = self.tr("Translation Files ({0})").format(" ".join(patterns))
caption = self.tr("Select translation files")
- elif self.fileTypeFilter == 'others':
+ elif self.fileTypeFilter == "others":
dfilter = self.tr("All Files (*)")
caption = self.tr("Select files")
else:
dfilter = ""
caption = ""
-
+
self.sourceFilesPicker.setWindowTitle(caption)
self.sourceFilesPicker.setFilters(dfilter)
-
+
@pyqtSlot(str)
def on_sourceFilesPicker_textChanged(self, sfile):
"""
Private slot to handle the source file text changed.
-
+
If the entered source directory is a subdirectory of the current
projects main directory, the target directory path is synchronized.
It is assumed, that the user wants to add a bunch of files to
the project in place.
-
+
@param sfile the text of the source file picker (string)
"""
sfile = self.sourceFilesPicker.firstPath()
@@ -171,11 +167,11 @@
else:
directory = os.path.dirname(sfile)
self.targetDirPicker.setText(directory)
-
+
def getData(self):
"""
Public slot to retrieve the dialogs data.
-
+
@return tuple of three values (list of string, string, boolean)
giving the source files, the target directory and a flag
telling, whether the files shall be added as source code
@@ -183,4 +179,5 @@
return (
self.sourceFilesPicker.paths(),
self.targetDirPicker.text(),
- self.sourcecodeCheckBox.isChecked())
+ self.sourcecodeCheckBox.isChecked(),
+ )
