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

Fix up Event Editors Place display for bidi text with Gramps ID (#924)

Browse Source 
Fixes #10124

Fix up Event Editors Place display for bidi text with Gramps ID (PR 924)

Some versions of Gtk/Pango have trouble with text containing both LTR and RTL characters. The bug notes this shows up in our Event Editor on the 'Place" field, where we have the place displayer title and the Gramps ID concatenated into the same string.

In older versions of Gtk (3.18.9 tested) the bracket around the Gramps ID would get mangled to the beginning of the string:
<images>

In newer versions of Gtk (3.24.3 tested) it was better to start with:
<images>

The older version of Gtk/Pango doesn't seem to properly interpret all of the potential Unicode bidi control characters, so the fix shown is the best I can do. The fixed version of the newer Gtk version is what is desired.

I note that the Place displayer should be fixed up to use more appropriate separators than just commas for RTL text, but that is another issue.
This commit is contained in:
Paul Culley 2019-11-04 20:00:48 -06:00 committed by Sam Manzi
parent 1025a38caa
commit b7487330a7
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gramps/gui/editors/objectentries.py
View File

@ -311,7 +311,10 @@ class PlaceEntry(ObjEntry):
def get_label(self, place): def get_label(self, place):
place_title = place_displayer.display(self.db, place) place_title = place_displayer.display(self.db, place)
return "%s [%s]" % (place_title, place.gramps_id) # When part of the place title contains RTL text, the gramps_id gets
# messed up; so use Unicode FSI/PDI and LRM chars to isolate it.
# see bug 10124 and PR924
return "%s \u2068[%s]\u200e\u2069" % (place_title, place.gramps_id)
def call_editor(self, obj=None): def call_editor(self, obj=None):
if obj is None: if obj is None:
@ -356,7 +359,7 @@ class SourceEntry(ObjEntry):
return self.db.get_source_from_handle(handle) return self.db.get_source_from_handle(handle)
def get_label(self, source): def get_label(self, source):
return "%s [%s]" % (source.get_title(), source.gramps_id) return "%s \u2068[%s]\u200e\u2069" % (source.get_title(), source.gramps_id)
def call_editor(self, obj=None): def call_editor(self, obj=None):
if obj is None: if obj is None:
@ -402,7 +405,8 @@ class MediaEntry(ObjEntry):
return self.db.get_media_from_handle(handle) return self.db.get_media_from_handle(handle)
def get_label(self, object): def get_label(self, object):
return "%s [%s]" % (object.get_description(), object.gramps_id) return "%s \u2068[%s]\u200e\u2069" % (object.get_description(),
object.gramps_id)
def call_editor(self, obj=None): def call_editor(self, obj=None):
if obj is None: if obj is None:
@ -462,7 +466,7 @@ class NoteEntry(ObjEntry):
txt = " ".join(note.get().split()) txt = " ".join(note.get().split())
if len(txt) > 35: if len(txt) > 35:
txt = txt[:35] + "..." txt = txt[:35] + "..."
return "%s [%s]" % (txt, note.gramps_id) return "%s \u2068[%s]\u200e\u2069" % (txt, note.gramps_id)
def call_editor(self, obj=None): def call_editor(self, obj=None):
if obj is None: if obj is None: