better names (than the ones I hurredly chose to make pylint happy)
This commit is contained in:
parent
5d842e046e
commit
fae1cb710b
@ -1206,12 +1206,12 @@ class GuiPersonListOption(Gtk.Box):
|
|||||||
# people we already have must be excluded
|
# people we already have must be excluded
|
||||||
# so we don't list them multiple times
|
# so we don't list them multiple times
|
||||||
skip_list = set()
|
skip_list = set()
|
||||||
iii = self.__model.get_iter_first()
|
tree_iter = self.__model.get_iter_first()
|
||||||
while iii:
|
while tree_iter:
|
||||||
gid = self.__model.get_value(iii, 1) # get the GID stored in col. #1
|
gid = self.__model.get_value(tree_iter, 1) # get the GID in col. #1
|
||||||
person = self.__db.get_person_from_gramps_id(gid)
|
person = self.__db.get_person_from_gramps_id(gid)
|
||||||
skip_list.add(person.get_handle())
|
skip_list.add(person.get_handle())
|
||||||
iii = self.__model.iter_next(iii)
|
tree_iter = self.__model.iter_next(tree_iter)
|
||||||
|
|
||||||
select_class = SelectorFactory('Person')
|
select_class = SelectorFactory('Person')
|
||||||
sel = select_class(self.__dbstate, self.__uistate,
|
sel = select_class(self.__dbstate, self.__uistate,
|
||||||
@ -1258,8 +1258,8 @@ class GuiPersonListOption(Gtk.Box):
|
|||||||
"""
|
"""
|
||||||
(path, column) = self.__tree_view.get_cursor()
|
(path, column) = self.__tree_view.get_cursor()
|
||||||
if path:
|
if path:
|
||||||
iii = self.__model.get_iter(path)
|
tree_iter = self.__model.get_iter(path)
|
||||||
self.__model.remove(iii)
|
self.__model.remove(tree_iter)
|
||||||
self.__update_value()
|
self.__update_value()
|
||||||
|
|
||||||
def __update_value(self):
|
def __update_value(self):
|
||||||
@ -1267,11 +1267,11 @@ class GuiPersonListOption(Gtk.Box):
|
|||||||
Parse the object and return.
|
Parse the object and return.
|
||||||
"""
|
"""
|
||||||
gidlist = ''
|
gidlist = ''
|
||||||
iii = self.__model.get_iter_first()
|
tree_iter = self.__model.get_iter_first()
|
||||||
while iii:
|
while tree_iter:
|
||||||
gid = self.__model.get_value(iii, 1)
|
gid = self.__model.get_value(tree_iter, 1)
|
||||||
gidlist = gidlist + gid + ' '
|
gidlist = gidlist + gid + ' '
|
||||||
iii = self.__model.iter_next(iii)
|
tree_iter = self.__model.iter_next(tree_iter)
|
||||||
|
|
||||||
# Supress signals so that the set_value() handler
|
# Supress signals so that the set_value() handler
|
||||||
# (__value_changed()) doesn't get called
|
# (__value_changed()) doesn't get called
|
||||||
@ -1384,12 +1384,12 @@ class GuiPlaceListOption(Gtk.Box):
|
|||||||
# places we already have must be excluded
|
# places we already have must be excluded
|
||||||
# so we don't list them multiple times
|
# so we don't list them multiple times
|
||||||
skip_list = set()
|
skip_list = set()
|
||||||
iii = self.__model.get_iter_first()
|
tree_iter = self.__model.get_iter_first()
|
||||||
while iii:
|
while tree_iter:
|
||||||
gid = self.__model.get_value(iii, 1) # get the GID stored in col. #1
|
gid = self.__model.get_value(tree_iter, 1) # get the GID in col. #1
|
||||||
place = self.__db.get_place_from_gramps_id(gid)
|
place = self.__db.get_place_from_gramps_id(gid)
|
||||||
skip_list.add(place.get_handle())
|
skip_list.add(place.get_handle())
|
||||||
iii = self.__model.iter_next(iii)
|
tree_iter = self.__model.iter_next(tree_iter)
|
||||||
|
|
||||||
select_class = SelectorFactory('Place')
|
select_class = SelectorFactory('Place')
|
||||||
sel = select_class(self.__dbstate, self.__uistate,
|
sel = select_class(self.__dbstate, self.__uistate,
|
||||||
@ -1407,8 +1407,8 @@ class GuiPlaceListOption(Gtk.Box):
|
|||||||
"""
|
"""
|
||||||
(path, column) = self.__tree_view.get_cursor()
|
(path, column) = self.__tree_view.get_cursor()
|
||||||
if path:
|
if path:
|
||||||
iii = self.__model.get_iter(path)
|
tree_iter = self.__model.get_iter(path)
|
||||||
self.__model.remove(iii)
|
self.__model.remove(tree_iter)
|
||||||
self.__update_value()
|
self.__update_value()
|
||||||
|
|
||||||
def __update_value(self):
|
def __update_value(self):
|
||||||
@ -1416,11 +1416,11 @@ class GuiPlaceListOption(Gtk.Box):
|
|||||||
Parse the object and return.
|
Parse the object and return.
|
||||||
"""
|
"""
|
||||||
gidlist = ''
|
gidlist = ''
|
||||||
iii = self.__model.get_iter_first()
|
tree_iter = self.__model.get_iter_first()
|
||||||
while iii:
|
while tree_iter:
|
||||||
gid = self.__model.get_value(iii, 1)
|
gid = self.__model.get_value(tree_iter, 1)
|
||||||
gidlist = gidlist + gid + ' '
|
gidlist = gidlist + gid + ' '
|
||||||
iii = self.__model.iter_next(iii)
|
tree_iter = self.__model.iter_next(tree_iter)
|
||||||
self.__option.set_value(gidlist)
|
self.__option.set_value(gidlist)
|
||||||
|
|
||||||
def __value_changed(self):
|
def __value_changed(self):
|
||||||
@ -1528,11 +1528,11 @@ class GuiSurnameColorOption(Gtk.Box):
|
|||||||
Handle the add surname button.
|
Handle the add surname button.
|
||||||
"""
|
"""
|
||||||
skip_list = set()
|
skip_list = set()
|
||||||
iii = self.__model.get_iter_first()
|
tree_iter = self.__model.get_iter_first()
|
||||||
while iii:
|
while tree_iter:
|
||||||
surname = self.__model.get_value(iii, 0)
|
surname = self.__model.get_value(tree_iter, 0)
|
||||||
skip_list.add(surname.encode('iso-8859-1', 'xmlcharrefreplace'))
|
skip_list.add(surname.encode('iso-8859-1', 'xmlcharrefreplace'))
|
||||||
iii = self.__model.iter_next(iii)
|
tree_iter = self.__model.iter_next(tree_iter)
|
||||||
|
|
||||||
ln_dialog = LastNameDialog(self.__db, self.__uistate,
|
ln_dialog = LastNameDialog(self.__db, self.__uistate,
|
||||||
self.__track, self.__surnames, skip_list)
|
self.__track, self.__surnames, skip_list)
|
||||||
@ -1547,8 +1547,8 @@ class GuiSurnameColorOption(Gtk.Box):
|
|||||||
"""
|
"""
|
||||||
(path, column) = self.__tree_view.get_cursor()
|
(path, column) = self.__tree_view.get_cursor()
|
||||||
if path:
|
if path:
|
||||||
iii = self.__model.get_iter(path)
|
tree_iter = self.__model.get_iter(path)
|
||||||
self.__model.remove(iii)
|
self.__model.remove(tree_iter)
|
||||||
self.__update_value()
|
self.__update_value()
|
||||||
|
|
||||||
def __row_clicked(self, treeview, path, column):
|
def __row_clicked(self, treeview, path, column):
|
||||||
@ -1556,10 +1556,10 @@ class GuiSurnameColorOption(Gtk.Box):
|
|||||||
Handle the case of a row being clicked on.
|
Handle the case of a row being clicked on.
|
||||||
"""
|
"""
|
||||||
# get the surname and colour value for this family
|
# get the surname and colour value for this family
|
||||||
iii = self.__model.get_iter(path)
|
tree_iter = self.__model.get_iter(path)
|
||||||
surname = self.__model.get_value(iii, 0)
|
surname = self.__model.get_value(tree_iter, 0)
|
||||||
rgba = Gdk.RGBA()
|
rgba = Gdk.RGBA()
|
||||||
rgba.parse(self.__model.get_value(iii, 1))
|
rgba.parse(self.__model.get_value(tree_iter, 1))
|
||||||
|
|
||||||
title = _('Select color for %s') % surname
|
title = _('Select color for %s') % surname
|
||||||
colour_dialog = Gtk.ColorChooserDialog(title)
|
colour_dialog = Gtk.ColorChooserDialog(title)
|
||||||
@ -1571,7 +1571,7 @@ class GuiSurnameColorOption(Gtk.Box):
|
|||||||
colour_name = '#%02x%02x%02x' % (int(rgba.red * 255),
|
colour_name = '#%02x%02x%02x' % (int(rgba.red * 255),
|
||||||
int(rgba.green * 255),
|
int(rgba.green * 255),
|
||||||
int(rgba.blue * 255))
|
int(rgba.blue * 255))
|
||||||
self.__model.set_value(iii, 1, colour_name)
|
self.__model.set_value(tree_iter, 1, colour_name)
|
||||||
|
|
||||||
colour_dialog.destroy()
|
colour_dialog.destroy()
|
||||||
self.__update_value()
|
self.__update_value()
|
||||||
@ -1581,11 +1581,11 @@ class GuiSurnameColorOption(Gtk.Box):
|
|||||||
Parse the object and return.
|
Parse the object and return.
|
||||||
"""
|
"""
|
||||||
surname_colours = ''
|
surname_colours = ''
|
||||||
iii = self.__model.get_iter_first()
|
tree_iter = self.__model.get_iter_first()
|
||||||
while iii:
|
while tree_iter:
|
||||||
surname = self.__model.get_value(iii, 0)
|
surname = self.__model.get_value(tree_iter, 0)
|
||||||
#surname = surname.encode('iso-8859-1', 'xmlcharrefreplace')
|
#surname = surname.encode('iso-8859-1', 'xmlcharrefreplace')
|
||||||
colour = self.__model.get_value(iii, 1)
|
colour = self.__model.get_value(tree_iter, 1)
|
||||||
# Tried to use a dictionary, and tried to save it as a tuple,
|
# Tried to use a dictionary, and tried to save it as a tuple,
|
||||||
# but couldn't get this to work right -- this is lame, but now
|
# but couldn't get this to work right -- this is lame, but now
|
||||||
# the surnames and colours are saved as a plain text string
|
# the surnames and colours are saved as a plain text string
|
||||||
@ -1596,7 +1596,7 @@ class GuiSurnameColorOption(Gtk.Box):
|
|||||||
# whitespace character which is unlikely to appear in
|
# whitespace character which is unlikely to appear in
|
||||||
# a surname. (See bug report #2162.)
|
# a surname. (See bug report #2162.)
|
||||||
surname_colours += surname + '\xb0' + colour + '\xb0'
|
surname_colours += surname + '\xb0' + colour + '\xb0'
|
||||||
iii = self.__model.iter_next(iii)
|
tree_iter = self.__model.iter_next(tree_iter)
|
||||||
self.__option.set_value(surname_colours)
|
self.__option.set_value(surname_colours)
|
||||||
|
|
||||||
def __value_changed(self):
|
def __value_changed(self):
|
||||||
|
Loading…
Reference in New Issue
Block a user