Mercurial Repositories > eric / file comparison
comparison: QScintilla/EditorMarkerMap.py
QScintilla/EditorMarkerMap.py
- changeset 6648
- c09e6c6006eb
- parent 6645
- ad476851d7e0
equal
deleted
inserted
replaced
| 6645:ad476851d7e0 | 6648:c09e6c6006eb |
|---|---|
| 80 @param painter reference to the painter object (QPainter) | 80 @param painter reference to the painter object (QPainter) |
| 81 """ | 81 """ |
| 82 # draw indicators in reverse order of priority | 82 # draw indicators in reverse order of priority |
| 83 | 83 |
| 84 # 1. changes | 84 # 1. changes |
| 85 for line in self._master.getChangeLines(): | 85 if Preferences.getEditor("ShowMarkerChanges"): |
| 86 self.__drawIndicator(line, painter, self.__changeColor) | 86 for line in self._master.getChangeLines(): |
| 87 self.__drawIndicator(line, painter, self.__changeColor) | |
| 87 | 88 |
| 88 # 2. coverage | 89 # 2. coverage |
| 89 for line in self._master.getCoverageLines(): | 90 if Preferences.getEditor("ShowMarkerCoverage"): |
| 90 self.__drawIndicator(line, painter, self.__coverageColor) | 91 for line in self._master.getCoverageLines(): |
| 92 self.__drawIndicator(line, painter, self.__coverageColor) | |
| 91 | 93 |
| 92 # 3. tasks | 94 # 3. tasks |
| 93 for line in self._master.getTaskLines(): | 95 for line in self._master.getTaskLines(): |
| 94 self.__drawIndicator(line, painter, self.__taskColor) | 96 self.__drawIndicator(line, painter, self.__taskColor) |
| 95 | 97 |
| 100 # 5. bookmarks | 102 # 5. bookmarks |
| 101 for line in self._master.getBookmarkLines(): | 103 for line in self._master.getBookmarkLines(): |
| 102 self.__drawIndicator(line, painter, self.__bookmarkColor) | 104 self.__drawIndicator(line, painter, self.__bookmarkColor) |
| 103 | 105 |
| 104 # 6. search markers | 106 # 6. search markers |
| 105 for line in self._master.getSearchIndicatorLines(): | 107 if Preferences.getEditor("ShowMarkerSearch"): |
| 106 self.__drawIndicator(line, painter, self.__searchMarkerColor) | 108 for line in self._master.getSearchIndicatorLines(): |
| 109 self.__drawIndicator(line, painter, self.__searchMarkerColor) | |
| 107 | 110 |
| 108 # 7. warnings | 111 # 7. warnings |
| 109 for line in self._master.getWarningLines(): | 112 for line in self._master.getWarningLines(): |
| 110 self.__drawIndicator(line, painter, self.__warningColor) | 113 self.__drawIndicator(line, painter, self.__warningColor) |
| 111 | 114 |
| 112 # 8a. VCS conflict markers | 115 # 8. VCS conflict markers |
| 113 for line in self._master.getVcsConflictMarkerLines(): | 116 for line in self._master.getVcsConflictMarkerLines(): |
| 114 self.__drawIndicator(line, painter, self.__vcsConflictMarkerColor) | 117 self.__drawIndicator(line, painter, self.__vcsConflictMarkerColor) |
| 115 | 118 |
| 116 # 8b. errors | 119 # 9. errors |
| 117 for line in self._master.getSyntaxErrorLines(): | 120 for line in self._master.getSyntaxErrorLines(): |
| 118 self.__drawIndicator(line, painter, self.__errorColor) | 121 self.__drawIndicator(line, painter, self.__errorColor) |
| 119 | 122 |
| 120 # 9. current line | 123 # 10. current line |
| 121 self.__drawIndicator(self._master.getCursorPosition()[0], painter, | 124 self.__drawIndicator(self._master.getCursorPosition()[0], painter, |
| 122 self.__currentLineMarker) | 125 self.__currentLineMarker) |
