Mercurial Repositories > eric / file diff

--- a/QScintilla/Editor.py	Fri Dec 22 17:56:49 2017 +0100
+++ b/QScintilla/Editor.py	Fri Dec 22 18:15:46 2017 +0100
@@ -1180,6 +1180,9 @@
         self.marginMenuActs["PreviousChangeMarker"] = \
             self.indicMarginMenu.addAction(
                 self.tr('Previous change'), self.previousChange)
+        self.marginMenuActs["ClearChangeMarkers"] = \
+            self.indicMarginMenu.addAction(
+                self.tr('Clear changes'), self.__deleteAllChangeMarkers)
         
         self.indicMarginMenu.aboutToShow.connect(self.__showContextMenuMargin)
         
@@ -1248,6 +1251,9 @@
         self.marginMenuActs["PreviousChangeMarker"] = \
             self.marginMenu.addAction(
                 self.tr('Previous change'), self.previousChange)
+        self.marginMenuActs["ClearChangeMarkers"] = \
+            self.marginMenu.addAction(
+                self.tr('Clear changes'), self.__deleteAllChangeMarkers)
         self.marginMenu.addSeparator()
         self.marginMenuActs["LMBbookmarks"] = self.marginMenu.addAction(
             self.tr('LMB toggles bookmarks'), self.__lmBbookmarks)
@@ -2796,7 +2802,7 @@
         
     def previousChange(self):
         """
-        Public slot to handle the 'Previous task' context menu action.
+        Public slot to handle the 'Previous change' context menu action.
         """
         line, index = self.getCursorPosition()
         if line == 0:
@@ -5355,9 +5361,12 @@
         if self.__hasChangeMarkers:
             self.marginMenuActs["PreviousChangeMarker"].setEnabled(True)
             self.marginMenuActs["NextChangeMarker"].setEnabled(True)
+            self.marginMenuActs["ClearChangeMarkers"].setEnabled(True)
+            
         else:
             self.marginMenuActs["PreviousChangeMarker"].setEnabled(False)
             self.marginMenuActs["NextChangeMarker"].setEnabled(False)
+            self.marginMenuActs["ClearChangeMarkers"].setEnabled(False)
         
         self.showMenu.emit("Margin", self.sender(), self)