Python Console: Jump to previous/next result (#9784)

source/pythonConsole.py

@@ -246,6 +246,7 @@ def __init__(self, parent):
 		# Even the most recent line has a position in the history, so initialise with one blank line.
 		self.inputHistory = [""]
 		self.inputHistoryPos = 0
+		self.outputPositions = [0]
 
 	def onActivate(self, evt):
 		if evt.GetActive():
@@ -261,6 +262,12 @@ def output(self, data):
 		if data and not data.isspace():
 			queueHandler.queueFunction(queueHandler.eventQueue, speech.speakText, data)
 
+	def clear(self):
+		"""Clear the output.
+		"""
+		self.outputCtrl.Clear()
+		self.outputPositions[:] = [0]
+
 	def echo(self, data):
 		self.outputCtrl.write(data)
 
@@ -285,6 +292,7 @@ def execute(self):
 			self.inputHistory.append("")
 		self.inputHistoryPos = len(self.inputHistory) - 1
 		self.inputCtrl.ChangeValue("")
+		self.outputPositions.append(self.outputCtrl.GetInsertionPoint())
 
 	def historyMove(self, movement):
 		newIndex = self.inputHistoryPos + movement
@@ -394,6 +402,9 @@ def onInputChar(self, evt):
 		elif key == wx.WXK_ESCAPE:
 			self.Close()
 			return
+		elif not evt.ShiftDown() and key == wx.WXK_CONTROL_L:
+			self.clear()
+			return
 		evt.Skip()
 
 	def onInputPaste(self, evt):
@@ -438,6 +449,32 @@ def onOutputChar(self, evt):
 		if key == wx.WXK_F6:
 			self.inputCtrl.SetFocus()
 			return
+		if evt.ControlDown() and not evt.ShiftDown():
+			if key == wx.WXK_UP:
+				cur = self.outputCtrl.GetInsertionPoint()
+				for pos in reversed(self.outputPositions):
+					if pos < cur:
+						self.outputCtrl.SetInsertionPoint(pos)
+						break
+				else:
+					# Translators: A message reported when there is no next
+					# result in the Python Console.
+					speech.speakMessage(_("Top"))
+				return
+			if key == wx.WXK_DOWN:
+				cur = self.outputCtrl.GetInsertionPoint()
+				for pos in self.outputPositions:
+					if pos > cur:
+						self.outputCtrl.SetInsertionPoint(pos)
+						break
+				else:
+					# Translators: A message reported when there is no previous
+					# result in the Python Console.
+					speech.speakMessage(_("Bottom"))
+				return
+			if key == wx.WXK_CONTROL_L:
+				self.clear()
+				return
 		evt.Skip()
 
 def initialize():