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

-:4146ac0fd307
+:9f6ffcd1db54
 @param name name of the current file
 @type str
 """
 renamed = self.fileName != name
+oldFileName = self.fileName
 self.fileName = name
 if renamed:
 self.vm.setEditorName(self, self.fileName)
+self.vm.removeWatchedFilePath(oldFileName)
+self.vm.addWatchedFilePath(self.fileName)
 if self.fileName:
 self.__fileNameExtension = os.path.splitext(self.fileName)[1][1:].lower()
 else:
 self.__fileNameExtension = ""
 self.redo()
 else:
 break
 # Couldn't find the unmodified state
-def readFile(self, fn, createIt=False, encoding=""):
+def readFile(self, fn, createIt=False, encoding="", noempty=False):
 """
 Public method to read the text from a file.
-@param fn filename to read from (string)
+@param fn filename to read from
+@type str
 @param createIt flag indicating the creation of a new file, if the
-given one doesn't exist (boolean)
+given one doesn't exist (defaults to False)
-@param encoding encoding to be used to read the file (string)
+@type bool (optional)
+@param encoding encoding to be used to read the file (defaults to "")
 (Note: this parameter overrides encoding detection)
+@type str (optional)
+@param noempty flag indicating to not set an empty text (defaults to False)
+@type bool (optional)
 """
 self.__loadEditorConfig(fileName=fn)
 try:
 with EricOverrideCursor():
 "<p>The file <b>{0}</b> could not be opened.</p>"
 "<p>Reason: {1}</p>"
 ).format(fn, str(why)),
 )
 raise
+if noempty and not bool(txt):
+return
 with EricOverrideCursor():
 modified = False
 self.setText(txt)
 @param event the event object
 @type QFocusEvent
 """
 self.recolor()
 self.vm.editActGrp.setEnabled(True)
 self.vm.editorActGrp.setEnabled(True)
 self.vm.copyActGrp.setEnabled(True)
 self.vm.viewActGrp.setEnabled(True)
 self.vm.searchActGrp.setEnabled(True)
 with contextlib.suppress(AttributeError):
 self.setCaretWidth(self.caretWidth)
 self.__updateReadOnly(False)
-# TODO: realize this with a QFileSystemWatcher in ViewManager
+self.setCursorFlashTime(QApplication.cursorFlashTime())
+super().focusInEvent(event)
+def focusOutEvent(self, event):
+"""
+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()
+super().focusOutEvent(event)
+def changeEvent(self, evt):
+"""
+Protected method called to process an event.
+This implements special handling for the events showMaximized,
+showMinimized and showNormal. The windows caption is shortened
+for the minimized mode and reset to the full filename for the
+other modes. This is to make the editor windows work nicer
+with the QWorkspace.
+@param evt the event, that was generated
+@type QEvent
+"""
+if evt.type() == QEvent.Type.WindowStateChange and bool(self.fileName):
+cap = (
+os.path.basename(self.fileName)
+if self.windowState() == Qt.WindowState.WindowMinimized
+else self.fileName
+)
+if self.checkReadOnly():
+cap = self.tr("{0} (ro)").format(cap)
+self.setWindowTitle(cap)
+super().changeEvent(evt)
+def mousePressEvent(self, event):
+"""
+Protected method to handle the mouse press event.
+@param event the mouse press event
+@type QMouseEvent
+"""
+if event.button() == Qt.MouseButton.XButton1:
+self.undo()
+event.accept()
+elif event.button() == Qt.MouseButton.XButton2:
+self.redo()
+event.accept()
+elif event.button() == Qt.MouseButton.LeftButton and bool(
+event.modifiers()
+& (Qt.KeyboardModifier.MetaModifier | Qt.KeyboardModifier.AltModifier)
+):
+line, index = self.lineIndexFromPoint(event.position().toPoint())
+self.addCursor(line, index)
+event.accept()
+else:
+self.vm.eventFilter(self, event)
+super().mousePressEvent(event)
+def mouseDoubleClickEvent(self, evt):
+"""
+Protected method to handle mouse double click events.
+@param evt reference to the mouse event
+@type QMouseEvent
+"""
+super().mouseDoubleClickEvent(evt)
+# accept all double click events even if not handled by QScintilla
+evt.accept()
+self.mouseDoubleClick.emit(evt.position().toPoint(), evt.buttons())
+def wheelEvent(self, evt):
+"""
+Protected method to handle wheel events.
+@param evt reference to the wheel event
+@type QWheelEvent
+"""
+delta = evt.angleDelta().y()
+if evt.modifiers() & Qt.KeyboardModifier.ControlModifier:
+if delta < 0:
+self.zoomOut()
+elif delta > 0:
+self.zoomIn()
+evt.accept()
+return
+if evt.modifiers() & Qt.KeyboardModifier.ShiftModifier:
+if delta < 0:
+self.gotoMethodClass(False)
+elif delta > 0:
+self.gotoMethodClass(True)
+evt.accept()
+return
+super().wheelEvent(evt)
+def event(self, evt):
+"""
+Public method handling events.
+@param evt reference to the event
+@type QEvent
+@return flag indicating, if the event was handled
+@rtype bool
+"""
+if evt.type() == QEvent.Type.Gesture:
+self.gestureEvent(evt)
+return True
+return super().event(evt)
+def gestureEvent(self, evt):
+"""
+Protected method handling gesture events.
+@param evt reference to the gesture event
+@type QGestureEvent
+"""
+pinch = evt.gesture(Qt.GestureType.PinchGesture)
+if pinch:
+if pinch.state() == Qt.GestureState.GestureStarted:
+zoom = (self.getZoom() + 10) / 10.0
+pinch.setTotalScaleFactor(zoom)
+elif pinch.state() == Qt.GestureState.GestureUpdated:
+zoom = int(pinch.totalScaleFactor() * 10) - 10
+if zoom <= -9:
+zoom = -9
+pinch.setTotalScaleFactor(0.1)
+elif zoom >= 20:
+zoom = 20
+pinch.setTotalScaleFactor(3.0)
+self.zoomTo(zoom)
+evt.accept()
+def resizeEvent(self, evt):
+"""
+Protected method handling resize events.
+@param evt reference to the resize event
+@type QResizeEvent
+"""
+super().resizeEvent(evt)
+self.__markerMap.calculateGeometry()
+def viewportEvent(self, evt):
+"""
+Protected method handling event of the viewport.
+@param evt reference to the event
+@type QEvent
+@return flag indiating that the event was handled
+@rtype bool
+"""
+with contextlib.suppress(AttributeError):
+self.__markerMap.calculateGeometry()
+return super().viewportEvent(evt)
+def __updateReadOnly(self, bForce=True):
+"""
+Private method to update the readOnly information for this editor.
+If bForce is True, then updates everything regardless if
+the attributes have actually changed, such as during
+initialization time.  A signal is emitted after the
+caption change.
+@param bForce True to force change, False to only update and emit
+signal if there was an attribute change.
+"""
+if self.fileName == "" or not self.isLocalFile():
+return
+readOnly = self.checkReadOnly()
+if not bForce and (readOnly == self.isReadOnly()):
+return
+cap = self.fileName
+if readOnly:
+cap = self.tr("{0} (ro)".format(cap))
+self.setReadOnly(readOnly)
+self.setWindowTitle(cap)
+self.captionChanged.emit(cap, self)
+def checkReadOnly(self):
+"""
+Public method to check the 'read only' state.
+@return flag indicate a 'read only' state
+@rtype bool
+"""
+return (
+self.isLocalFile() and not os.access(self.fileName, os.W_OK)
+) or self.isReadOnly()
+@pyqtSlot()
+def checkRereadFile(self):
+"""
+Public slot to check, if the file needs to be re-read, and refresh it if
+needed.
+"""
 if (
-self.vm.editorsCheckFocusInEnabled()
+self.fileName
-and not self.inReopenPrompt
-and self.fileName
 and pathlib.Path(self.fileName).exists()
 and pathlib.Path(self.fileName).stat().st_mtime != self.lastModified
 ):
-self.inReopenPrompt = True
 if Preferences.getEditor("AutoReopen") and not self.isModified():
 self.refresh()
 else:
 msg = self.tr(
 """<p>The file <b>{0}</b> has been changed while it"""
 if res:
 self.refresh()
 else:
 # do not prompt for this change again...
 self.lastModified = pathlib.Path(self.fileName).stat().st_mtime
-self.inReopenPrompt = False
+@pyqtSlot()
-self.setCursorFlashTime(QApplication.cursorFlashTime())
+def recordModificationTime(self):
+"""
-super().focusInEvent(event)
+Public slot to record the modification time of our file.
+"""
-def focusOutEvent(self, event):
+if self.fileName and pathlib.Path(self.fileName).exists():
-"""
+self.lastModified = pathlib.Path(self.fileName).stat().st_mtime
-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()
-super().focusOutEvent(event)
-def changeEvent(self, evt):
-"""
-Protected method called to process an event.
-This implements special handling for the events showMaximized,
-showMinimized and showNormal. The windows caption is shortened
-for the minimized mode and reset to the full filename for the
-other modes. This is to make the editor windows work nicer
-with the QWorkspace.
-@param evt the event, that was generated
-@type QEvent
-"""
-if evt.type() == QEvent.Type.WindowStateChange and bool(self.fileName):
-cap = (
-os.path.basename(self.fileName)
-if self.windowState() == Qt.WindowState.WindowMinimized
-else self.fileName
-)
-if self.checkReadOnly():
-cap = self.tr("{0} (ro)").format(cap)
-self.setWindowTitle(cap)
-super().changeEvent(evt)
-def mousePressEvent(self, event):
-"""
-Protected method to handle the mouse press event.
-@param event the mouse press event
-@type QMouseEvent
-"""
-if event.button() == Qt.MouseButton.XButton1:
-self.undo()
-event.accept()
-elif event.button() == Qt.MouseButton.XButton2:
-self.redo()
-event.accept()
-elif event.button() == Qt.MouseButton.LeftButton and bool(
-event.modifiers()
-& (Qt.KeyboardModifier.MetaModifier | Qt.KeyboardModifier.AltModifier)
-):
-line, index = self.lineIndexFromPoint(event.position().toPoint())
-self.addCursor(line, index)
-event.accept()
-else:
-self.vm.eventFilter(self, event)
-super().mousePressEvent(event)
-def mouseDoubleClickEvent(self, evt):
-"""
-Protected method to handle mouse double click events.
-@param evt reference to the mouse event
-@type QMouseEvent
-"""
-super().mouseDoubleClickEvent(evt)
-# accept all double click events even if not handled by QScintilla
-evt.accept()
-self.mouseDoubleClick.emit(evt.position().toPoint(), evt.buttons())
-def wheelEvent(self, evt):
-"""
-Protected method to handle wheel events.
-@param evt reference to the wheel event
-@type QWheelEvent
-"""
-delta = evt.angleDelta().y()
-if evt.modifiers() & Qt.KeyboardModifier.ControlModifier:
-if delta < 0:
-self.zoomOut()
-elif delta > 0:
-self.zoomIn()
-evt.accept()
-return
-if evt.modifiers() & Qt.KeyboardModifier.ShiftModifier:
-if delta < 0:
-self.gotoMethodClass(False)
-elif delta > 0:
-self.gotoMethodClass(True)
-evt.accept()
-return
-super().wheelEvent(evt)
-def event(self, evt):
-"""
-Public method handling events.
-@param evt reference to the event
-@type QEvent
-@return flag indicating, if the event was handled
-@rtype bool
-"""
-if evt.type() == QEvent.Type.Gesture:
-self.gestureEvent(evt)
-return True
-return super().event(evt)
-def gestureEvent(self, evt):
-"""
-Protected method handling gesture events.
-@param evt reference to the gesture event
-@type QGestureEvent
-"""
-pinch = evt.gesture(Qt.GestureType.PinchGesture)
-if pinch:
-if pinch.state() == Qt.GestureState.GestureStarted:
-zoom = (self.getZoom() + 10) / 10.0
-pinch.setTotalScaleFactor(zoom)
-elif pinch.state() == Qt.GestureState.GestureUpdated:
-zoom = int(pinch.totalScaleFactor() * 10) - 10
-if zoom <= -9:
-zoom = -9
-pinch.setTotalScaleFactor(0.1)
-elif zoom >= 20:
-zoom = 20
-pinch.setTotalScaleFactor(3.0)
-self.zoomTo(zoom)
-evt.accept()
-def resizeEvent(self, evt):
-"""
-Protected method handling resize events.
-@param evt reference to the resize event
-@type QResizeEvent
-"""
-super().resizeEvent(evt)
-self.__markerMap.calculateGeometry()
-def viewportEvent(self, evt):
-"""
-Protected method handling event of the viewport.
-@param evt reference to the event
-@type QEvent
-@return flag indiating that the event was handled
-@rtype bool
-"""
-with contextlib.suppress(AttributeError):
-self.__markerMap.calculateGeometry()
-return super().viewportEvent(evt)
-def __updateReadOnly(self, bForce=True):
-"""
-Private method to update the readOnly information for this editor.
-If bForce is True, then updates everything regardless if
-the attributes have actually changed, such as during
-initialization time.  A signal is emitted after the
-caption change.
-@param bForce True to force change, False to only update and emit
-signal if there was an attribute change.
-"""
-if self.fileName == "" or not self.isLocalFile():
-return
-readOnly = self.checkReadOnly()
-if not bForce and (readOnly == self.isReadOnly()):
-return
-cap = self.fileName
-if readOnly:
-cap = self.tr("{0} (ro)".format(cap))
-self.setReadOnly(readOnly)
-self.setWindowTitle(cap)
-self.captionChanged.emit(cap, self)
-def checkReadOnly(self):
-"""
-Public method to check the 'read only' state.
-@return flag indicate a 'read only' state
-@rtype bool
-"""
-return (
-self.isLocalFile() and not os.access(self.fileName, os.W_OK)
-) or self.isReadOnly()
 @pyqtSlot()
 def refresh(self):
 """
 Public slot to refresh the editor contents.
 self.close()
 return
 # reread the file
 try:
-self.readFile(self.fileName)
+self.readFile(self.fileName, noempty=True)
 except OSError:
 # do not prompt for this change again...
 self.lastModified = QDateTime.currentDateTime()
 self.setModified(False)
 self.__convertTabs()

Mercurial Repositories > eric / file comparison

comparison: src/eric7/QScintilla/Editor.py

src/eric7/QScintilla/Editor.py