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

Merge pull request #1019 from prculley/bug11600

Browse Source
This commit is contained in:
Nick Hall 2022-02-09 21:21:46 +00:00
commit 4039427e80
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gramps/gui/editors/displaytabs/addrembedlist.py
View File

@ -54,7 +54,7 @@ class AddrEmbedList(EmbeddedList):
Derives from the EmbeddedList class. Derives from the EmbeddedList class.
""" """
_HANDLE_COL = 7 _HANDLE_COL = 9
_DND_TYPE = DdTargets.ADDRESS _DND_TYPE = DdTargets.ADDRESS
_MSG = { _MSG = {
@ -74,7 +74,9 @@ class AddrEmbedList(EmbeddedList):
(_('City'), 3, 100, TEXT_COL, -1, None), (_('City'), 3, 100, TEXT_COL, -1, None),
(_('State/County'), 4, 100, TEXT_COL, -1, None), (_('State/County'), 4, 100, TEXT_COL, -1, None),
(_('Country'), 5, 75, TEXT_COL, -1, None), (_('Country'), 5, 75, TEXT_COL, -1, None),
(_('Private'), 6, 30, ICON_COL, -1, 'gramps-lock') (_("Postal"), 6, 75, TEXT_COL, -1, None),
(_("Phone"), 7, 150, TEXT_COL, -1, None),
(_('Private'), 8, 30, ICON_COL, -1, 'gramps-lock')
] ]
def __init__(self, dbstate, uistate, track, data): def __init__(self, dbstate, uistate, track, data):
@ -98,7 +100,7 @@ class AddrEmbedList(EmbeddedList):
""" """
Return the column order of the columns in the display tab. Return the column order of the columns in the display tab.
""" """
return ((1,6), (1, 0), (1, 1), (1, 2), (1, 3), (1, 4), (1, 5)) return ((1,8), (1, 0), (1, 1), (1, 2), (1, 3), (1, 4), (1, 5), (1, 6), (1, 7))
def add_button_clicked(self, obj): def add_button_clicked(self, obj):
""" """

4
gramps/gui/editors/displaytabs/addressmodel.py
View File

@ -50,7 +50,7 @@ class AddressModel(Gtk.ListStore):
""" """
AddressModel derives from the ListStore, defining te items in the list AddressModel derives from the ListStore, defining te items in the list
""" """
Gtk.ListStore.__init__(self, str, str, str, str, str, str, bool, object) Gtk.ListStore.__init__(self, str, str, str, str, str, str, str, str, bool, object)
self.db = dbase self.db = dbase
for obj in obj_list: for obj in obj_list:
self.append(row=[ self.append(row=[
@ -60,6 +60,8 @@ class AddressModel(Gtk.ListStore):
obj.city, obj.city,
obj.state, obj.state,
obj.country, obj.country,
obj.postal,
obj.phone,
obj.get_privacy(), obj.get_privacy(),
obj, obj,
]) ])