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

Fix to allow filter progress meters in flat views

Browse Source
This commit is contained in:
prculley 2017-11-22 08:36:32 -06:00 committed by Nick Hall
parent eee82ae27e
commit 85014bd92c
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gramps/gui/views/treemodels/flatbasemodel.py
View File

@ -73,6 +73,7 @@ from gi.repository import Gtk
from gramps.gen.filters import SearchFilter, ExactSearchFilter from gramps.gen.filters import SearchFilter, ExactSearchFilter
from gramps.gen.const import GRAMPS_LOCALE as glocale from gramps.gen.const import GRAMPS_LOCALE as glocale
from .basemodel import BaseModel from .basemodel import BaseModel
from ...user import User
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -453,6 +454,8 @@ class FlatBaseModel(GObject.GObject, Gtk.TreeModel, BaseModel):
cput = time.clock() cput = time.clock()
GObject.GObject.__init__(self) GObject.GObject.__init__(self)
BaseModel.__init__(self) BaseModel.__init__(self)
self.uistate = uistate
self.user = User(parent=uistate.window, uistate=uistate)
#inheriting classes must set self.map to obtain the data #inheriting classes must set self.map to obtain the data
self.prev_handle = None self.prev_handle = None
self.prev_data = None self.prev_data = None
@ -611,7 +614,8 @@ class FlatBaseModel(GObject.GObject, Gtk.TreeModel, BaseModel):
if self.search: if self.search:
ident = False ident = False
if ignore is None: if ignore is None:
dlist = self.search.apply(self.db, allkeys, tupleind=1) dlist = self.search.apply(self.db, allkeys, tupleind=1,
user=self.user)
else: else:
dlist = self.search.apply(self.db, dlist = self.search.apply(self.db,
[ k for k in allkeys if k[1] != ignore], [ k for k in allkeys if k[1] != ignore],