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

-:e6c9ab1dc168
+:f46c1e224e8a
 )
 self.menuActs["NewSplit"].setEnabled(self.vm.canSplit())
 self.menu.addSeparator()
 self.reopenEncodingMenu = self.__initContextMenuReopenWithEncoding()
 self.menuActs["Reopen"] = self.menu.addMenu(self.reopenEncodingMenu)
+self.menuActs["Reload"] = self.menu.addAction(
+EricPixmapCache.getIcon("reload"), self.tr("Reload"), self.reload
+)
 self.menuActs["Save"] = self.menu.addAction(
 EricPixmapCache.getIcon("fileSave"), self.tr("Save"), self.__contextSave
 )
 self.menu.addAction(
 EricPixmapCache.getIcon("fileSaveAs"),
 if language:
 self.filetype = language
 self.setLanguage(self.supportedLanguages[language][1])
 self.checkSyntax()
-self.__docstringGenerator = None
+self.resetDocstringGenerator()
 def __languageChanged(self, language, propagate=True):
 """
 Private method handling a change of a connected editor's language.
 else:
 self.filetype = language
 self.setLanguage(self.supportedLanguages[language][1], propagate=propagate)
 self.checkSyntax()
-self.__docstringGenerator = None
+self.resetDocstringGenerator()
 def __resetLanguage(self, propagate=True):
 """
 Private method used to reset the language selection.
 self.__setMarginsDisplay()
 self.setMonospaced(useMonospaced)
 with contextlib.suppress(AttributeError):
 self.menuActs["MonospacedFont"].setChecked(self.useMonospaced)
-self.__docstringGenerator = None
+self.resetDocstringGenerator()
 if not self.inLanguageChanged and propagate:
 self.inLanguageChanged = True
 self.languageChanged.emit(self.apiLanguage)
 self.inLanguageChanged = False
 """
 if self.lastHighlight is not None:
 lineno = self.markerLine(self.lastHighlight)
 self.ensureVisible(lineno + 1)
-def highlight(self, line=None, error=False, syntaxError=False):  # noqa: U100
+def highlight(self, line=None, error=False):
 """
 Public method to highlight [or de-highlight] a particular line.
 @param line line number to highlight
 @type int
 @param error flag indicating whether the error highlight should be
 used
-@type bool
-@param syntaxError flag indicating a syntax error
 @type bool
 """
 if line is None:
 self.lastHighlight = None
 if self.lastErrorMarker is not None:
 ## Breakpoint handling methods below
 ###########################################################################
 def __modified(
 self,
-pos,  # noqa: U100
+_pos,
 mtype,
-text,  # noqa: U100
+_text,
-length,  # noqa: U100
+_length,
 linesAdded,
 line,
-foldNow,  # noqa: U100
+_foldNow,
-foldPrev,  # noqa: U100
+_foldPrev,
-token,  # noqa: U100
+_token,
-annotationLinesAdded,  # noqa: U100
+_annotationLinesAdded,
 ):
 """
 Private method to handle changes of the number of lines.
-@param pos start position of change
+@param _pos start position of change (unused)
 @type int
 @param mtype flags identifying the change
 @type int
-@param text text that is given to the Undo system
+@param _text text that is given to the Undo system (unused)
 @type str
-@param length length of the change
+@param _length length of the change (unused)
 @type int
 @param linesAdded number of added/deleted lines
 @type int
 @param line line number of a fold level or marker change
 @type int
-@param foldNow new fold level
+@param _foldNow new fold level (unused)
 @type int
-@param foldPrev previous fold level
+@param _foldPrev previous fold level (unused)
 @type int
-@param token ???
+@param _token ??? (unused)
 @type int
-@param annotationLinesAdded number of added/deleted annotation lines
+@param _annotationLinesAdded number of added/deleted annotation lines (unused)
 @type int
 """
 if mtype & (self.SC_MOD_INSERTTEXT | self.SC_MOD_DELETETEXT):
 # 1. set/reset the autosave timer
 if self.__autosaveInterval > 0:
 printer.setDocName(os.path.basename(fn))
 else:
 printer.setDocName(self.noName)
 if printDialog.printRange() == QAbstractPrintDialog.PrintRange.Selection:
 # get the selection
-fromLine, fromIndex, toLine, toIndex = self.getSelection()
+fromLine, _fromIndex, toLine, toIndex = self.getSelection()
 if toIndex == 0:
 toLine -= 1
 # QScintilla seems to print one line more than told
 res = printer.printRange(self, fromLine, toLine - 1)
 else:
 QsciScintilla.SCI_FOLDCHILDREN,
 line - 1,
 QsciScintilla.SC_FOLDACTION_EXPAND,
 )
-def __marginClicked(self, margin, line, modifiers):  # noqa: U100
+def __marginClicked(self, margin, line, _modifiers):
 """
 Private slot to handle the marginClicked signal.
 @param margin id of the clicked margin
 @type int
 @param line line number of the click
 @type int
-@param modifiers keyboard modifiers
+@param _modifiers keyboard modifiers (unused)
 @type Qt.KeyboardModifiers
 """
 if margin == self.__bmMargin:
 self.toggleBookmark(line + 1)
 elif margin == self.__bpMargin:
 Private slot handling the aboutToShow signal of the context menu.
 """
 self.menuActs["Reopen"].setEnabled(
 not self.isModified() and bool(self.fileName)
 )
+self.menuActs["Reload"].setEnabled(bool(self.fileName))
 self.menuActs["Save"].setEnabled(self.isModified())
 self.menuActs["Undo"].setEnabled(self.isUndoAvailable())
 self.menuActs["Redo"].setEnabled(self.isRedoAvailable())
 self.menuActs["Revert"].setEnabled(self.isModified())
 self.menuActs["Cut"].setEnabled(self.hasSelectedText())
 self.clearSyntaxError()
 self.clearFlakesWarnings()
 error = problems.get("error")
 if error:
-_fn, lineno, col, code, msg = error
+_fn, lineno, col, _code, msg = error
 self.toggleSyntaxError(lineno, col, True, msg)
 for _fn, lineno, col, _code, msg in problems.get("py_warnings", []):
 self.toggleWarning(
 lineno, col, True, msg, warningType=EditorWarningKind.Python
 ###########################################################################
 def toggleWarning(
 self,
 line,
-col,  # noqa: U100
+_col,
 setWarning,
 msg="",
 warningType=EditorWarningKind.Code,
 ):
 """
 Note: This method is used to set pyflakes and code style warnings.
 @param line line number of the warning
 @type int
-@param col column of the warning
+@param _col column of the warning (unused)
 @type int
 @param setWarning flag indicating if the warning marker should be
 set or deleted
 @type bool
 @param msg warning message
 self.refresh()
 else:
 # do not prompt for this change again...
 self.lastModified = pathlib.Path(self.fileName).stat().st_mtime
+def getModificationTime(self):
+"""
+Public method to get the time of the latest (saved) modification.
+@return time of the latest modification
+@rtype int
+"""
+return self.lastModified
 @pyqtSlot()
 def recordModificationTime(self):
 """
 Public slot to record the modification time of our file.
 """
 self.checkSyntax()
 self.__markerMap.update()
 self.refreshed.emit()
+@pyqtSlot()
+def reload(self):
+"""
+Public slot to reload the editor contents checking its modification state first.
+"""
+ok = (
+EricMessageBox.yesNo(
+self,
+self.tr("Reload File"),
+self.tr(
+"<p>The editor contains unsaved modifications.</p>"
+"<p><b>Warning:</b> You will lose your changes upon reloading"
+" it.</p><p>Shall the editor really be reloaded?</p>"
+),
+icon=EricMessageBox.Warning,
+)
+if self.isModified()
+else True
+)
+if ok:
+self.refresh()
 def setMonospaced(self, on):
 """
 Public method to set/reset a monospaced font.
 #######################################################################
 ## Methods implementing the docstring generator interface
 #######################################################################
+def resetDocstringGenerator(self):
+"""
+Public method to reset the current docstring generator.
+"""
+self.__docstringGenerator = None
 def getDocstringGenerator(self):
 """
 Public method to get a reference to the docstring generator.
 @return reference to the docstring generator

Mercurial Repositories > eric / file comparison

comparison: src/eric7/QScintilla/Editor.py

src/eric7/QScintilla/Editor.py