eric: comparison QScintilla/Editor.py

-:15aaa8d3a840
+:1ee38e29ed4f
 QMenu, QPalette, QFont, QPixmap, QPainter
 from PyQt4.Qsci import QsciScintilla, QsciMacro, QsciStyledText
 from E5Gui.E5Application import e5App
 from E5Gui import E5FileDialog, E5MessageBox
-from E5Gui.E5MapWidget import E5MapWidget
 from .QsciScintillaCompat import QsciScintillaCompat, QSCINTILLA_VERSION
+from .EditorMarkerMap import EditorMarkerMap
 import Preferences
 import Utilities
 import UI.PixmapCache
 (1 << self.dbreakpoint)
 self.changeMarkersMask = (1 << self.__changeMarkerSaved) | \
 (1 << self.__changeMarkerUnsaved)
-self.__markerMap = E5MapWidget(self)
+self.__markerMap = EditorMarkerMap(self)
 # configure the margins
 self.__setMarginsDisplay()
 self.linesChanged.connect(self.__resizeLinenoMargin)
 self.project.isProjectSource(self.fileName):
 self.project.projectPropertiesChanged.connect(
 self.__projectPropertiesChanged)
 self.grabGesture(Qt.PinchGesture)
+self.SCN_ZOOM.connect(self.__markerMap.update)
+self.__markerMap.update()
 def __registerImages(self):
 """
 Private method to register images for autocompletion lists.
 """
 doSpelling = False
 if doSpelling:
 pos = self.positionFromLineIndex(self.lastLine, self.lastIndex)
 self.spell.checkWord(pos)
+if self.lastLine != line:
+self.__markerMap.update()
 self.lastLine = line
 self.lastIndex = index
 def __modificationReadOnly(self):
 """
 """
 for handle in list(self.breaks.keys()):
 self.markerDeleteHandle(handle)
 self.__addBreakPoints(
 QModelIndex(), 0, self.breakpointModel.rowCount() - 1)
+self.__markerMap.update()
 def __deleteBreakPoints(self, parentIndex, start, end):
 """
 Private slot to delete breakpoints.
 # not found, simply ignore it
 return
 del self.breaks[handle]
 self.markerDeleteHandle(handle)
+self.__markerMap.update()
 def newBreakpointWithProperties(self, line, properties):
 """
 Private method to set a new breakpoint and its properties.
 if self.markersAtLine(line - 1) & self.breakpointMask == 0:
 handle = self.markerAdd(line - 1, marker)
 self.breaks[handle] = (line,) + properties
 self.breakpointToggled.emit(self)
+self.__markerMap.update()
 def __toggleBreakpoint(self, line, temporary=False):
 """
 Private method to toggle a breakpoint.
 @param line line number of the bookmark (integer)
 """
 for handle in self.bookmarks:
 if self.markerLine(handle) == line - 1:
+self.bookmarks.remove(handle)
+self.markerDeleteHandle(handle)
 break
 else:
 # set a new bookmark
 handle = self.markerAdd(line - 1, self.bookmark)
 self.bookmarks.append(handle)
-self.bookmarkToggled.emit(self)
-return
-self.bookmarks.remove(handle)
-self.markerDeleteHandle(handle)
 self.bookmarkToggled.emit(self)
+self.__markerMap.update()
 def getBookmarks(self):
 """
 Public method to retrieve the bookmarks.
 """
 for handle in self.bookmarks:
 self.markerDeleteHandle(handle)
 self.bookmarks = []
 self.bookmarkToggled.emit(self)
+self.__markerMap.update()
 ###########################################################################
 ## Printing methods below
 ###########################################################################
 shouldBreak = True
 break
 if shouldBreak:
 break
 self.taskMarkersUpdated.emit(self)
+self.__markerMap.update()
 ###########################################################################
 ## Change tracing methods below
 ###########################################################################
 self.markerAdd(lineNo, self.__changeMarkerUnsaved)
 self.__hasChangeMarkers = True
 if self.__hasChangeMarkers:
 self.changeMarkersUpdated.emit(self)
+self.__markerMap.update()
 def __resetOnlineChangeTraceInfo(self):
 """
 Private slot to reset the online change trace info.
 """
 self.markerAdd(lineNo, self.__changeMarkerSaved)
 self.__hasChangeMarkers = True
 if self.__hasChangeMarkers:
 self.changeMarkersUpdated.emit(self)
+self.__markerMap.update()
 def __deleteAllChangeMarkers(self):
 """
 Private slot to delete all change markers.
 """
 self.markerDeleteAll(self.__changeMarkerUnsaved)
 self.markerDeleteAll(self.__changeMarkerSaved)
 self.__hasChangeMarkers = False
 self.changeMarkersUpdated.emit(self)
+self.__markerMap.update()
 def getChangeLines(self):
 """
 Public method to get the lines containing a change.
 missing = cover.analysis2(self.fileName)[3]
 if missing:
 for line in missing:
 handle = self.markerAdd(line - 1, self.notcovered)
 self.notcoveredMarkers.append(handle)
 self.coverageMarkersShown.emit(True)
+self.__markerMap.update()
 else:
 if not silent:
 E5MessageBox.information(
 self,
 self.tr("Show Code Coverage Annotations"),
 for handle in self.notcoveredMarkers:
 self.markerDeleteHandle(handle)
 self.notcoveredMarkers = []
 self.coverageMarkersShown.emit(False)
 self.showingNotcoveredMarkers = False
+self.__markerMap.update()
 def getCoverageLines(self):
 """
 Public method to get the lines containing a coverage marker.
 del self.syntaxerrors[handle]
 self.markerDeleteHandle(handle)
 self.syntaxerrorToggled.emit(self)
 self.__setAnnotation(line - 1)
+self.__markerMap.update()
 def getSyntaxErrors(self):
 """
 Public method to retrieve the syntax error markers.
 del self.warnings[handle]
 self.markerDeleteHandle(handle)
 self.syntaxerrorToggled.emit(self)
 self.__setAnnotation(line - 1)
+self.__markerMap.update()
 def getWarnings(self):
 """
 Public method to retrieve the warning markers.
 else:
 del self.warnings[handle]
 self.__setAnnotation(self.markerLine(handle))
 self.markerDeleteHandle(handle)
 self.syntaxerrorToggled.emit(self)
+self.__markerMap.update()
 def clearWarnings(self):
 """
 Public slot to clear all warnings.
 """
 self.warnings[handle] = []
 self.__setAnnotation(self.markerLine(handle))
 self.markerDeleteHandle(handle)
 self.warnings = {}
 self.syntaxerrorToggled.emit(self)
+self.__markerMap.update()
 def __showWarning(self, line=-1):
 """
 Private slot to handle the 'Show warning' context menu action.
 self.toggleBookmark(bm)
 self.__restoreBreakpoints()
 self.editorSaved.emit(self.fileName)
 self.__autoSyntaxCheck(useText=False)
+self.__markerMap.update()
 self.refreshed.emit()
 def setMonospaced(self, on):
 """

Mercurial Repositories > eric / file comparison

comparison: QScintilla/Editor.py

QScintilla/Editor.py