2006-07-29 Alex Roitman <shura@gramps-project.org>

* src/ManagedWindow.py (ManagedWindow.show): Set opened flag;
	(ManagedWindow.close): Unser opened flag.
	* src/ViewManager.py (undo_history_close): Only close undo history
	window if it is open.
	* src/UndoHistory.py: (UndoHistory.__init__): Remove signal handling;
	(UndoHistory.close): Remove method, use one from the parent class.



svn: r7089

ChangeLog

@@ -1,3 +1,11 @@
+2006-07-29  Alex Roitman  <shura@gramps-project.org>
+	* src/ManagedWindow.py (ManagedWindow.show): Set opened flag;
+	(ManagedWindow.close): Unser opened flag.
+	* src/ViewManager.py (undo_history_close): Only close undo history
+	window if it is open.
+	* src/UndoHistory.py: (UndoHistory.__init__): Remove signal handling;
+	(UndoHistory.close): Remove method, use one from the parent class.
+
 2006-07-29  Zsolt Foldvari  <zfoldvar@users.sourceforge.net>
 	* src/NameDisplay.py (display_given): Cleanup
 	* src/Gramps.Cfg.py (NameFormatEditDlg.run): Verification of the

src/ManagedWindow.py

@@ -365,6 +365,7 @@ class ManagedWindow:
     def show(self):
         assert self.window, "ManagedWindow: self.window does not exist!"
         self.window.set_transient_for(self.parent_window)
+        self.opened = True
         self.window.show()
 
     def close(self,*obj):
@@ -374,6 +375,7 @@ class ManagedWindow:
         Takes care of closing children and removing itself from menu.
         """
         self.uistate.gwm.close_track(self.track)
+        self.opened = False
 
     def present(self):
         """

src/UndoHistory.py

@@ -103,14 +103,9 @@ class UndoHistory(ManagedWindow.ManagedWindow):
         self._build_model()
         self._update_ui()
         
-        self.db_change_key = dbstate.connect('database-changed',self.close)
         self.selection.connect('changed',self._selection_changed)
         self.show()
 
-    def close(self,obj=None):
-        self.dbstate.disconnect(self.db_change_key)
-	self.window.destroy()
-
     def _selection_changed(self,obj):
         (model,node) = self.selection.get_selected()
         if not node:

src/ViewManager.py

@@ -835,7 +835,8 @@ class ViewManager:
     def undo_history_close(self):
         try:
             # Try closing undo history window if it exists
-            self.undo_history_window.close()
+            if self.undo_history_window.opened:
+                self.undo_history_window.close()
         except AttributeError:
             # Let it go: history window does not exist
             pass