diff -r e9e7eca7efee -r bf71ee032bb4 src/eric7/QScintilla/EditorMarkerMap.py
--- a/src/eric7/QScintilla/EditorMarkerMap.py Wed Jul 13 11:16:20 2022 +0200
+++ b/src/eric7/QScintilla/EditorMarkerMap.py Wed Jul 13 14:55:47 2022 +0200
@@ -16,33 +16,35 @@
"""
Class implementing a class for showing an editor marker map.
"""
+
def __init__(self, parent=None):
"""
Constructor
-
+
@param parent reference to the parent widget (QWidget)
"""
super().__init__(parent)
-
- self.setWhatsThis(self.tr(
- """<b>Editor Map</b>"""
- """<p>This shows a 'map' of the editor. The visible area is"""
- """ highlighted by the box and all markers like bookmarks,"""
- """ breakpoints, errors or changed lines are indicated"""
- """ by differently colored lines configurable via the"""
- """ Editor\u279dStyle page of the configuration dialog.</p>"""
- ))
-
+
+ self.setWhatsThis(
+ self.tr(
+ """<b>Editor Map</b>"""
+ """<p>This shows a 'map' of the editor. The visible area is"""
+ """ highlighted by the box and all markers like bookmarks,"""
+ """ breakpoints, errors or changed lines are indicated"""
+ """ by differently colored lines configurable via the"""
+ """ Editor\u279dStyle page of the configuration dialog.</p>"""
+ )
+ )
+
# initialize colors for various markers
self.initColors()
-
+
def initColors(self):
"""
Public method to initialize the colors.
"""
- self.setBackgroundColor(
- Preferences.getEditorColour("MarkerMapBackground"))
-
+ self.setBackgroundColor(Preferences.getEditorColour("MarkerMapBackground"))
+
self.__bookmarkColor = Preferences.getEditorColour("BookmarksMap")
self.__errorColor = Preferences.getEditorColour("ErrorsMap")
self.__warningColor = Preferences.getEditorColour("WarningsMap")
@@ -51,16 +53,16 @@
self.__coverageColor = Preferences.getEditorColour("CoverageMap")
self.__changeColor = Preferences.getEditorColour("ChangesMap")
self.__currentLineMarker = Preferences.getEditorColour("CurrentMap")
- self.__searchMarkerColor = Preferences.getEditorColour(
- "SearchMarkersMap")
+ self.__searchMarkerColor = Preferences.getEditorColour("SearchMarkersMap")
self.__vcsConflictMarkerColor = Preferences.getEditorColour(
- "VcsConflictMarkersMap")
+ "VcsConflictMarkersMap"
+ )
self.update()
-
+
def __drawIndicator(self, line, painter, color):
"""
Private method to draw an indicator.
-
+
@param line line number (integer)
@param painter reference to the painter (QPainter)
@param color color to be used (QColor)
@@ -70,54 +72,55 @@
painter.setPen(color)
painter.setBrush(color)
painter.drawRect(self.generateIndicatorRect(position))
-
+
def _paintIt(self, painter):
"""
Protected method for painting the widget's indicators.
-
+
@param painter reference to the painter object (QPainter)
"""
# draw indicators in reverse order of priority
-
+
# 1. changes
if Preferences.getEditor("ShowMarkerChanges"):
for line in self._master.getChangeLines():
self.__drawIndicator(line, painter, self.__changeColor)
-
+
# 2. coverage
if Preferences.getEditor("ShowMarkerCoverage"):
for line in self._master.getCoverageLines():
self.__drawIndicator(line, painter, self.__coverageColor)
-
+
# 3. tasks
for line in self._master.getTaskLines():
self.__drawIndicator(line, painter, self.__taskColor)
-
+
# 4. breakpoints
for line in self._master.getBreakpointLines():
self.__drawIndicator(line, painter, self.__breakpointColor)
-
+
# 5. bookmarks
for line in self._master.getBookmarkLines():
self.__drawIndicator(line, painter, self.__bookmarkColor)
-
+
# 6. search markers
if Preferences.getEditor("ShowMarkerSearch"):
for line in self._master.getSearchIndicatorLines():
self.__drawIndicator(line, painter, self.__searchMarkerColor)
-
+
# 7. warnings
for line in self._master.getWarningLines():
self.__drawIndicator(line, painter, self.__warningColor)
-
+
# 8. VCS conflict markers
for line in self._master.getVcsConflictMarkerLines():
self.__drawIndicator(line, painter, self.__vcsConflictMarkerColor)
-
+
# 9. errors
for line in self._master.getSyntaxErrorLines():
self.__drawIndicator(line, painter, self.__errorColor)
-
+
# 10. current line
- self.__drawIndicator(self._master.getCursorPosition()[0], painter,
- self.__currentLineMarker)
+ self.__drawIndicator(
+ self._master.getCursorPosition()[0], painter, self.__currentLineMarker
+ )
