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:
Don Allingham
2007-04-01 22:37:10 +00:00
parent a5732076d6
commit 30ce0c5291
13 changed files with 119 additions and 34 deletions

View File

@@ -153,6 +153,9 @@ class BaseModel(gtk.GenericTreeModel):
self.sort_col = scol
self.skip = skip
self.total = 0
self.displayed = 0
self.node_map = NodeMap()
if search:
@@ -205,9 +208,11 @@ class BaseModel(gtk.GenericTreeModel):
self.sort_data = []
data = cursor.next()
self.total = 0
while data:
key = locale.strxfrm(self.sort_func(data[1]))
self.sort_data.append((key,data[0]))
self.total += 1
data = cursor.next()
cursor.close()
@@ -216,6 +221,7 @@ class BaseModel(gtk.GenericTreeModel):
return [ x[1] for x in self.sort_data ]
def _rebuild_search(self,ignore=None):
self.total = 0
if self.db.is_open():
if self.search and self.search.text:
dlist = [h for h in self.sort_keys()\
@@ -224,11 +230,14 @@ class BaseModel(gtk.GenericTreeModel):
else:
dlist = [h for h in self.sort_keys() \
if h not in self.skip and h != ignore]
self.displayed = len(dlist)
self.node_map.set_path_map(dlist)
else:
self.displayed = 0
self.node_map.clear_map()
def _rebuild_filter(self, ignore=None):
self.total = 0
if self.db.is_open():
if self.search:
dlist = self.search.apply(self.db,
@@ -238,8 +247,10 @@ class BaseModel(gtk.GenericTreeModel):
dlist = [ k for k in self.sort_keys() \
if k != ignore ]
self.displayed = len(dlist)
self.node_map.set_path_map(dlist)
else:
self.displayed = 0
self.node_map.clear_map()
def add_row_by_handle(self,handle):