eric: comparison UI/FindFileDialog.py

-:0e937d523b70
+:869c200be26e
 class FindFileDialog(QDialog, Ui_FindFileDialog):
 """
 Class implementing a dialog to search for text in files.
-The occurrences found are displayed in a QTreeWidget showing the filename, the
+The occurrences found are displayed in a QTreeWidget showing the filename,
-linenumber and the found text. The file will be opened upon a double click onto
+the linenumber and the found text. The file will be opened upon a double
-the respective entry of the list.
+click onto the respective entry of the list.
-@signal sourceFile(str, int, str, int, int) emitted to open a source file at a line
+@signal sourceFile(str, int, str, int, int) emitted to open a source file
+at a line
 @signal designerFile(str) emitted to open a Qt-Designer file
 """
 sourceFile = pyqtSignal(str, int, str, int, int)
 designerFile = pyqtSignal(str)
 self.setWindowFlags(Qt.WindowFlags(Qt.Window))
 self.__replaceMode = replaceMode
 self.stopButton = \
-self.buttonBox.addButton(self.trUtf8("Stop"), QDialogButtonBox.ActionRole)
+self.buttonBox.addButton(self.trUtf8("Stop"),
+QDialogButtonBox.ActionRole)
 self.stopButton.setEnabled(False)
 self.findButton = \
-self.buttonBox.addButton(self.trUtf8("Find"), QDialogButtonBox.ActionRole)
+self.buttonBox.addButton(self.trUtf8("Find"),
+QDialogButtonBox.ActionRole)
 self.findButton.setEnabled(False)
 self.findButton.setDefault(True)
 if self.__replaceMode:
 self.replaceButton.setEnabled(False)
 self.replaceButton.hide()
 self.findProgressLabel.setMaximumWidth(550)
 self.searchHistory = Preferences.toList(
-Preferences.Prefs.settings.value("FindFileDialog/SearchHistory"))
+Preferences.Prefs.settings.value(
+"FindFileDialog/SearchHistory"))
 self.replaceHistory = Preferences.toList(
-Preferences.Prefs.settings.value("FindFileDialog/ReplaceHistory"))
+Preferences.Prefs.settings.value(
+"FindFileDialog/ReplaceHistory"))
 self.dirHistory = Preferences.toList(
-Preferences.Prefs.settings.value("FindFileDialog/DirectoryHistory"))
+Preferences.Prefs.settings.value(
+"FindFileDialog/DirectoryHistory"))
 self.findtextCombo.addItems(self.searchHistory)
 self.replacetextCombo.addItems(self.replaceHistory)
 self.dirCombo.addItems(self.dirHistory)
 self.project = project
 self.__populating = False
 self.setContextMenuPolicy(Qt.CustomContextMenu)
 self.customContextMenuRequested.connect(self.__contextMenuRequested)
-def __createItem(self, file, line, text, start, end, replTxt = "", md5 = ""):
+def __createItem(self, file, line, text, start, end, replTxt="", md5=""):
 """
 Private method to create an entry in the file list.
 @param file filename of file (string)
 @param line line number (integer)
 self.__lastFileItem.setExpanded(True)
 if self.__replaceMode:
 self.__lastFileItem.setFlags(self.__lastFileItem.flags() | \
 Qt.ItemFlags(Qt.ItemIsUserCheckable | Qt.ItemIsTristate))
 # Qt bug:
-# item is not user checkable if setFirstColumnSpanned is True (< 4.5.0)
+# item is not user checkable if setFirstColumnSpanned
+# is True (< 4.5.0)
 self.__lastFileItem.setData(0, self.md5Role, md5)
-itm = QTreeWidgetItem(self.__lastFileItem, [' {0:5d} '.format(line), text])
+itm = QTreeWidgetItem(self.__lastFileItem,
+[' {0:5d} '.format(line), text])
 itm.setTextAlignment(0,  Qt.AlignRight)
 itm.setData(0, self.lineRole, line)
 itm.setData(0, self.startRole, start)
 itm.setData(0, self.endRole, end)
 itm.setData(0, self.replaceRole, replTxt)
 QDialog.show(self)
 def on_findtextCombo_editTextChanged(self, text):
 """
-Private slot to handle the editTextChanged signal of the find text combo.
+Private slot to handle the editTextChanged signal of the find
+text combo.
 @param text (ignored)
 """
 self.__enableFindButton()
 def on_replacetextCombo_editTextChanged(self, text):
 """
-Private slot to handle the editTextChanged signal of the replace text combo.
+Private slot to handle the editTextChanged signal of the replace
+text combo.
 @param text (ignored)
 """
 self.__enableFindButton()
 def on_dirCombo_editTextChanged(self, text):
 """
-Private slot to handle the textChanged signal of the directory combo box.
+Private slot to handle the textChanged signal of the directory
+combo box.
 @param text (ignored)
 """
 self.__enableFindButton()
 def __enableFindButton(self):
 """
 Private slot called to enable the find button.
 """
 if self.findtextCombo.currentText() == "" or \
-(self.__replaceMode and self.replacetextCombo.currentText() == "") or \
+(self.__replaceMode and \
+self.replacetextCombo.currentText() == "") or \
 (self.dirButton.isChecked() and \
 (self.dirCombo.currentText() == "" or \
-not os.path.exists(os.path.abspath(self.dirCombo.currentText())))) or \
+not os.path.exists(os.path.abspath(
+self.dirCombo.currentText())))) or \
 (self.filterCheckBox.isChecked() and self.filterEdit.text() == ""):
 self.findButton.setEnabled(False)
 self.buttonBox.button(QDialogButtonBox.Close).setDefault(True)
 else:
 self.findButton.setEnabled(True)
 def __doSearch(self):
 """
 Private slot to handle the find button being pressed.
 """
-if self.__replaceMode and not e5App().getObject("ViewManager").checkAllDirty():
+if self.__replaceMode and \
+not e5App().getObject("ViewManager").checkAllDirty():
 return
 self.__cancelSearch = False
 if self.filterCheckBox.isChecked():
 if self.projectButton.isChecked():
 if self.filterCheckBox.isChecked():
 files = [self.project.getRelativePath(file) \
 for file in \
-self.__getFileList(self.project.getProjectPath(), filterRe)]
+self.__getFileList(
+self.project.getProjectPath(), filterRe)]
 else:
 files = []
 if self.sourcesCheckBox.isChecked():
 files += self.project.pdata["SOURCES"]
 if self.formsCheckBox.isChecked():
 elif self.dirButton.isChecked():
 if not self.filterCheckBox.isChecked():
 filters = []
 if self.sourcesCheckBox.isChecked():
 filters.extend(
-["^{0}$".format(assoc.replace(".", "\.").replace("*", ".*")) \
+["^{0}$".format(
-for assoc in list(Preferences.getEditorLexerAssocs().keys()) \
+assoc.replace(".", "\.").replace("*", ".*"))
+for assoc in list(
+Preferences.getEditorLexerAssocs().keys())
 if assoc not in self.formsExt + self.interfacesExt])
 if self.formsCheckBox.isChecked():
 filters.append(self.filterForms)
 if self.interfacesCheckBox.isChecked():
 filters.append(self.filterInterfaces)
 if self.resourcesCheckBox.isChecked():
 filters.append(self.filterResources)
 filterString = "|".join(filters)
 filterRe = re.compile(filterString)
-files = self.__getFileList(os.path.abspath(self.dirCombo.currentText()),
+files = self.__getFileList(
-filterRe)
+os.path.abspath(self.dirCombo.currentText()),
+filterRe)
 elif self.openFilesButton.isChecked():
 files = e5App().getObject("ViewManager").getOpenFilenames()
 self.findList.clear()
 QApplication.processEvents()
 if ct in self.searchHistory:
 self.searchHistory.remove(ct)
 self.searchHistory.insert(0, ct)
 self.findtextCombo.clear()
 self.findtextCombo.addItems(self.searchHistory)
-Preferences.Prefs.settings.setValue("FindFileDialog/SearchHistory",
+Preferences.Prefs.settings.setValue(
-self.searchHistory[:30])
+"FindFileDialog/SearchHistory",
+self.searchHistory[:30])
 if self.__replaceMode:
 replTxt = self.replacetextCombo.currentText()
 if replTxt in self.replaceHistory:
 self.replaceHistory.remove(replTxt)
 self.replaceHistory.insert(0, replTxt)
 self.replacetextCombo.clear()
 self.replacetextCombo.addItems(self.replaceHistory)
-Preferences.Prefs.settings.setValue("FindFileDialog/ReplaceHistory",
+Preferences.Prefs.settings.setValue(
-self.replaceHistory[:30])
+"FindFileDialog/ReplaceHistory",
+self.replaceHistory[:30])
 if self.dirButton.isChecked():
 searchDir = self.dirCombo.currentText()
 if searchDir in self.dirHistory:
 self.dirHistory.remove(searchDir)
 self.dirHistory.insert(0, searchDir)
 self.dirCombo.clear()
 self.dirCombo.addItems(self.dirHistory)
-Preferences.Prefs.settings.setValue("FindFileDialog/DirectoryHistory",
+Preferences.Prefs.settings.setValue(
-self.dirHistory[:30])
+"FindFileDialog/DirectoryHistory",
+self.dirHistory[:30])
 # set the button states
 self.stopButton.setEnabled(True)
 self.stopButton.setDefault(True)
 self.findButton.setEnabled(False)
 line = "{0} ...".format(line[:1024])
 if self.__replaceMode:
 if len(rline) > 1024:
 rline = "{0} ...".format(line[:1024])
 line = "- {0}\n+ {1}".format(line, rline)
-self.__createItem(file, count, line, start, end, rline, hash)
+self.__createItem(file, count, line, start, end,
+rline, hash)
 if self.feelLikeCheckBox.isChecked():
 fn = os.path.join(self.project.ppath, file)
 self.sourceFile.emit(fn, count, "", start, end)
 QApplication.processEvents()
 def __getFileList(self, path, filterRe):
 """
 Private method to get a list of files to search.
 @param path the root directory to search in (string)
-@param filterRe regular expression defining the filter criteria (regexp object)
+@param filterRe regular expression defining the filter
+criteria (regexp object)
 @return list of files to be processed (list of strings)
 """
 path = os.path.abspath(path)
 files = []
 for dirname, _, names in os.walk(path):
 else:
 fn = file
 # read the file and split it into textlines
 try:
-text, encoding, hash = Utilities.readEncodedFileWithHash(fn)
+text, encoding, hash = \
+Utilities.readEncodedFileWithHash(fn)
 lines = text.splitlines()
 except (UnicodeError, IOError):
 E5MessageBox.critical(self,
 self.trUtf8("Replace in Files"),
-self.trUtf8("""<p>Could not read the file <b>{0}</b>."""
+self.trUtf8(
-""" Skipping it.</p><p>Reason: {1}</p>""")\
+"""<p>Could not read the file <b>{0}</b>."""
+""" Skipping it.</p><p>Reason: {1}</p>""")\
 .format(fn, str(err))
 )
 progress += 1
 self.findProgress.setValue(progress)
 continue
 # Check the original and the current hash. Skip the file,
 # if hashes are different.
 if origHash != hash:
 E5MessageBox.critical(self,
 self.trUtf8("Replace in Files"),
-self.trUtf8("""<p>The current and the original hash of the"""
+self.trUtf8(
-""" file <b>{0}</b> are different. Skipping it."""
+"""<p>The current and the original hash of the"""
-"""</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p>""")\
+""" file <b>{0}</b> are different. Skipping it."""
+"""</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p>""")\
 .format(fn, origHash, hash)
 )
 progress += 1
 self.findProgress.setValue(progress)
 continue
 line = citm.data(0, self.lineRole)
 rline = citm.data(0, self.replaceRole)
 lines[line - 1] = rline
 # write the file
-txt = Utilities.linesep().join(lines) + Utilities.linesep()
+if self.project.isProjectFile(fn):
+eol = self.project.getEolString()
+else:
+eol = Utilities.linesep()
+txt = eol.join(lines) + Utilities.linesep()
 try:
 Utilities.writeEncodedFile(fn, txt, encoding)
 except (IOError, Utilities.CodingError, UnicodeError) as err:
 E5MessageBox.critical(self,
 self.trUtf8("Replace in Files"),
-self.trUtf8("""<p>Could not save the file <b>{0}</b>."""
+self.trUtf8(
-""" Skipping it.</p><p>Reason: {1}</p>""")\
+"""<p>Could not save the file <b>{0}</b>."""
+""" Skipping it.</p><p>Reason: {1}</p>""")\
 .format(fn, str(err))
 )
 progress += 1
 self.findProgress.setValue(progress)
 @param pos position the context menu shall be shown (QPoint)
 """
 menu = QMenu(self)
 menu.addAction(self.trUtf8("Open"), self.__openFile)
-menu.addAction(self.trUtf8("Copy Path to Clipboard"), self.__copyToClipboard)
+menu.addAction(self.trUtf8("Copy Path to Clipboard"),
+self.__copyToClipboard)
 menu.exec_(QCursor.pos())
 def __openFile(self):
 """

Mercurial Repositories > eric / file comparison

comparison: UI/FindFileDialog.py

UI/FindFileDialog.py