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

2006-04-27 Don Allingham <don@gramps-project.org>

Browse Source 
* src/Editors/_EditFamily.py: provide add new parent option
	* src/Editors/_EditEvent.py: used set_window
	* src/glade/gramps.glade: add new buttons for add new parent



svn: r6470
This commit is contained in:
Don Allingham 2006-04-27 20:21:32 +00:00
parent 621535599b
commit d4b2d21e0a
4 changed files with 104 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2006-04-27 Don Allingham <don@gramps-project.org>
* src/Editors/_EditFamily.py: provide add new parent option
* src/Editors/_EditEvent.py: used set_window
* src/glade/gramps.glade: add new buttons for add new parent
2006-04-27 Alex Roitman <shura@gramps-project.org> 2006-04-27 Alex Roitman <shura@gramps-project.org>
* src/plugins/CmdRef.py: Fix tool. * src/plugins/CmdRef.py: Fix tool.
* src/PluginUtils/_PluginStatus.py: Fix wm. * src/PluginUtils/_PluginStatus.py: Fix wm.

7
src/Editors/_EditEvent.py
View File

@ -88,11 +88,10 @@ class EditEvent(EditPrimary):
def _local_init(self): def _local_init(self):
self.top = gtk.glade.XML(const.gladeFile, "event_edit","gramps") self.top = gtk.glade.XML(const.gladeFile, "event_edit","gramps")
self.window = self.top.get_widget("event_edit")
etitle = _('Event Editor') self.set_window(self.top.get_widget("event_edit"),
Utils.set_titles(self.window, self.top.get_widget('title'), self.top.get_widget('title'),
etitle, etitle) _('Event Editor'))
def _connect_signals(self): def _connect_signals(self):
self.top.get_widget('button111').connect('clicked',self.close) self.top.get_widget('button111').connect('clicked',self.close)

108
src/Editors/_EditFamily.py
View File

@ -218,7 +218,8 @@ class ChildEmbedList(EmbeddedList):
def share_button_clicked(self,obj): def share_button_clicked(self,obj):
# it only makes sense to skip those who are already in the family # it only makes sense to skip those who are already in the family
skip_list = [self.family.get_father_handle(), self.family.get_mother_handle()] + \ skip_list = [self.family.get_father_handle(), \
self.family.get_mother_handle()] + \
[x.ref for x in self.family.get_child_ref_list() ] [x.ref for x in self.family.get_child_ref_list() ]
sel = SelectPerson(self.dbstate.db, "Select Child", skip=skip_list) sel = SelectPerson(self.dbstate.db, "Select Child", skip=skip_list)
@ -385,8 +386,10 @@ class EditFamily(EditPrimary):
self.mbirth = self.top.get_widget('mbirth') self.mbirth = self.top.get_widget('mbirth')
self.mdeath = self.top.get_widget('mdeath') self.mdeath = self.top.get_widget('mdeath')
self.mbutton= self.top.get_widget('mbutton') self.mbutton = self.top.get_widget('mbutton')
self.fbutton= self.top.get_widget('fbutton') self.mbutton2= self.top.get_widget('mbutton2')
self.fbutton = self.top.get_widget('fbutton')
self.fbutton2= self.top.get_widget('fbutton2')
self.mbox = self.top.get_widget('mbox') self.mbox = self.top.get_widget('mbox')
self.fbox = self.top.get_widget('fbox') self.fbox = self.top.get_widget('fbox')
@ -436,7 +439,9 @@ class EditFamily(EditPrimary):
self.phandles = [handle for handle in self.phandles if handle] self.phandles = [handle for handle in self.phandles if handle]
self.mbutton.connect('clicked',self.mother_clicked) self.mbutton.connect('clicked',self.mother_clicked)
self.mbutton2.connect('clicked',self.add_mother_clicked)
self.fbutton.connect('clicked',self.father_clicked) self.fbutton.connect('clicked',self.father_clicked)
self.fbutton2.connect('clicked',self.add_father_clicked)
def _create_tabbed_pages(self): def _create_tabbed_pages(self):
@ -482,32 +487,31 @@ class EditFamily(EditPrimary):
def update_father(self,handle): def update_father(self,handle):
self.load_parent(handle, self.fbox, self.fbirth, self.load_parent(handle, self.fbox, self.fbirth,
self.fdeath, self.fbutton) self.fdeath, self.fbutton, self.fbutton2)
def update_mother(self,handle): def update_mother(self,handle):
self.load_parent(handle, self.mbox, self.mbirth, self.load_parent(handle, self.mbox, self.mbirth,
self.mdeath, self.mbutton) self.mdeath, self.mbutton, self.mbutton2)
def on_change_mother(self, selector_window, obj): def add_mother_clicked(self, obj):
if obj.__class__ == RelLib.Person: from Editors import EditPerson
try: person = RelLib.Person()
person = obj person.set_gender(RelLib.Person.FEMALE)
self.obj.set_mother_handle(person.get_handle()) EditPerson(self.dbstate,self.uistate,[],person, self.new_mother_added)
self.update_mother(person.get_handle())
except:
log.warn(
"Failed to update mother: \n"
"obj returned from selector was: %s\n"
% (repr(obj),))
raise
else:
log.warn(
"Object selector returned obj.__class__ = %s, it should "
"have been of type %s." % (obj.__class__.__name__,
RelLib.Person.__name__))
selector_window.close() def add_father_clicked(self, obj):
from Editors import EditPerson
person = RelLib.Person()
person.set_gender(RelLib.Person.MALE)
EditPerson(self.dbstate,self.uistate,[],person, self.new_father_added)
def new_mother_added(self, person):
self.obj.set_mother_handle(person.handle)
self.update_mother(person.handle)
def new_father_added(self, person):
self.obj.set_father_handle(person.handle)
self.update_father(person.handle)
def mother_clicked(self, obj): def mother_clicked(self, obj):
for i in self.hidden: for i in self.hidden:
@ -533,32 +537,6 @@ class EditFamily(EditPrimary):
self.obj.set_mother_handle(person.handle) self.obj.set_mother_handle(person.handle)
self.update_mother(person.handle) self.update_mother(person.handle)
# def mother_clicked(self,obj):
# handle = self.obj.get_mother_handle()
# if handle:
# self.obj.set_mother_handle(None)
# self.update_mother(None)
# else:
# filter_spec = PersonFilterSpec()
# filter_spec.set_gender(RelLib.Person.FEMALE)
# child_birth_years = []
# for person_handle in self.obj.get_child_handle_list():
# person = self.db.get_person_from_handle(person_handle)
# event_ref = person.get_birth_ref()
# if event_ref and event_ref.ref:
# event = self.db.get_event_from_handle(event_ref.ref)
# child_birth_years.append(event.get_date_object().get_year())
# if len(child_birth_years) > 0:
# filter_spec.set_birth_year(min(child_birth_years))
# filter_spec.set_birth_criteria(PersonFilterSpec.BEFORE)
# selector = PersonSelector(self.dbstate,self.uistate,
# self.track,filter_spec=filter_spec)
# selector.connect('add-object',self.on_change_mother)
def on_change_father(self, selector_window, obj): def on_change_father(self, selector_window, obj):
if obj.__class__ == RelLib.Person: if obj.__class__ == RelLib.Person:
try: try:
@ -654,31 +632,6 @@ class EditFamily(EditPrimary):
except Errors.WindowActiveError: except Errors.WindowActiveError:
pass pass
# def father_clicked(self,obj):
# handle = self.obj.get_father_handle()
# if handle:
# self.obj.set_father_handle(None)
# self.update_father(None)
# else:
# filter_spec = PersonFilterSpec()
# filter_spec.set_gender(RelLib.Person.MALE)
# child_birth_years = []
# for person_handle in self.obj.get_child_handle_list():
# person = self.db.get_person_from_handle(person_handle)
# event_ref = person.get_birth_ref()
# if event_ref and event_ref.ref:
# event = self.db.get_event_from_handle(event_ref.ref)
# child_birth_years.append(event.get_date_object().get_year())
# if len(child_birth_years) > 0:
# filter_spec.set_birth_year(min(child_birth_years))
# filter_spec.set_birth_criteria(PersonFilterSpec.BEFORE)
# selector = PersonSelector(self.dbstate,self.uistate,
# self.track,filter_spec=filter_spec)
# selector.connect('add-object',self.on_change_father)
def edit_person(self,obj,event,handle): def edit_person(self,obj,event,handle):
if event.type == gtk.gdk.BUTTON_PRESS and event.button == 1: if event.type == gtk.gdk.BUTTON_PRESS and event.button == 1:
from _EditPerson import EditPerson from _EditPerson import EditPerson
@ -689,7 +642,8 @@ class EditFamily(EditPrimary):
except Errors.WindowActiveError: except Errors.WindowActiveError:
pass pass
def load_parent(self,handle,box,birth_obj,death_obj,btn_obj): def load_parent(self, handle, box, birth_obj, death_obj,
btn_obj, btn2_obj):
is_used = handle != None is_used = handle != None
@ -702,6 +656,7 @@ class EditFamily(EditPrimary):
pass pass
if is_used: if is_used:
btn2_obj.hide()
db = self.db db = self.db
person = db.get_person_from_handle(handle) person = db.get_person_from_handle(handle)
name = "%s [%s]" % (NameDisplay.displayer.display(person), name = "%s [%s]" % (NameDisplay.displayer.display(person),
@ -720,13 +675,14 @@ class EditFamily(EditPrimary):
IconButton(self.edit_person,person.handle) IconButton(self.edit_person,person.handle)
)) ))
else: else:
btn2_obj.show()
name = "" name = ""
birth = "" birth = ""
death = "" death = ""
add_image = gtk.Image() add_image = gtk.Image()
add_image.show() add_image.show()
add_image.set_from_stock(gtk.STOCK_ADD,gtk.ICON_SIZE_BUTTON) add_image.set_from_stock(gtk.STOCK_INDEX,gtk.ICON_SIZE_BUTTON)
btn_obj.add(add_image) btn_obj.add(add_image)
birth_obj.set_text(birth) birth_obj.set_text(birth)

56
src/glade/gramps.glade
View File

@ -842,6 +842,34 @@
<child> <child>
<widget class="GtkImage" id="image2671"> <widget class="GtkImage" id="image2671">
<property name="visible">True</property>
<property name="stock">gtk-index</property>
<property name="icon_size">4</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="fbutton2">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Remove selected event reference</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NONE</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_marriageDeleteBtn_clicked" object="marriageEventList"/>
<child>
<widget class="GtkImage" id="image2697">
<property name="visible">True</property> <property name="visible">True</property>
<property name="stock">gtk-add</property> <property name="stock">gtk-add</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>
@ -1100,6 +1128,34 @@
<child> <child>
<widget class="GtkImage" id="image2670"> <widget class="GtkImage" id="image2670">
<property name="visible">True</property>
<property name="stock">gtk-index</property>
<property name="icon_size">4</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="mbutton2">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Remove selected event reference</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NONE</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_marriageDeleteBtn_clicked" object="marriageEventList"/>
<child>
<widget class="GtkImage" id="image2698">
<property name="visible">True</property> <property name="visible">True</property>
<property name="stock">gtk-add</property> <property name="stock">gtk-add</property>
<property name="icon_size">1</property> <property name="icon_size">1</property>