* src/plugins/Desbrowser.py: Convert to db; window management.

* src/plugins/desbrowse.glade: Define event handler.
* src/plugins/EventCmp.py: Clean up window management.
* src/plugins/eventcmp.glade: Define event handler.
* src/plugins/Check.py: Clean up conversion to db.
* src/plugins/summary.glade: Make dialog modal.
* src/plugins/Merge.py: Window management.
* src/plugins/merge.glade: Define event handlers.
* src/plugins/ChangeTypes.py: Convert to db.


svn: r3152

src/plugins/Desbrowser.py

@@ -1,7 +1,7 @@
 #
 # Gramps - a GTK+/GNOME based genealogy program
 #
-# Copyright (C) 2000  Donald N. Allingham
+# Copyright (C) 2000-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$
+
 "Analysis and Exploration/Interactive descendant browser"
 
 #------------------------------------------------------------------------
@@ -50,32 +52,35 @@ import gtk.glade
 # 
 #
 #------------------------------------------------------------------------
-def runTool(database,person,callback):
+def runTool(database,person,callback,parent=None):
     try:
-        DesBrowse(database,person,callback)
+        DesBrowse(database,person,callback,parent)
     except:
         import DisplayTrace
         DisplayTrace.DisplayTrace()
 
 class DesBrowse:
-    def __init__(self,database,person,callback):
+    def __init__(self,database,person,callback,parent):
         self.active = person
         self.db = database
         self.callback = callback
+        self.parent = parent
+        self.win_key = self
 
         base = os.path.dirname(__file__)
         glade_file = base + os.sep + "desbrowse.glade"
 
         self.glade = gtk.glade.XML(glade_file,"top","gramps")
         self.glade.signal_autoconnect({
-            "destroy_passed_object" : Utils.destroy_passed_object,
+            "destroy_passed_object" : self.close,
+            "on_delete_event": self.on_delete_event,
             })
-        top = self.glade.get_widget("top")
+        self.window = self.glade.get_widget("top")
 
-        Utils.set_titles(top,self.glade.get_widget('title'),
+        Utils.set_titles(self.window,self.glade.get_widget('title'),
                          _("Descendant Browser"))
         
-        self.tree= self.glade.get_widget("tree1")
+        self.tree = self.glade.get_widget("tree1")
         col = gtk.TreeViewColumn('',gtk.CellRendererText(),text=0)
         self.tree.append_column(col)
         self.model = gtk.TreeStore(gobject.TYPE_STRING,gobject.TYPE_PYOBJECT)
@@ -83,21 +88,45 @@ class DesBrowse:
         self.tree.set_rules_hint(gtk.TRUE)
         self.tree.set_headers_visible(gtk.FALSE)
         
-        self.add_to_tree(None,None,self.active)
+        self.add_to_tree(None,None,self.active.get_id())
         self.tree.expand_all()
         self.tree.connect('event',self.button_press_event)
 
-        top.show()
+        self.add_itself_to_menu()
+        self.window.show()
 
-    def add_to_tree(self,parent,sib,person):
-        item = self.model.insert_after(parent,sib)
-        self.model.set(item,0,GrampsCfg.nameof(person))
-        self.model.set(item,1,person)
-        prev = None
-        for family in person.get_family_id_list():
-            for child in family.get_child_id_list():
-                prev = self.add_to_tree(item,prev,child)
-        return item
+    def on_delete_event(self,obj,b):
+        self.remove_itself_from_menu()
+
+    def close(self,obj):
+        self.remove_itself_from_menu()
+        self.window.destroy()
+
+    def add_itself_to_menu(self):
+        self.parent.child_windows[self.win_key] = self
+        self.parent_menu_item = gtk.MenuItem(_("Descendant Browser tool"))
+        self.parent_menu_item.connect("activate",self.present)
+        self.parent_menu_item.show()
+        self.parent.winsmenu.append(self.parent_menu_item)
+
+    def remove_itself_from_menu(self):
+        del self.parent.child_windows[self.win_key]
+        self.parent_menu_item.destroy()
+
+    def present(self,obj):
+        self.window.present()
+
+    def add_to_tree(self,parent_id,sib_id,person_id):
+        item_id = self.model.insert_after(parent_id,sib_id)
+        person = self.db.find_person_from_id(person_id)
+        self.model.set(item_id,0,GrampsCfg.nameof(person))
+        self.model.set(item_id,1,person_id)
+        prev_id = None
+        for family_id in person.get_family_id_list():
+            family = self.db.find_family_from_id(family_id)
+            for child_id in family.get_child_id_list():
+                prev_id = self.add_to_tree(item_id,prev_id,child_id)
+        return item_id
     
     def button_press_event(self,obj,event):
         import EditPerson
@@ -105,8 +134,9 @@ class DesBrowse:
         if event.type == gtk.gdk._2BUTTON_PRESS and event.button == 1:
             store,iter = self.tree.get_selection().get_selected()
             if iter:
-                person = store.get_value(iter,1)
-                EditPerson.EditPerson(person,self.db,self.callback)
+                person_id = store.get_value(iter,1)
+                person = self.db.find_person_from_id(person_id)
+                EditPerson.EditPerson(self.parent,person,self.db,self.callback)
 
 #------------------------------------------------------------------------
 #
@@ -123,5 +153,3 @@ register_tool(
     author_name="Donald N. Allingham",
     author_email="dallingham@users.sourceforge.net"
     )
-
-