diff --git a/ChangeLog b/ChangeLog index b3048c1a4..f0a918881 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ 2006-04-20 Don Allingham + * src/Editors/_EditFamily.py: Handle marker type in UI * src/DataViews/_FamilyViews.py: clean up * src/DataViews/_PedigreeViews.py: clean up * src/RelLib/_Name.py: fix type on set_type diff --git a/src/Editors/_EditFamily.py b/src/Editors/_EditFamily.py index 796ae9992..4e1ded042 100644 --- a/src/Editors/_EditFamily.py +++ b/src/Editors/_EditFamily.py @@ -414,6 +414,12 @@ class EditFamily(EditPrimary): self.obj.get_gramps_id, self.db.readonly) + self.marker = MonitoredDataType( + self.top.get_widget('marker'), + self.obj.set_marker, + self.obj.get_marker, + self.db.readonly) + self.data_type = MonitoredDataType( self.top.get_widget('marriage_type'), self.obj.set_relationship, @@ -467,11 +473,6 @@ class EditFamily(EditPrimary): GalleryTab(self.dbstate, self.uistate, self.track, self.obj.get_media_list())) -# self.pref_list = self._add_tab( -# notebook, -# PersonRefEmbedList(self.dbstate, self.uistate, self.track, -# self.obj.child_ref_list)) - self.lds_list = self._add_tab( notebook, FamilyLdsEmbedList(self.dbstate,self.uistate,self.track, @@ -660,7 +661,6 @@ class EditFamily(EditPrimary): except Errors.WindowActiveError: pass - # def father_clicked(self,obj): # handle = self.obj.get_father_handle() # if handle: diff --git a/src/Editors/_EditPrimary.py b/src/Editors/_EditPrimary.py index f7ccac83b..104288377 100644 --- a/src/Editors/_EditPrimary.py +++ b/src/Editors/_EditPrimary.py @@ -139,6 +139,7 @@ class EditPrimary(ManagedWindow.ManagedWindow): return None def data_has_changed(self): + if self.db.readonly: return False elif self.obj.handle: