2007-04-01 Don Allingham <don@gramps-project.org>
* src/DataViews/_PedigreeView.py: display matches in statusbar * src/DataViews/_PersonView.py: display matches in statusbar * src/DataViews/_RelationView.py: display matches in statusbar * src/DisplayState.py: display matches in statusbar * src/DisplayModels/_BaseModel.py: display matches in statusbar * src/DisplayModels/_PeopleModel.py: display matches in statusbar * src/GrampsDbUtils/_GedcomParse.py: display matches in statusbar * src/PageView.py: display matches in statusbar * src/Filters/_SearchBar.py: display matches in statusbar * src/DbManager.py: fix default file name svn: r8346
This commit is contained in:
@@ -273,6 +273,9 @@ class PeopleModel(gtk.GenericTreeModel):
|
||||
|
||||
self.mapper = NodeTreeMap()
|
||||
|
||||
self.total = 0
|
||||
self.displayed = 0
|
||||
|
||||
if filter_info and filter_info != (1, (0, u'', False)):
|
||||
if filter_info[0] == PeopleModel.GENERIC:
|
||||
data_filter = filter_info[1]
|
||||
@@ -325,15 +328,19 @@ class PeopleModel(gtk.GenericTreeModel):
|
||||
cursor = self.db.get_person_cursor()
|
||||
node = cursor.first()
|
||||
|
||||
self.total = 0
|
||||
self.displayed = 0
|
||||
|
||||
while node:
|
||||
#for node in self.db.get_person_cursor_iter():
|
||||
self.total += 1
|
||||
handle, d = node
|
||||
if not (handle in skip or (dfilter and not dfilter.match(handle))):
|
||||
name_data = d[PeopleModel._NAME_COL]
|
||||
|
||||
group_name = ngn(self.db, name_data)
|
||||
sorted_name = nsn(name_data)
|
||||
|
||||
self.displayed += 1
|
||||
self.mapper.assign_sort_name(handle, sorted_name, group_name)
|
||||
node = cursor.next()
|
||||
cursor.close()
|
||||
@@ -343,11 +350,17 @@ class PeopleModel(gtk.GenericTreeModel):
|
||||
ngn = NameDisplay.displayer.name_grouping_data
|
||||
nsn = NameDisplay.displayer.raw_sorted_name
|
||||
|
||||
plist = self.db.get_person_handles()
|
||||
|
||||
self.total = len(plist)
|
||||
|
||||
if dfilter:
|
||||
handle_list = dfilter.apply(self.db, self.db.get_person_handles())
|
||||
else:
|
||||
handle_list = self.db.get_person_handles()
|
||||
|
||||
self.displayed = len(handle_list)
|
||||
|
||||
self.mapper.clear_sort_names()
|
||||
|
||||
status = LongOpStatus(msg="Loading People",
|
||||
@@ -378,6 +391,9 @@ class PeopleModel(gtk.GenericTreeModel):
|
||||
self.lru_bdate = LRU(_CACHE_SIZE)
|
||||
self.lru_ddate = LRU(_CACHE_SIZE)
|
||||
|
||||
self.total = 0
|
||||
self.displayed = 0
|
||||
|
||||
if dfilter:
|
||||
self.dfilter = dfilter
|
||||
|
||||
|
Reference in New Issue
Block a user