svn: r2875
This commit is contained in:
Alex Roitman 2004-02-20 00:52:24 +00:00
parent 260a131828
commit aa9090e2c5
3 changed files with 66 additions and 66 deletions

View File

@ -414,6 +414,7 @@ class EditPerson:
def close_child_windows(self): def close_child_windows(self):
for child_window in self.child_windows: for child_window in self.child_windows:
child_window.close(None) child_window.close(None)
self.child_windows = []
def close(self,ok=0): def close(self,ok=0):
self.gallery.close(ok) self.gallery.close(ok)

View File

@ -131,18 +131,17 @@ class NameEditor:
def on_delete_event(self,obj,b): def on_delete_event(self,obj,b):
self.close_child_windows() self.close_child_windows()
self.parent.child_windows.remove(self)
self.remove_itself_from_menu() self.remove_itself_from_menu()
def close(self,obj): def close(self,obj):
self.close_child_windows() self.close_child_windows()
self.parent.child_windows.remove(self)
self.remove_itself_from_menu() self.remove_itself_from_menu()
Utils.destroy_passed_object(self.window) self.window.destroy()
def close_child_windows(self): def close_child_windows(self):
for child_window in self.child_windows: for child_window in self.child_windows:
child_window.close(None) child_window.close(None)
self.child_windows = []
def add_itself_to_menu(self): def add_itself_to_menu(self):
if not self.name: if not self.name:
@ -202,7 +201,7 @@ class NameEditor:
self.parent.lists_changed = 1 self.parent.lists_changed = 1
self.callback(self.name) self.callback(self.name)
Utils.destroy_passed_object(obj) self.close(obj)
def update_name(self,first,last,suffix,title,type,note,format,priv): def update_name(self,first,last,suffix,title,type,note,format,priv):

View File

@ -297,13 +297,13 @@ class SourceEditor:
def close(self,obj): def close(self,obj):
self.close_child_windows() self.close_child_windows()
self.parent.parent.child_windows.remove(self)
self.remove_itself_from_menu() self.remove_itself_from_menu()
Utils.destroy_passed_object(self.sourceDisplay) Utils.destroy_passed_object(self.sourceDisplay)
def close_child_windows(self): def close_child_windows(self):
for child_window in self.child_windows: for child_window in self.child_windows:
child_window.close() child_window.close()
self.child_windows = []
def add_itself_to_menu(self): def add_itself_to_menu(self):
if self.active_source: if self.active_source:
@ -329,7 +329,7 @@ class SourceEditor:
self.parent_menu_item.destroy() self.parent_menu_item.destroy()
def present(self,obj): def present(self,obj):
self.window.present() self.sourceDisplay.present()
def on_help_clicked(self,obj): def on_help_clicked(self,obj):
"""Display the relevant portion of GRAMPS manual""" """Display the relevant portion of GRAMPS manual"""