Mercurial Repositories > eric / file comparison
comparison: eric6/QScintilla/Editor.py
eric6/QScintilla/Editor.py
- changeset 7393
- e83e0ba6b90d
- parent 7360
- 9190402e4505
- child 7437
- 1148ca40ea36
- child 7490
- ebd9ae25bb1c
equal
deleted
inserted
replaced
| 7388:e4f3948920a6 | 7393:e83e0ba6b90d |
|---|---|
| 248 # clear QScintilla defined keyboard commands | 248 # clear QScintilla defined keyboard commands |
| 249 # we do our own handling through the view manager | 249 # we do our own handling through the view manager |
| 250 self.clearAlternateKeys() | 250 self.clearAlternateKeys() |
| 251 self.clearKeys() | 251 self.clearKeys() |
| 252 | 252 |
| 253 self.__markerMap = EditorMarkerMap(self) | |
| 254 | |
| 253 # initialize the mark occurrences timer | 255 # initialize the mark occurrences timer |
| 254 self.__markOccurrencesTimer = QTimer(self) | 256 self.__markOccurrencesTimer = QTimer(self) |
| 255 self.__markOccurrencesTimer.setSingleShot(True) | 257 self.__markOccurrencesTimer.setSingleShot(True) |
| 256 self.__markOccurrencesTimer.setInterval( | 258 self.__markOccurrencesTimer.setInterval( |
| 257 Preferences.getEditor("MarkOccurrencesTimeout")) | 259 Preferences.getEditor("MarkOccurrencesTimeout")) |
| 327 | 329 |
| 328 self.changeMarkersMask = ( | 330 self.changeMarkersMask = ( |
| 329 (1 << self.__changeMarkerSaved) | | 331 (1 << self.__changeMarkerSaved) | |
| 330 (1 << self.__changeMarkerUnsaved) | 332 (1 << self.__changeMarkerUnsaved) |
| 331 ) | 333 ) |
| 332 | |
| 333 self.__markerMap = EditorMarkerMap(self) | |
| 334 | 334 |
| 335 # configure the margins | 335 # configure the margins |
| 336 self.__setMarginsDisplay() | 336 self.__setMarginsDisplay() |
| 337 self.linesChanged.connect(self.__resizeLinenoMargin) | 337 self.linesChanged.connect(self.__resizeLinenoMargin) |
| 338 | 338 |
