Mercurial Repositories > eric / file comparison
comparison: QScintilla/EditorMarkerMap.py
QScintilla/EditorMarkerMap.py
- changeset 6111
- d38b38117d83
- parent 6048
- 82ad8ec9548c
- child 6645
- ad476851d7e0
equal
deleted
inserted
replaced
| 6110:a7b096ecf963 | 6111:d38b38117d83 |
|---|---|
| 53 self.__coverageColor = Preferences.getEditorColour("CoverageMap") | 53 self.__coverageColor = Preferences.getEditorColour("CoverageMap") |
| 54 self.__changeColor = Preferences.getEditorColour("ChangesMap") | 54 self.__changeColor = Preferences.getEditorColour("ChangesMap") |
| 55 self.__currentLineMarker = Preferences.getEditorColour("CurrentMap") | 55 self.__currentLineMarker = Preferences.getEditorColour("CurrentMap") |
| 56 self.__searchMarkerColor = Preferences.getEditorColour( | 56 self.__searchMarkerColor = Preferences.getEditorColour( |
| 57 "SearchMarkersMap") | 57 "SearchMarkersMap") |
| 58 self.__vcsConflictMarkerColor = Preferences.getEditorColour( | |
| 59 "VcsConflictMarkersMap") | |
| 58 self.update() | 60 self.update() |
| 59 | 61 |
| 60 def __drawIndicator(self, line, painter, color): | 62 def __drawIndicator(self, line, painter, color): |
| 61 """ | 63 """ |
| 62 Private method to draw an indicator. | 64 Private method to draw an indicator. |
| 105 | 107 |
| 106 # 7. warnings | 108 # 7. warnings |
| 107 for line in self._master.getWarningLines(): | 109 for line in self._master.getWarningLines(): |
| 108 self.__drawIndicator(line, painter, self.__warningColor) | 110 self.__drawIndicator(line, painter, self.__warningColor) |
| 109 | 111 |
| 110 # 8. errors | 112 # 8a. VCS conflict markers |
| 113 for line in self._master.getVcsConflictMarkerLines(): | |
| 114 self.__drawIndicator(line, painter, self.__vcsConflictMarkerColor) | |
| 115 | |
| 116 # 8b. errors | |
| 111 for line in self._master.getSyntaxErrorLines(): | 117 for line in self._master.getSyntaxErrorLines(): |
| 112 self.__drawIndicator(line, painter, self.__errorColor) | 118 self.__drawIndicator(line, painter, self.__errorColor) |
| 113 | 119 |
| 114 # 9. current line | 120 # 9. current line |
| 115 self.__drawIndicator(self._master.getCursorPosition()[0], painter, | 121 self.__drawIndicator(self._master.getCursorPosition()[0], painter, |
