ahamilton/diff-edit
1
0
Fork 0
Code Releases Activity

editor: Add redo command

Browse source 
- Used ctrl-/ because ctrl-y was already taken for paste.
- Must use ctrl-z for undo now.
This commit is contained in:
Andrew Hamilton 2022-04-29 11:14:11 +10:00
parent 36450586a4
commit 8b65489577
1 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

28
diff_edit/editor.py
View file

@ -440,6 +440,7 @@ class Editor:
self._cursor_x, self._cursor_y = 0, 0 self._cursor_x, self._cursor_y = 0, 0
self.original_text = self.text_widget.lines.copy() self.original_text = self.text_widget.lines.copy()
self.history = [] self.history = []
self.history_position = 0
self.add_to_history() self.add_to_history()
def load(self, path): def load(self, path):
@ -729,10 +730,28 @@ class Editor:
if "unittest" not in sys.modules: if "unittest" not in sys.modules:
print("\a", end="") print("\a", end="")
def add_to_history(self):
if self.history_position < len(self.history):
self.history[self.history_position:] = []
self.history.append((self.text_widget.lines.copy(), self._cursor_x, self._cursor_y))
self.history_position = len(self.history)
def undo(self): def undo(self):
self.text_widget[:], self._cursor_x, self._cursor_y = self.history.pop() if self.history_position == 0:
if self.history == []: self.ring_bell()
return
if self.history_position == len(self.history):
self.add_to_history() self.add_to_history()
self.history_position -= 1
self.history_position -= 1
self.text_widget[:], self._cursor_x, self._cursor_y = self.history[self.history_position]
def redo(self):
if self.history_position >= len(self.history) - 1:
self.ring_bell()
return
self.history_position += 1
self.text_widget[:], self._cursor_x, self._cursor_y = self.history[self.history_position]
def toggle_overwrite(self): def toggle_overwrite(self):
self.is_overwriting = not self.is_overwriting self.is_overwriting = not self.is_overwriting
@ -793,9 +812,6 @@ class Editor:
new_x = view_x new_x = view_x
self.view_widget.position = max(0, new_x), max(0, new_y) self.view_widget.position = max(0, new_x), max(0, new_y)
def add_to_history(self):
self.history.append((self.text_widget.lines.copy(), self._cursor_x, self._cursor_y))
def on_keyboard_input(self, term_code): def on_keyboard_input(self, term_code):
if self.parts_widget is not None: if self.parts_widget is not None:
self.parts_widget.on_keyboard_input(term_code) self.parts_widget.on_keyboard_input(term_code)
@ -888,7 +904,7 @@ class Editor:
terminal.CTRL_L: center_cursor, terminal.ALT_SEMICOLON: comment_lines, terminal.CTRL_L: center_cursor, terminal.ALT_SEMICOLON: comment_lines,
terminal.ALT_c: cycle_syntax_highlighting, (terminal.CTRL_X, terminal.CTRL_C): quit, terminal.ALT_c: cycle_syntax_highlighting, (terminal.CTRL_X, terminal.CTRL_C): quit,
terminal.ESC: show_parts_list, terminal.CTRL_K: delete_line, terminal.TAB: tab_align, terminal.ESC: show_parts_list, terminal.CTRL_K: delete_line, terminal.TAB: tab_align,
(terminal.CTRL_Q, terminal.TAB): insert_tab, terminal.CTRL_UNDERSCORE: undo, (terminal.CTRL_Q, terminal.TAB): insert_tab, terminal.CTRL_UNDERSCORE: redo,
terminal.CTRL_Z: undo, terminal.CTRL_G: abort_command, terminal.INSERT: toggle_overwrite, terminal.CTRL_Z: undo, terminal.CTRL_G: abort_command, terminal.INSERT: toggle_overwrite,
(terminal.CTRL_C, ">"): indent, (terminal.CTRL_C, "<"): dedent} (terminal.CTRL_C, ">"): indent, (terminal.CTRL_C, "<"): dedent}