eric: comparison UI/FindFileDialog.py

-:96232974dcdb
+:645c12de6b0c
 from .Ui_FindFileDialog import Ui_FindFileDialog
 import Utilities
 import Preferences
+import UI.PixmapCache
 class FindFileDialog(QDialog, Ui_FindFileDialog):
 """
 Class implementing a dialog to search for text in files.
 """
 super(FindFileDialog, self).__init__(parent)
 self.setupUi(self)
 self.setWindowFlags(Qt.WindowFlags(Qt.Window))
+self.dirSelectButton.setIcon(UI.PixmapCache.getIcon("open.png"))
 self.__replaceMode = replaceMode
 self.stopButton = \
-self.buttonBox.addButton(self.trUtf8("Stop"),
+self.buttonBox.addButton(self.tr("Stop"),
 QDialogButtonBox.ActionRole)
 self.stopButton.setEnabled(False)
 self.findButton = \
-self.buttonBox.addButton(self.trUtf8("Find"),
+self.buttonBox.addButton(self.tr("Find"),
 QDialogButtonBox.ActionRole)
 self.findButton.setEnabled(False)
 self.findButton.setDefault(True)
 if self.__replaceMode:
 self.replaceButton.setEnabled(False)
-self.setWindowTitle(self.trUtf8("Replace in Files"))
+self.setWindowTitle(self.tr("Replace in Files"))
 else:
 self.replaceLabel.hide()
 self.replacetextCombo.hide()
 self.replaceButton.hide()
 self.findList.headerItem().setText(self.findList.columnCount(), "")
 self.findList.header().setSortIndicator(0, Qt.AscendingOrder)
 self.__section0Size = self.findList.header().sectionSize(0)
 self.findList.setExpandsOnDoubleClick(False)
 if self.__replaceMode:
-font = self.findList.font()
+font = Preferences.getEditorOtherFonts("MonospacedFont")
-if Utilities.isWindowsPlatform():
-font.setFamily("Lucida Console")
-else:
-font.setFamily("Monospace")
 self.findList.setFont(font)
 # Qt Designer form files
 self.filterForms = r'.*\.ui$'
 self.formsExt = ['*.ui']
 try:
 search = re.compile(txt, flags)
 except re.error as why:
 E5MessageBox.critical(
 self,
-self.trUtf8("Invalid search expression"),
+self.tr("Invalid search expression"),
-self.trUtf8("""<p>The search expression is not valid.</p>"""
+self.tr("""<p>The search expression is not valid.</p>"""
 """<p>Error: {0}</p>""").format(str(why)))
 self.stopButton.setEnabled(False)
 self.findButton.setEnabled(True)
 self.findButton.setDefault(True)
 return
 # reset the findtextCombo
 # now go through all the files
 self.__populating = True
 self.findList.setUpdatesEnabled(False)
 progress = 0
 breakSearch = False
+occurrences = 0
+fileOccurrences = 0
 for file in files:
 self.__lastFileItem = None
+found = False
 if self.__cancelSearch or breakSearch:
 break
 self.findProgressLabel.setPath(file)
 break
 count += 1
 contains = search.search(line)
 if contains:
+occurrences += 1
+found = True
 start = contains.start()
 end = contains.end()
 if self.__replaceMode:
 rline = search.sub(replTxt, line)
 else:
 breakSearch = True
 break
 QApplication.processEvents()
+if found:
+fileOccurrences += 1
 progress += 1
 self.findProgress.setValue(progress)
 if not files:
 self.findProgress.setMaximum(1)
 self.findProgress.setValue(1)
-self.findProgressLabel.setPath("")
+resultFormat = self.tr("{0} / {1}", "occurrences / files")
+self.findProgressLabel.setPath(resultFormat.format(
+self.tr("%n occurrence(s)", "", occurrences),
+self.tr("%n file(s)", "", fileOccurrences)))
 self.findList.setUpdatesEnabled(True)
 self.findList.sortItems(self.findList.sortColumn(),
 self.findList.header().sortIndicatorOrder())
 self.findList.resizeColumnToContents(1)
 """
 Private slot to display a directory selection dialog.
 """
 directory = E5FileDialog.getExistingDirectory(
 self,
-self.trUtf8("Select directory"),
+self.tr("Select directory"),
 self.dirCombo.currentText(),
 E5FileDialog.Options(E5FileDialog.ShowDirsOnly))
 if directory:
 self.dirCombo.setEditText(Utilities.toNativeSeparators(directory))
 Utilities.readEncodedFileWithHash(fn)
 lines = text.splitlines(True)
 except (UnicodeError, IOError) as err:
 E5MessageBox.critical(
 self,
-self.trUtf8("Replace in Files"),
+self.tr("Replace in Files"),
-self.trUtf8(
+self.tr(
 """<p>Could not read the file <b>{0}</b>."""
 """ Skipping it.</p><p>Reason: {1}</p>""")
 .format(fn, str(err))
 )
 progress += 1
 # 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.tr("Replace in Files"),
-self.trUtf8(
+self.tr(
 """<p>The current and the original hash of the"""
 """ file <b>{0}</b> are different. Skipping it."""
 """</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p>""")
 .format(fn, origHash, hash)
 )
 try:
 Utilities.writeEncodedFile(fn, txt, encoding)
 except (IOError, Utilities.CodingError, UnicodeError) as err:
 E5MessageBox.critical(
 self,
-self.trUtf8("Replace in Files"),
+self.tr("Replace in Files"),
-self.trUtf8(
+self.tr(
 """<p>Could not save the file <b>{0}</b>."""
 """ Skipping it.</p><p>Reason: {1}</p>""")
 .format(fn, str(err))
 )
 @param pos position the context menu shall be shown (QPoint)
 """
 menu = QMenu(self)
-menu.addAction(self.trUtf8("Open"), self.__openFile)
+menu.addAction(self.tr("Open"), self.__openFile)
-menu.addAction(self.trUtf8("Copy Path to Clipboard"),
+menu.addAction(self.tr("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