--- a/src/eric7/UI/LogView.py Wed Jul 13 11:16:20 2022 +0200
+++ b/src/eric7/UI/LogView.py Wed Jul 13 14:55:47 2022 +0200
@@ -10,7 +10,12 @@
from PyQt6.QtCore import pyqtSignal, Qt, QRegularExpression
from PyQt6.QtGui import QBrush, QTextCursor, QTextDocument
from PyQt6.QtWidgets import (
- QTextEdit, QApplication, QMenu, QWidget, QHBoxLayout, QSizePolicy
+ QTextEdit,
+ QApplication,
+ QMenu,
+ QWidget,
+ QHBoxLayout,
+ QSizePolicy,
)
from EricWidgets.EricApplication import ericApp
@@ -24,66 +29,70 @@
"""
Class implementing the containing widget for the log viewer.
"""
+
def __init__(self, ui, parent=None):
"""
Constructor
-
+
@param ui reference to the main window (UserInterface)
@param parent reference to the parent widget (QWidget)
"""
super().__init__(parent)
-
+
self.setWindowIcon(UI.PixmapCache.getIcon("eric"))
-
+
self.__ui = ui
-
+
self.__logViewer = LogViewerEdit(self)
from .SearchWidget import SearchWidget
+
self.__searchWidget = SearchWidget(self.__logViewer, self)
self.__searchWidget.setSizePolicy(
- QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Preferred)
+ QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Preferred
+ )
self.__searchWidget.hide()
-
+
self.__layout = QHBoxLayout(self)
self.__layout.setContentsMargins(1, 1, 1, 1)
self.__layout.addWidget(self.__logViewer)
self.__layout.addWidget(self.__searchWidget)
-
+
self.__searchWidget.searchNext.connect(self.__logViewer.searchNext)
self.__searchWidget.searchPrevious.connect(self.__logViewer.searchPrev)
self.__logViewer.searchStringFound.connect(
- self.__searchWidget.searchStringFound)
-
+ self.__searchWidget.searchStringFound
+ )
+
def appendToStdout(self, txt):
"""
Public slot to appand text to the "stdout" tab.
-
+
@param txt text to be appended (string)
"""
added = self.__logViewer.appendToStdout(txt)
if added:
self.__ui.showLogViewer()
-
+
def appendToStderr(self, txt):
"""
Public slot to appand text to the "stderr" tab.
-
+
@param txt text to be appended (string)
"""
added = self.__logViewer.appendToStderr(txt)
if added:
self.__ui.showLogViewer()
-
+
def preferencesChanged(self):
"""
Public slot to handle a change of the preferences.
"""
self.__logViewer.preferencesChanged()
-
+
def showFind(self, txt=""):
"""
Public method to display the search widget.
-
+
@param txt text to be shown in the combo (string)
"""
self.__searchWidget.showFind(txt)
@@ -92,62 +101,62 @@
class LogViewerEdit(QTextEdit):
"""
Class providing a specialized text edit for displaying logging information.
-
+
@signal searchStringFound(found) emitted to indicate the search result
(boolean)
"""
+
searchStringFound = pyqtSignal(bool)
-
+
def __init__(self, parent=None):
"""
Constructor
-
+
@param parent reference to the parent widget (QWidget)
"""
super().__init__(parent)
self.setAcceptRichText(False)
self.setLineWrapMode(QTextEdit.LineWrapMode.NoWrap)
self.setReadOnly(True)
-
+
self.__mainWindow = parent
self.__lastSearch = ()
-
+
# create the context menu
self.__menu = QMenu(self)
- self.__menu.addAction(self.tr('Clear'), self.clear)
- self.__menu.addAction(self.tr('Copy'), self.copy)
+ self.__menu.addAction(self.tr("Clear"), self.clear)
+ self.__menu.addAction(self.tr("Copy"), self.copy)
self.__menu.addSeparator()
- self.__menu.addAction(self.tr('Find'), self.__find)
+ self.__menu.addAction(self.tr("Find"), self.__find)
self.__menu.addSeparator()
- self.__menu.addAction(self.tr('Select All'), self.selectAll)
+ self.__menu.addAction(self.tr("Select All"), self.selectAll)
self.__menu.addSeparator()
self.__menu.addAction(self.tr("Configure..."), self.__configure)
-
+
self.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
self.customContextMenuRequested.connect(self.__handleShowContextMenu)
-
+
self.cNormalFormat = self.currentCharFormat()
self.cErrorFormat = self.currentCharFormat()
- self.cErrorFormat.setForeground(
- QBrush(Preferences.getUI("LogStdErrColour")))
-
+ self.cErrorFormat.setForeground(QBrush(Preferences.getUI("LogStdErrColour")))
+
self.__stdoutFilter = Preferences.getUI("LogViewerStdoutFilter")
self.__stderrFilter = Preferences.getUI("LogViewerStderrFilter")
self.__stdxxxFilter = Preferences.getUI("LogViewerStdxxxFilter")
-
+
def __handleShowContextMenu(self, coord):
"""
Private slot to show the context menu.
-
+
@param coord the position of the mouse pointer (QPoint)
"""
coord = self.mapToGlobal(coord)
self.__menu.popup(coord)
-
+
def __appendText(self, txt, isErrorMessage=False):
"""
Private method to append text to the end.
-
+
@param txt text to insert (string)
@param isErrorMessage flag indicating to insert error text (boolean)
"""
@@ -160,11 +169,11 @@
self.setCurrentCharFormat(self.cNormalFormat)
self.insertPlainText(Utilities.filterAnsiSequences(txt))
self.ensureCursorVisible()
-
+
def __filterMessage(self, message, isErrorMessage=False):
"""
Private method to filter messages.
-
+
@param message message to be checked (string)
@param isErrorMessage flag indicating to check an error message
(boolean)
@@ -172,71 +181,70 @@
(boolean)
"""
message = Utilities.filterAnsiSequences(message)
-
+
filters = (
self.__stderrFilter + self.__stdxxxFilter
- if isErrorMessage else
- self.__stdoutFilter + self.__stdxxxFilter
+ if isErrorMessage
+ else self.__stdoutFilter + self.__stdxxxFilter
)
-
+
return any(msgFilter in message for msgFilter in filters)
-
+
def appendToStdout(self, txt):
"""
Public slot to appand text to the "stdout" tab.
-
+
@param txt text to be appended (string)
@return flag indicating text was appended (boolean)
"""
if self.__filterMessage(txt, isErrorMessage=False):
return False
-
+
self.__appendText(txt, isErrorMessage=False)
QApplication.processEvents()
return True
-
+
def appendToStderr(self, txt):
"""
Public slot to appand text to the "stderr" tab.
-
+
@param txt text to be appended (string)
@return flag indicating text was appended (boolean)
"""
if self.__filterMessage(txt, isErrorMessage=True):
return False
-
+
self.__appendText(txt, isErrorMessage=True)
QApplication.processEvents()
return True
-
+
def preferencesChanged(self):
"""
Public slot to handle a change of the preferences.
"""
- self.cErrorFormat.setForeground(
- QBrush(Preferences.getUI("LogStdErrColour")))
-
+ self.cErrorFormat.setForeground(QBrush(Preferences.getUI("LogStdErrColour")))
+
self.__stdoutFilter = Preferences.getUI("LogViewerStdoutFilter")
self.__stderrFilter = Preferences.getUI("LogViewerStderrFilter")
self.__stdxxxFilter = Preferences.getUI("LogViewerStdxxxFilter")
-
+
def __configure(self):
"""
Private method to open the configuration dialog.
"""
ericApp().getObject("UserInterface").showPreferences("logViewerPage")
-
+
def __find(self):
"""
Private slot to show the find widget.
"""
txt = self.textCursor().selectedText()
self.__mainWindow.showFind(txt)
-
+
def searchNext(self, txt, caseSensitive, wholeWord, regexp):
"""
Public method to search the next occurrence of the given text.
-
+
@param txt text to search for
@type str
@param caseSensitive flag indicating to perform a case sensitive
@@ -255,22 +263,24 @@
if wholeWord:
flags |= QTextDocument.FindFlag.FindWholeWords
ok = (
- self.find(QRegularExpression(
- txt,
- QRegularExpression.PatternOption.NoPatternOption
- if caseSensitive
- else QRegularExpression.PatternOption.CaseInsensitiveOption),
- flags
+ self.find(
+ QRegularExpression(
+ txt,
+ QRegularExpression.PatternOption.NoPatternOption
+ if caseSensitive
+ else QRegularExpression.PatternOption.CaseInsensitiveOption,
+ ),
+ flags,
)
- if regexp else
- self.find(txt, flags)
+ if regexp
+ else self.find(txt, flags)
)
self.searchStringFound.emit(ok)
-
+
def searchPrev(self, txt, caseSensitive, wholeWord, regexp):
"""
Public method to search the previous occurrence of the given text.
-
+
@param txt text to search for
@type str
@param caseSensitive flag indicating to perform a case sensitive
@@ -289,22 +299,24 @@
if wholeWord:
flags |= QTextDocument.FindFlag.FindWholeWords
ok = (
- self.find(QRegularExpression(
- txt,
- QRegularExpression.PatternOption.NoPatternOption
- if caseSensitive
- else QRegularExpression.PatternOption.CaseInsensitiveOption),
- flags
+ self.find(
+ QRegularExpression(
+ txt,
+ QRegularExpression.PatternOption.NoPatternOption
+ if caseSensitive
+ else QRegularExpression.PatternOption.CaseInsensitiveOption,
+ ),
+ flags,
)
- if regexp else
- self.find(txt, flags)
+ if regexp
+ else self.find(txt, flags)
)
self.searchStringFound.emit(ok)
-
+
def keyPressEvent(self, evt):
"""
Protected method handling key press events.
-
+
@param evt key press event (QKeyEvent)
"""
if evt.modifiers() == Qt.KeyboardModifier.ControlModifier:
@@ -321,17 +333,17 @@
evt.accept()
return
elif (
- evt.modifiers() == Qt.KeyboardModifier.NoModifier and
- evt.key() == Qt.Key.Key_F3 and
- self.__lastSearch
+ evt.modifiers() == Qt.KeyboardModifier.NoModifier
+ and evt.key() == Qt.Key.Key_F3
+ and self.__lastSearch
):
self.searchNext(*self.__lastSearch)
evt.accept()
return
elif (
- evt.modifiers() == Qt.KeyboardModifier.ShiftModifier and
- evt.key() == Qt.Key.Key_F3 and
- self.__lastSearch
+ evt.modifiers() == Qt.KeyboardModifier.ShiftModifier
+ and evt.key() == Qt.Key.Key_F3
+ and self.__lastSearch
):
self.searchPrev(*self.__lastSearch)
evt.accept()
