211 self.markerDefine(UI.PixmapCache.getPixmap("syntaxError.png")) |
211 self.markerDefine(UI.PixmapCache.getPixmap("syntaxError.png")) |
212 self.notcovered = \ |
212 self.notcovered = \ |
213 self.markerDefine(UI.PixmapCache.getPixmap("notcovered.png")) |
213 self.markerDefine(UI.PixmapCache.getPixmap("notcovered.png")) |
214 self.taskmarker = \ |
214 self.taskmarker = \ |
215 self.markerDefine(UI.PixmapCache.getPixmap("task.png")) |
215 self.markerDefine(UI.PixmapCache.getPixmap("task.png")) |
|
216 self.warning = \ |
|
217 self.markerDefine(UI.PixmapCache.getPixmap("warning.png")) |
216 |
218 |
217 # define the line markers |
219 # define the line markers |
218 self.currentline = self.markerDefine(QsciScintilla.Background) |
220 self.currentline = self.markerDefine(QsciScintilla.Background) |
219 self.errorline = self.markerDefine(QsciScintilla.Background) |
221 self.errorline = self.markerDefine(QsciScintilla.Background) |
220 self.__setLineMarkerColours() |
222 self.__setLineMarkerColours() |
3146 (1 << self.currentline) | \ |
3148 (1 << self.currentline) | \ |
3147 (1 << self.errorline) | \ |
3149 (1 << self.errorline) | \ |
3148 (1 << self.bookmark) | \ |
3150 (1 << self.bookmark) | \ |
3149 (1 << self.syntaxerror) | \ |
3151 (1 << self.syntaxerror) | \ |
3150 (1 << self.notcovered) | \ |
3152 (1 << self.notcovered) | \ |
3151 (1 << self.taskmarker) |
3153 (1 << self.taskmarker) | \ |
|
3154 (1 << self.warning) |
3152 self.setMarginWidth(1, 16) |
3155 self.setMarginWidth(1, 16) |
3153 self.setMarginSensitivity(1, True) |
3156 self.setMarginSensitivity(1, True) |
3154 self.setMarginMarkerMask(1, margin1Mask) |
3157 self.setMarginMarkerMask(1, margin1Mask) |
3155 |
3158 |
3156 self.__linenoMargin = 0 |
3159 self.__linenoMargin = 0 |
3179 self.setMarginSensitivity(self.__bpMargin, True) |
3182 self.setMarginSensitivity(self.__bpMargin, True) |
3180 self.setMarginMarkerMask(self.__bpMargin, marginBpMask) |
3183 self.setMarginMarkerMask(self.__bpMargin, marginBpMask) |
3181 |
3184 |
3182 marginIndicMask = (1 << self.syntaxerror) | \ |
3185 marginIndicMask = (1 << self.syntaxerror) | \ |
3183 (1 << self.notcovered) | \ |
3186 (1 << self.notcovered) | \ |
3184 (1 << self.taskmarker) |
3187 (1 << self.taskmarker) | \ |
|
3188 (1 << self.warning) |
3185 self.setMarginWidth(self.__indicMargin, 16) |
3189 self.setMarginWidth(self.__indicMargin, 16) |
3186 self.setMarginSensitivity(self.__indicMargin, True) |
3190 self.setMarginSensitivity(self.__indicMargin, True) |
3187 self.setMarginMarkerMask(self.__indicMargin, marginIndicMask) |
3191 self.setMarginMarkerMask(self.__indicMargin, marginIndicMask) |
3188 |
3192 |
3189 # set linenumber margin settings |
3193 # set linenumber margin settings |