Mon, 20 Dec 2021 22:06:09 +0100
Made FindLocationWidget more intuitiv:
- Find all files if nothing entered,
- Windows user doesn't need to provide an extension,
- always add wildcard, except user has provided one by himself.
eric7/UI/FindLocationWidget.py | file | annotate | diff | comparison | revisions |
--- a/eric7/UI/FindLocationWidget.py Mon Dec 20 14:51:29 2021 +0100 +++ b/eric7/UI/FindLocationWidget.py Mon Dec 20 22:06:09 2021 +0100 @@ -71,7 +71,6 @@ self.stopButton.clicked.connect(self.__stopSearch) self.stopButton.setIcon(UI.PixmapCache.getIcon("stopLoading")) - self.findButton.setEnabled(False) self.findButton.clicked.connect(self.__searchFile) self.findButton.setIcon(UI.PixmapCache.getIcon("find")) @@ -144,20 +143,17 @@ Private slot to handle the search. """ fileName = self.fileNameEdit.text() - if not fileName: - self.fileList.clear() - return - fileExt = self.fileExtEdit.text() - if not fileExt and Utilities.isWindowsPlatform(): - self.fileList.clear() - return self.findStatusLabel.clear() - patternFormat = fileExt and "{0}{1}{2}" or "{0}*{1}{2}" + if "*" in fileName or "?" in fileName: + patternFormat = "{0}{1}{2}" + else: + patternFormat = "{0}*{1}{2}" + fileNamePattern = patternFormat.format( - fileName, os.extsep, fileExt and fileExt or '*') + fileName or '*', os.extsep, fileExt or '*') searchPaths = [] if ( @@ -228,16 +224,6 @@ return self.__shouldStop @pyqtSlot(str) - def on_fileNameEdit_textChanged(self, text): - """ - Private slot to handle the textChanged signal of the file name edit. - - @param text (ignored) - @type str - """ - self.findButton.setEnabled(bool(text)) - - @pyqtSlot(str) def on_searchDirPicker_textChanged(self, text): """ Private slot to handle the textChanged signal of the search directory