Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix various Entry fields so Undo/Redo works (#920)

Browse Source 
Fixes #11380, #11339

In prior versions of Gramps you could use the undo/redo keys to edit items in the text entries. This no longer works.

This is related to the changes to suppress odd characters and leading/trailing spaces. The Gtk.Entry.set_text() call is effectively clearing the undo/redo list at every keystroke or when you leave the field.

In this PR I move the odd characters cleanup into UndoableEntry.do_insert_text instead of MonitoredEntry.

I scanned the users of MonitoredEntry and they all appeared to use Glade files, I scanned the glade files for anyone using just plain Entry (none found), they all appeared to use UndoableEntry or ValidatableMaskedEntry, so this should cover everyone.
This commit is contained in:
Paul Culley 2019-10-16 21:15:39 -05:00 committed by Sam Manzi
parent 4360976d73
commit 79c54aaedc
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gramps/gui/widgets/monitoredwidgets.py
View File

@ -64,8 +64,6 @@ from gramps.gen.errors import ValidationError
_RETURN = Gdk.keyval_from_name("Return") _RETURN = Gdk.keyval_from_name("Return")
_KP_ENTER = Gdk.keyval_from_name("KP_Enter") _KP_ENTER = Gdk.keyval_from_name("KP_Enter")
# table for skipping illegal control chars
INVISIBLE = dict.fromkeys(list(range(32)))
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -141,14 +139,10 @@ class MonitoredEntry:
self.obj.connect(signal, callback, *data) self.obj.connect(signal, callback, *data)
def _on_quit(self, obj, event): def _on_quit(self, obj, event):
text = obj.get_text().translate(INVISIBLE).strip() self.set_val(obj.get_text().strip())
self.set_val(text)
obj.set_text(text)
def _on_change(self, obj): def _on_change(self, obj):
new_text = obj.get_text().translate(INVISIBLE) self.set_val(obj.get_text())
self.set_val(new_text)
obj.set_text(new_text)
if self.changed: if self.changed:
self.changed(obj) self.changed(obj)

6
gramps/gui/widgets/undoableentry.py
View File

@ -47,6 +47,11 @@ from gi.repository import Gtk
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from .undoablebuffer import Stack from .undoablebuffer import Stack
# table for skipping illegal control chars
INVISIBLE = dict.fromkeys(list(range(32)))
class UndoableInsertEntry: class UndoableInsertEntry:
"""something that has been inserted into our Gtk.editable""" """something that has been inserted into our Gtk.editable"""
def __init__(self, text, length, position): def __init__(self, text, length, position):
@ -156,6 +161,7 @@ class UndoableEntry(Gtk.Entry, Gtk.Editable):
return False return False
return True return True
text = text.translate(INVISIBLE)
if not self.undo_in_progress: if not self.undo_in_progress:
self.__empty_redo_stack() self.__empty_redo_stack()
while not self.not_undoable_action: while not self.not_undoable_action: