Removed unneeded pygtk calls

svn: r1210

src/AddMedia.py

@@ -43,12 +43,6 @@ from intl import gettext as _
 #
 #-------------------------------------------------------------------------
 from QuestionDialog import ErrorDialog
-
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gtk.glade
 
 #-------------------------------------------------------------------------

src/AddSpouse.py

@@ -37,11 +37,6 @@ from intl import gettext as _
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gobject
 import gtk.glade
 
@@ -116,7 +111,7 @@ class AddSpouse:
         when a row has been selected.
         """
 
-        model,iter = self.selection.get_selected()
+        model,iter = self.slist.get_selected()
         if iter:
             self.ok.set_sensitive(1)
         else:
@@ -157,7 +152,7 @@ class AddSpouse:
         selected from the list.
         """
 
-        model,iter = self.selection.get_selected()
+        model,iter = self.slist.get_selected()
         if not iter:
             return
         
@@ -224,137 +219,4 @@ class AddSpouse:
                 continue
             self.slist.add([data[0],data[1],data[3],data[5],data[6]],key,person==key)
 
-#-------------------------------------------------------------------------
-#
-# SetSpouse
-#
-#-------------------------------------------------------------------------
-class SetSpouse:
-    """
-    Displays the AddSpouse dialog, allowing the user to create a new
-    family with the passed person as one spouse, and another person to
-    be selected.
-    """
-    def __init__(self,db,person,family,update,addperson):
-        """
-        Displays the AddSpouse dialog box.
 
-        db - database to which to add the new family
-        person - the current person, will be one of the parents
-        update - function that updates the family display
-        addperson - function that adds a person to the person view
-        """
-        self.db = db
-        self.update = update
-        self.person = person
-        self.family = family
-        self.addperson = addperson
-
-        self.glade = gtk.glade.XML(const.gladeFile, "spouseDialog")
-
-        self.rel_combo = self.glade.get_widget("rel_combo")
-        self.relation_type = self.glade.get_widget("rel_type")
-        self.spouse_list = self.glade.get_widget("spouseList")
-        self.relation_def = self.glade.get_widget("reldef")
-
-        self.rel_combo.set_popdown_strings(const.familyRelations)
-        title = _("Choose Spouse/Partner of %s") % GrampsCfg.nameof(person)
-        self.glade.get_widget("spouseTitle").set_text(title)
-
-        self.glade.signal_autoconnect({
-            "on_select_spouse_clicked" : self.select_spouse_clicked,
-            "on_new_spouse_clicked"    : self.new_spouse_clicked,
-            "on_rel_type_changed"      : self.relation_type_changed,
-            "on_combo_insert_text"     : Utils.combo_insert_text,
-            "destroy_passed_object"    : Utils.destroy_passed_object
-            })
-
-        self.relation_type.set_text(_("Married"))
-
-    def new_spouse_clicked(self,obj):
-        """
-        Called when the spouse to be added does not exist, and needs
-        to be created and added to the database
-        """
-        import QuickAdd
-
-        relation = const.save_frel(self.relation_type.get_text())
-        if relation == "Partners":
-            if self.person.getGender() == RelLib.Person.male:
-                gen = "male"
-            else:
-                gen = "female"
-        elif self.person.getGender() == RelLib.Person.male:
-            gen = "female"
-        else:
-            gen = "male"
-        QuickAdd.QuickAdd(self.db,gen,self.update_list)
-
-    def update_list(self,person):
-        self.addperson(person)
-        self.relation_type_changed(self.relation_type)
-
-    def select_spouse_clicked(self,obj):
-        """
-        Called when the spouse to be added already exists and has been
-        selected from the list.
-        """
-        if len(self.spouse_list.selection) == 0:
-            return
-        row = self.spouse_list.selection[0]
-        spouse = self.db.getPerson(self.spouse_list.get_row_data(row))
-
-        # don't do anything if the marriage already exists
-        for f in self.person.getFamilyList():
-            if spouse == f.getMother() or spouse == f.getFather():
-                Utils.destroy_passed_object(obj)
-                return
-
-        Utils.modified()
-        if self.family.getFather() == self.person:
-            self.family.setMother(spouse)
-        else:
-            self.family.setFather(spouse)
-            
-        spouse.addFamily(self.family)
-
-        reltype = self.relation_type.get_text()
-        self.family.setRelationship(const.save_frel(reltype))
-        Utils.destroy_passed_object(obj)
-        self.update(self.family)
-
-    def relation_type_changed(self,obj):
-        """
-        Called whenever the relationship type changes. Rebuilds the
-        the potential spouse list.
-        """
-        text = obj.get_text()
-        self.relation_def.set_text(const.relationship_def(text))
-    
-        # determine the gender of the people to be loaded into
-        # the potential spouse list. If Partners is selected, use
-        # the same gender as the current person.
-        gender = self.person.getGender()
-        if text == _("Partners"):
-            if gender == RelLib.Person.male:
-                sgender = const.female
-            else:
-                sgender = const.male
-	else:
-            if gender == RelLib.Person.male:
-                sgender = const.male
-            else:
-                sgender = const.female
-            
-        index = 0
-        self.spouse_list.clear()
-        self.spouse_list.freeze()
-        for key in self.db.getPersonKeys():
-            data = self.db.getPersonDisplay(key)
-            if data[2] == sgender:
-                continue
-
-            self.spouse_list.append([data[0],data[3],data[5],data[6]])
-            self.spouse_list.set_row_data(index,key)
-            index = index + 1
-        self.spouse_list.thaw()

src/AddrEdit.py

@@ -27,11 +27,6 @@ mechanism for the user to edit address information.
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gtk.glade
 
 #-------------------------------------------------------------------------

src/AttrEdit.py

@@ -30,11 +30,6 @@ __version__ = "$Revision$"
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gtk.glade
 
 #-------------------------------------------------------------------------

src/AutoComp.py

@@ -39,11 +39,6 @@ import string
 # GNOME modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gtk
 
 #-------------------------------------------------------------------------

src/Bookmarks.py

@@ -28,11 +28,6 @@ __version__ = "$Revision$"
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gtk 
 import gnome.ui
 

src/ChooseParents.py

@@ -38,11 +38,6 @@ from intl import gettext as _
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gobject
 import gtk.glade
 

src/DateEdit.py

@@ -34,11 +34,6 @@ __version__ = "$Revision$"
 # GNOME modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gtk
 import gtk.gdk
 

src/DbPrompter.py

@@ -24,11 +24,6 @@
 # GNOME modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gtk
 import gtk.glade
 

src/DisplayTrace.py

@@ -32,11 +32,6 @@ import sys
 # GTK/GNOME modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gtk.glade
 
 #-------------------------------------------------------------------------

src/EditPerson.py

@@ -31,11 +31,6 @@ import pickle
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gobject
 import gtk
 import gnome.ui 

src/EditPlace.py

@@ -30,11 +30,6 @@ import pickle
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gobject
 import gtk
 import gtk.glade

src/EditSource.py

@@ -24,11 +24,6 @@
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gtk.glade
 
 #-------------------------------------------------------------------------

src/EventEdit.py

@@ -25,11 +25,6 @@ from string import strip
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gtk
 import gtk.glade
 

src/FamilyView.py

@@ -23,11 +23,6 @@
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gobject
 import gtk
 import gtk.glade

src/Filter.py

@@ -27,11 +27,6 @@ import re
 import os
 import sys
 
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gtk
 
 from intl import gettext as _

src/Find.py

@@ -35,11 +35,6 @@ import string
 # Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gtk
 from gnome.ui import *
 

src/GenericFilter.py

@@ -40,11 +40,6 @@ except:
 import os
 from string import find,join,strip,replace
 
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gtk
 
 #-------------------------------------------------------------------------

src/GrampsCfg.py

@@ -35,11 +35,6 @@ import Plugins
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gobject
 import gconf
 import gtk

src/ImageSelect.py

@@ -32,11 +32,6 @@ import urlparse
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gobject
 import gtk
 import gnome.ui
@@ -223,6 +218,7 @@ class Gallery(ImageSelect):
             icon_list.connect("drag_data_get",
                               self.on_photolist_drag_data_get)
 
+        icon_list.connect('destroy',self.unmap)
         # Remember arguments
         self.path      = path;
         self.dataobj   = dataobj;
@@ -239,6 +235,11 @@ class Gallery(ImageSelect):
         self.sel = None
         self.photo = None
 
+    def unmap(self,obj):
+        for i in self.item_map.keys():
+            print i
+            i.destroy()
+        
     def on_canvas1_event(self,obj,event):
         """Handle resize events over the canvas, redrawing if the size changes"""
 

src/ImgManip.py

@@ -27,11 +27,6 @@ import string
 # Check for the python imaging library
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 try:
     import PIL.Image
     import StringIO

src/ListModel.py

@@ -18,11 +18,6 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 from gobject import TYPE_STRING, TYPE_PYOBJECT
 import gtk
 

src/LocEdit.py

@@ -23,10 +23,6 @@
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gtk.glade
 
 #-------------------------------------------------------------------------

src/Marriage.py

@@ -25,10 +25,6 @@ import pickle
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gobject
 import gtk
 import gtk.glade

src/MediaView.py

@@ -30,10 +30,6 @@ import string
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gobject
 import gtk
 import gtk.gdk

src/MergeData.py

@@ -30,10 +30,6 @@ import string
 # GNOME
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gtk.glade
 
 #-------------------------------------------------------------------------

src/NameEdit.py

@@ -23,10 +23,6 @@
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gtk.glade
 
 #-------------------------------------------------------------------------

src/NoteEdit.py

@@ -23,10 +23,6 @@
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gtk
 import gnome.ui
 

src/PaperMenu.py

@@ -23,10 +23,6 @@
 # GNOME modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gtk
 
 #-------------------------------------------------------------------------

src/PedView.py

@@ -27,11 +27,6 @@ _PERSON    = "p"
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gtk
 import gtk.gdk
 import gnome.canvas
@@ -154,7 +149,7 @@ class PedigreeView:
            as the root person of the tree."""
 
         for i in self.canvas_items:
-            self.i.destroy()
+            i.destroy()
         for i in self.boxes:
             i.cleanup()
             

src/PlaceView.py

@@ -27,10 +27,6 @@ Handles the place view for GRAMPS.
 # GTK modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gobject
 import gtk
 import gtk.gdk

src/Plugins.py

@@ -32,10 +32,6 @@ filters, importer, exporters, and document generators.
 # GTK libraries
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gobject
 import gtk
 import gtk.glade

src/QuestionDialog.py

@@ -18,11 +18,6 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gtk
 import gnome.ui
 from intl import gettext as _

src/QuickAdd.py

@@ -18,10 +18,6 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gtk.glade
 
 import Utils

src/RelImage.py

@@ -31,10 +31,6 @@ import string
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gtk
 from QuestionDialog import ErrorDialog
 

src/Report.py

@@ -36,10 +36,6 @@ import string
 # GNOME/GTK modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gtk
 import gnome.ui
 

src/SelectChild.py

@@ -37,10 +37,6 @@ import string
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gtk.glade
 
 #-------------------------------------------------------------------------

src/SourceView.py

@@ -29,10 +29,6 @@
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gobject
 import gtk
 import gtk.gdk

src/Sources.py

@@ -23,10 +23,6 @@
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gobject
 import gtk
 import gtk.glade

src/StartupDialog.py

@@ -19,11 +19,6 @@
 #
 
 import const
-
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gtk.glade
 import gnome
 import gconf

src/StyleEditor.py

@@ -30,10 +30,6 @@ __version__ = "$Revision$"
 # GNOME/GTK modules
 #
 #------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gtk.glade
 import gtk
 

src/UrlEdit.py

@@ -23,10 +23,6 @@
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gtk.glade
 
 #-------------------------------------------------------------------------

src/Utils.py

@@ -31,10 +31,6 @@ import os
 # GNOME/GTK
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gtk
 import grampslib
 

src/VersionControl.py

@@ -37,10 +37,6 @@ from re import compile
 # GTK/GNOME
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gtk.glade
 
 #-------------------------------------------------------------------------

src/gramps.py

@@ -18,12 +18,6 @@ except ImportError:
 #-------------------------------------------------------------------------
 import os
 import locale
-
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gtk.glade
 import intl
 
@@ -50,11 +44,6 @@ import sys
 # GNOME/GTK libraries
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gtk
 import gnome.ui
 

src/gramps_main.py

@@ -39,11 +39,6 @@ from intl import gettext as _
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gobject
 import gtk
 import gnome.ui