eric: comparison src/eric7/QScintilla/Editor.py

-:904f4c7da759
+:c685f4e12916
 )
 self.__markOccurrencesTimer.timeout.connect(self.__markOccurrences)
 self.__markedText = ""
 self.__searchIndicatorLines = []
+# set the autosave attributes
+self.__autosaveInterval = Preferences.getEditor("AutosaveIntervalSeconds")
+self.__autosaveManuallyDisabled = False
+# initialize the autosave timer
+self.__autosaveTimer = QTimer(self)
+self.__autosaveTimer.setObjectName("AutosaveTimer")
+self.__autosaveTimer.setSingleShot(True)
+self.__autosaveTimer.timeout.connect(self.__autosave)
 # initialize some spellchecking stuff
 self.spell = None
 self.lastLine = 0
 self.lastIndex = 0
 self.__inSpellLanguageChanged = False
 bnd = req.boundedTo(self.vm.size())
 if bnd.width() < req.width() or bnd.height() < req.height():
 self.resize(bnd)
-# set the autosave flag
-self.autosaveEnabled = Preferences.getEditor("AutosaveInterval") > 0
-self.autosaveManuallyDisabled = False
 # code coverage related attributes
 self.__coverageFile = ""
 self.__initContextMenu()
 self.__initContextMenuMargins()
 self.menuActs["MonospacedFont"].setChecked(self.useMonospaced)
 self.menuActs["AutosaveEnable"] = self.menu.addAction(
 self.tr("Autosave enabled"), self.__autosaveEnable
 )
 self.menuActs["AutosaveEnable"].setCheckable(True)
-self.menuActs["AutosaveEnable"].setChecked(self.autosaveEnabled)
+self.menuActs["AutosaveEnable"].setChecked(self.__autosaveInterval > 0)
 self.menuActs["TypingAidsEnabled"] = self.menu.addAction(
 self.tr("Typing aids enabled"), self.__toggleTypingAids
 )
 self.menuActs["TypingAidsEnabled"].setCheckable(True)
 self.menuActs["TypingAidsEnabled"].setEnabled(self.completer is not None)
 self.lastModified = pathlib.Path(self.fileName).stat().st_mtime
 self.modificationStatusChanged.emit(m, self)
 self.undoAvailable.emit(self.isUndoAvailable())
 self.redoAvailable.emit(self.isRedoAvailable())
+if not m:
+self.__autosaveTimer.stop()
 @pyqtSlot(int, int)
 def __cursorPositionChanged(self, line, index):
 """
 Private slot to handle the cursorPositionChanged signal.
 @type int
 """
 self.cursorChanged.emit(self.fileName, line + 1, index)
 if Preferences.getEditor("MarkOccurrencesEnabled"):
-self.__markOccurrencesTimer.stop()
 self.__markOccurrencesTimer.start()
 if self.lastLine != line:
 self.cursorLineChanged.emit(line)
 @param foldPrev previous fold level (integer)
 @param token ???
 @param annotationLinesAdded number of added/deleted annotation lines
 (integer)
 """
-if (
+if mtype & (self.SC_MOD_INSERTTEXT | self.SC_MOD_DELETETEXT):
-mtype & (self.SC_MOD_INSERTTEXT | self.SC_MOD_DELETETEXT)
+# 1. set/reset the autosave timer
-and linesAdded != 0
+if self.__autosaveInterval > 0:
-and self.breaks
+self.__autosaveTimer.start(self.__autosaveInterval * 1000)
-):
-bps = []  # list of breakpoints
+# 2. move breakpoints if a line was inserted or deleted
-for handle, (ln, cond, temp, enabled, ignorecount) in self.breaks.items():
+if linesAdded != 0 and self.breaks:
-line = self.markerLine(handle) + 1
+bps = []  # list of breakpoints
-if ln != line:
+for handle, (
-bps.append((ln, line))
+ln,
-self.breaks[handle] = (line, cond, temp, enabled, ignorecount)
+cond,
-self.inLinesChanged = True
+temp,
-for ln, line in sorted(bps, reverse=linesAdded > 0):
+enabled,
-index1 = self.breakpointModel.getBreakPointIndex(self.fileName, ln)
+ignorecount,
-index2 = self.breakpointModel.index(index1.row(), 1)
+) in self.breaks.items():
-self.breakpointModel.setData(index2, line)
+line = self.markerLine(handle) + 1
-self.inLinesChanged = False
+if ln != line:
+bps.append((ln, line))
+self.breaks[handle] = (line, cond, temp, enabled, ignorecount)
+self.inLinesChanged = True
+for ln, line in sorted(bps, reverse=linesAdded > 0):
+index1 = self.breakpointModel.getBreakPointIndex(self.fileName, ln)
+index2 = self.breakpointModel.index(index1.row(), 1)
+self.breakpointModel.setData(index2, line)
+self.inLinesChanged = False
 def __restoreBreakpoints(self):
 """
 Private method to restore the breakpoints.
 """
 else:
 fn = self.fileName
 self.__loadEditorConfig(fn)
 self.editorAboutToBeSaved.emit(self.fileName)
+if self.__autosaveTimer.isActive():
+self.__autosaveTimer.stop()
 if self.writeFile(fn):
 if saveas:
 self.__clearBreakpoints(self.fileName)
 self.setFileName(fn)
 self.setModified(False)
 # set the calltips function
 self.__setCallTips()
 # set the autosave flags
-self.autosaveEnabled = Preferences.getEditor("AutosaveInterval") > 0
+self.__autosaveInterval = Preferences.getEditor("AutosaveIntervalSeconds")
+if self.__autosaveInterval == 0:
+self.__autosaveTimer.stop()
+else:
+if self.isModified():
+self.__autosaveTimer.start(self.__autosaveInterval * 1000)
 if Preferences.getEditor("MiniContextMenu") != self.miniMenu:
 # regenerate context menu
 self.__initContextMenu()
 else:
 self.menuActs["AutoCompletionEnable"].setChecked(
 self.autoCompletionThreshold() != -1
 )
 self.menuActs["MonospacedFont"].setChecked(self.useMonospaced)
 self.menuActs["AutosaveEnable"].setChecked(
-self.autosaveEnabled and not self.autosaveManuallyDisabled
+self.__autosaveInterval > 0 and not self.__autosaveManuallyDisabled
 )
 # regenerate the margins context menu(s)
 self.__initContextMenuMargins()
 def __autosaveEnable(self):
 """
 Private slot handling the autosave enable context menu action.
 """
 if self.menuActs["AutosaveEnable"].isChecked():
-self.autosaveManuallyDisabled = False
+self.__autosaveManuallyDisabled = False
 else:
-self.autosaveManuallyDisabled = True
+self.__autosaveManuallyDisabled = True
-def shouldAutosave(self):
+def __shouldAutosave(self):
 """
-Public method to check the autosave flags.
+Private method to check the autosave flags.
 @return flag indicating this editor should be saved (boolean)
 """
 return (
 bool(self.fileName)
-and not self.autosaveManuallyDisabled
+and not self.__autosaveManuallyDisabled
 and not self.isReadOnly()
-)
+and self.isModified()
+)
+def __autosave(self):
+"""
+Private slot to save the contents of the editor automatically.
+It is only saved by the autosave timer after an initial save (i.e. it already
+has a name).
+"""
+if self.__shouldAutosave():
+self.saveFile()
 def checkSyntax(self):
 """
 Public method to perform an automatic syntax check of the file.
 """
 warn = (msg, warningType)
 markers = self.markersAtLine(line - 1)
 if not (markers & (1 << self.warning)):
 handle = self.markerAdd(line - 1, self.warning)
 self._warnings[handle] = [warn]
+self.syntaxerrorToggled.emit(self)
+# signal is also used for warnings
 else:
 for handle in self._warnings:
 if (
 self.markerLine(handle) == line - 1
 and warn not in self._warnings[handle]
 else:
 for handle in list(self._warnings.keys()):
 if self.markerLine(handle) == line - 1:
 del self._warnings[handle]
 self.markerDeleteHandle(handle)
+self.syntaxerrorToggled.emit(self)
+# signal is also used for warnings
 self.__setAnnotation(line - 1)
 self.__markerMap.update()
 def getWarningLines(self):
 Protected method called when the editor loses focus.
 @param event the event object
 @type QFocusEvent
 """
+if Preferences.getEditor("AutosaveOnFocusLost") and self.__shouldAutosave():
+self.saveFile()
 self.vm.editorActGrp.setEnabled(False)
 self.setCaretWidth(0)
 self.cancelCallTips()

Mercurial Repositories > eric / file comparison

comparison: src/eric7/QScintilla/Editor.py

src/eric7/QScintilla/Editor.py