Removed unneeded pygtk calls
svn: r1210
This commit is contained in:
142
src/AddSpouse.py
142
src/AddSpouse.py
@ -37,11 +37,6 @@ from intl import gettext as _
|
||||
# GTK/Gnome modules
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
try:
|
||||
import pygtk; pygtk.require('2.0')
|
||||
except ImportError: # not set up for parallel install
|
||||
pass
|
||||
|
||||
import gobject
|
||||
import gtk.glade
|
||||
|
||||
@ -116,7 +111,7 @@ class AddSpouse:
|
||||
when a row has been selected.
|
||||
"""
|
||||
|
||||
model,iter = self.selection.get_selected()
|
||||
model,iter = self.slist.get_selected()
|
||||
if iter:
|
||||
self.ok.set_sensitive(1)
|
||||
else:
|
||||
@ -157,7 +152,7 @@ class AddSpouse:
|
||||
selected from the list.
|
||||
"""
|
||||
|
||||
model,iter = self.selection.get_selected()
|
||||
model,iter = self.slist.get_selected()
|
||||
if not iter:
|
||||
return
|
||||
|
||||
@ -224,137 +219,4 @@ class AddSpouse:
|
||||
continue
|
||||
self.slist.add([data[0],data[1],data[3],data[5],data[6]],key,person==key)
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
#
|
||||
# SetSpouse
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
class SetSpouse:
|
||||
"""
|
||||
Displays the AddSpouse dialog, allowing the user to create a new
|
||||
family with the passed person as one spouse, and another person to
|
||||
be selected.
|
||||
"""
|
||||
def __init__(self,db,person,family,update,addperson):
|
||||
"""
|
||||
Displays the AddSpouse dialog box.
|
||||
|
||||
db - database to which to add the new family
|
||||
person - the current person, will be one of the parents
|
||||
update - function that updates the family display
|
||||
addperson - function that adds a person to the person view
|
||||
"""
|
||||
self.db = db
|
||||
self.update = update
|
||||
self.person = person
|
||||
self.family = family
|
||||
self.addperson = addperson
|
||||
|
||||
self.glade = gtk.glade.XML(const.gladeFile, "spouseDialog")
|
||||
|
||||
self.rel_combo = self.glade.get_widget("rel_combo")
|
||||
self.relation_type = self.glade.get_widget("rel_type")
|
||||
self.spouse_list = self.glade.get_widget("spouseList")
|
||||
self.relation_def = self.glade.get_widget("reldef")
|
||||
|
||||
self.rel_combo.set_popdown_strings(const.familyRelations)
|
||||
title = _("Choose Spouse/Partner of %s") % GrampsCfg.nameof(person)
|
||||
self.glade.get_widget("spouseTitle").set_text(title)
|
||||
|
||||
self.glade.signal_autoconnect({
|
||||
"on_select_spouse_clicked" : self.select_spouse_clicked,
|
||||
"on_new_spouse_clicked" : self.new_spouse_clicked,
|
||||
"on_rel_type_changed" : self.relation_type_changed,
|
||||
"on_combo_insert_text" : Utils.combo_insert_text,
|
||||
"destroy_passed_object" : Utils.destroy_passed_object
|
||||
})
|
||||
|
||||
self.relation_type.set_text(_("Married"))
|
||||
|
||||
def new_spouse_clicked(self,obj):
|
||||
"""
|
||||
Called when the spouse to be added does not exist, and needs
|
||||
to be created and added to the database
|
||||
"""
|
||||
import QuickAdd
|
||||
|
||||
relation = const.save_frel(self.relation_type.get_text())
|
||||
if relation == "Partners":
|
||||
if self.person.getGender() == RelLib.Person.male:
|
||||
gen = "male"
|
||||
else:
|
||||
gen = "female"
|
||||
elif self.person.getGender() == RelLib.Person.male:
|
||||
gen = "female"
|
||||
else:
|
||||
gen = "male"
|
||||
QuickAdd.QuickAdd(self.db,gen,self.update_list)
|
||||
|
||||
def update_list(self,person):
|
||||
self.addperson(person)
|
||||
self.relation_type_changed(self.relation_type)
|
||||
|
||||
def select_spouse_clicked(self,obj):
|
||||
"""
|
||||
Called when the spouse to be added already exists and has been
|
||||
selected from the list.
|
||||
"""
|
||||
if len(self.spouse_list.selection) == 0:
|
||||
return
|
||||
row = self.spouse_list.selection[0]
|
||||
spouse = self.db.getPerson(self.spouse_list.get_row_data(row))
|
||||
|
||||
# don't do anything if the marriage already exists
|
||||
for f in self.person.getFamilyList():
|
||||
if spouse == f.getMother() or spouse == f.getFather():
|
||||
Utils.destroy_passed_object(obj)
|
||||
return
|
||||
|
||||
Utils.modified()
|
||||
if self.family.getFather() == self.person:
|
||||
self.family.setMother(spouse)
|
||||
else:
|
||||
self.family.setFather(spouse)
|
||||
|
||||
spouse.addFamily(self.family)
|
||||
|
||||
reltype = self.relation_type.get_text()
|
||||
self.family.setRelationship(const.save_frel(reltype))
|
||||
Utils.destroy_passed_object(obj)
|
||||
self.update(self.family)
|
||||
|
||||
def relation_type_changed(self,obj):
|
||||
"""
|
||||
Called whenever the relationship type changes. Rebuilds the
|
||||
the potential spouse list.
|
||||
"""
|
||||
text = obj.get_text()
|
||||
self.relation_def.set_text(const.relationship_def(text))
|
||||
|
||||
# determine the gender of the people to be loaded into
|
||||
# the potential spouse list. If Partners is selected, use
|
||||
# the same gender as the current person.
|
||||
gender = self.person.getGender()
|
||||
if text == _("Partners"):
|
||||
if gender == RelLib.Person.male:
|
||||
sgender = const.female
|
||||
else:
|
||||
sgender = const.male
|
||||
else:
|
||||
if gender == RelLib.Person.male:
|
||||
sgender = const.male
|
||||
else:
|
||||
sgender = const.female
|
||||
|
||||
index = 0
|
||||
self.spouse_list.clear()
|
||||
self.spouse_list.freeze()
|
||||
for key in self.db.getPersonKeys():
|
||||
data = self.db.getPersonDisplay(key)
|
||||
if data[2] == sgender:
|
||||
continue
|
||||
|
||||
self.spouse_list.append([data[0],data[3],data[5],data[6]])
|
||||
self.spouse_list.set_row_data(index,key)
|
||||
index = index + 1
|
||||
self.spouse_list.thaw()
|
||||
|
Reference in New Issue
Block a user