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

* src/gramps.glade: People View: Add label for filter text input field.

Browse Source 
* src/GenericFilter.py (ProbablyAlive): Add check for input parameter, (HasSourceOf): get handle only once, removed unused code.
* src/gramps_main.py: Show label for filter input field.


svn: r4313
This commit is contained in:
Martin Hawlisch
2005-04-06 20:26:15 +00:00
parent 76c44f2694
commit ad39f6be25
4 changed files with 43 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
gramps2/src/GenericFilter.py
View File

@ -1724,7 +1724,14 @@ class FamilyWithIncompleteEvent(Rule):
class ProbablyAlive(Rule):
"""People probably alive"""
labels = ["On year"]
labels = [_("On year:")]
def prepare(self,db):
try:
self.current_year = int(self.list[0])
except:
self.current_year = None
print self.current_year
def name(self):
return 'People probably alive'
@ -1737,12 +1744,8 @@ class ProbablyAlive(Rule):
def apply(self,db,p_id):
if len(self.list) == 0:
current_year = None
else:
current_year = int(self.list[0])
p = db.get_person_from_handle(p_id)
return probably_alive(p,db,current_year)
return probably_alive(p,db,self.current_year)
#-------------------------------------------------------------------------
# "People marked private"
@ -1988,7 +1991,7 @@ class HasSourceOf(Rule):
labels = [ _('Source ID:') ]
def prepare(self,db):
self.db = db
self.source_handle = db.get_source_from_gramps_id(self.list[0]).get_handle()
def name(self):
return 'Has source of'
@ -2000,23 +2003,9 @@ class HasSourceOf(Rule):
return _('Matches people who have a particular source')
def apply(self,db,p_id):
if not self.list[0]:
return False
p = self.db.get_person_from_handle(p_id)
return p.has_source_reference(
self.db.get_source_from_gramps_id(self.list[0]).get_handle())
## if len(p.get_source_references()) > 0:
## for src in p.get_source_references():
## if self.list[0] == \
## self.db.get_source_from_handle(
## src.get_base_handle()).get_gramps_id():
## return True
## return False
return p.has_source_reference( self.source_handle)
#-------------------------------------------------------------------------