* src/gramps.glade: Resolve widget naming conflict.
* src/SelectPerson: Resolve widget naming conflict. svn: r3135
This commit is contained in:
parent
63afa4b054
commit
f2d1eccdfa
@ -1,7 +1,7 @@
|
||||
#
|
||||
# Gramps - a GTK+/GNOME based genealogy program
|
||||
#
|
||||
# Copyright (C) 2003 Donald N. Allingham
|
||||
# Copyright (C) 2003-2004 Donald N. Allingham
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
@ -18,6 +18,8 @@
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
#
|
||||
|
||||
# $Id$
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
#
|
||||
# internationalization
|
||||
@ -56,9 +58,11 @@ class SelectPerson:
|
||||
self.renderer = gtk.CellRendererText()
|
||||
self.db = db
|
||||
self.filter = filter
|
||||
self.glade = gtk.glade.XML(const.gladeFile,"select","gramps")
|
||||
self.top = self.glade.get_widget('select')
|
||||
self.glade = gtk.glade.XML(const.gladeFile,"select_person","gramps")
|
||||
self.top = self.glade.get_widget('select_person')
|
||||
title_label = self.glade.get_widget('title')
|
||||
print self.top
|
||||
print title_label
|
||||
self.filter_select = self.glade.get_widget('filter')
|
||||
self.plist = self.glade.get_widget('plist')
|
||||
self.notebook = self.glade.get_widget('notebook')
|
||||
@ -74,7 +78,7 @@ class SelectPerson:
|
||||
if filter:
|
||||
self.filter_select.set_label(flabel)
|
||||
self.filter_select.connect('toggled',self.redraw_cb)
|
||||
self.filter_select.show()
|
||||
|
||||
self.filter_select.set_active(1)
|
||||
else:
|
||||
self.filter_select.hide()
|
||||
@ -111,21 +115,19 @@ class SelectPerson:
|
||||
|
||||
def redraw(self):
|
||||
|
||||
return
|
||||
|
||||
for key in self.db.sort_person_keys():
|
||||
person = self.db.get_person(key)
|
||||
if self.use_filter and not self.filter(person):
|
||||
for person_id in self.db.sort_person_keys():
|
||||
if self.use_filter and not self.filter(person_id):
|
||||
continue
|
||||
|
||||
data = self.db.get_person_display(key)
|
||||
data = self.db.get_person_display(person_id)
|
||||
person = self.db.find_person_from_id(person_id)
|
||||
gender = person.get_gender()
|
||||
if gender == RelLib.Person.plist:
|
||||
self.mmodel.add([data[0],data[1],data[3],data[5],data[6]],key)
|
||||
elif gender == RelLib.Person.feplist:
|
||||
self.fmodel.add([data[0],data[1],data[3],data[5],data[6]],key)
|
||||
if gender == RelLib.Person.male:
|
||||
self.mmodel.add([data[0],data[1],data[3],data[5],data[6]],person_id)
|
||||
elif gender == RelLib.Person.female:
|
||||
self.fmodel.add([data[0],data[1],data[3],data[5],data[6]],person_id)
|
||||
else:
|
||||
self.umodel.add([data[0],data[1],data[3],data[5],data[6]],key)
|
||||
self.umodel.add([data[0],data[1],data[3],data[5],data[6]],person_id)
|
||||
|
||||
def select_function(self,store,path,iter,id_list):
|
||||
id_list.append(self.model.get_value(iter,1))
|
||||
@ -141,7 +143,7 @@ class SelectPerson:
|
||||
|
||||
idlist = self.get_selected_ids()
|
||||
if idlist and idlist[0]:
|
||||
return_value = self.db.get_person(idlist[0])
|
||||
return_value = idlist[0]
|
||||
else:
|
||||
return_value = None
|
||||
self.top.destroy()
|
||||
|
@ -21607,7 +21607,7 @@
|
||||
</child>
|
||||
</widget>
|
||||
|
||||
<widget class="GtkDialog" id="select">
|
||||
<widget class="GtkDialog" id="select_person">
|
||||
<property name="title" translatable="yes"></property>
|
||||
<property name="type">GTK_WINDOW_TOPLEVEL</property>
|
||||
<property name="window_position">GTK_WIN_POS_NONE</property>
|
||||
|
Loading…
Reference in New Issue
Block a user