2007-10-08 Don Allingham <don@gramps-project.org>
* various: gen.lib integration. probably touches almost every file * various: gen.utils integration svn: r9101
This commit is contained in:
@@ -29,7 +29,7 @@ log = getLogger(".ObjectSelector")
|
||||
|
||||
from _FilterFrameBase import FilterFrameBase
|
||||
from Filters import GenericFilter, Rules
|
||||
import RelLib
|
||||
import gen.lib
|
||||
|
||||
class PersonFilterFrame(FilterFrameBase):
|
||||
|
||||
@@ -57,9 +57,9 @@ class PersonFilterFrame(FilterFrameBase):
|
||||
self.make_text_widget("Name")
|
||||
|
||||
# Gender
|
||||
genders=[[_("Male"),RelLib.Person.MALE],
|
||||
[_("Female"),RelLib.Person.FEMALE],
|
||||
[_("Unknown"),RelLib.Person.UNKNOWN]]
|
||||
genders=[[_("Male"),gen.lib.Person.MALE],
|
||||
[_("Female"),gen.lib.Person.FEMALE],
|
||||
[_("Unknown"),gen.lib.Person.UNKNOWN]]
|
||||
|
||||
self._gender_list = gtk.ListStore(str,int)
|
||||
|
||||
@@ -190,11 +190,11 @@ class PersonFilterFrame(FilterFrameBase):
|
||||
|
||||
if self._gender_check.get_active():
|
||||
gender = self._gender_list.get_value(self._gender_combo.get_active_iter(),1)
|
||||
if gender == RelLib.Person.MALE:
|
||||
if gender == gen.lib.Person.MALE:
|
||||
filter.add_rule(Rules.Person.IsMale([]))
|
||||
elif gender == RelLib.Person.FEMALE:
|
||||
elif gender == gen.lib.Person.FEMALE:
|
||||
filter.add_rule(Rules.Person.IsFemale([]))
|
||||
elif gender == RelLib.Person.UNKNOWN:
|
||||
elif gender == gen.lib.Person.UNKNOWN:
|
||||
filter.add_rule(Rules.Person.HasUnknownGender([]))
|
||||
else:
|
||||
log.warn("Received unknown gender from filter widget")
|
||||
|
@@ -27,7 +27,7 @@ sys.path.append("..")
|
||||
import gtk
|
||||
import gobject
|
||||
|
||||
from RelLib import Person
|
||||
from gen.lib import Person
|
||||
from BasicUtils import name_displayer
|
||||
display_name = name_displayer.display
|
||||
|
||||
|
@@ -49,7 +49,7 @@ The class hierachy is currently this:
|
||||
|
||||
ObjectFrameFactory
|
||||
|
||||
To implement a selector for a new Primary RelLib type you need to implement a new
|
||||
To implement a selector for a new Primary gen.lib type you need to implement a new
|
||||
subclass of each of:
|
||||
|
||||
FilterFrameBase
|
||||
|
Reference in New Issue
Block a user