From 4cd7010bcbf44e12fc482b8dde76a97f15bda733 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Wed, 27 Nov 2002 05:56:23 +0000 Subject: [PATCH] Removed unneeded pygtk calls svn: r1210 --- gramps2/example/gramps/data.gramps | Bin 3720 -> 3734 bytes gramps2/src/AddMedia.py | 6 -- gramps2/src/AddSpouse.py | 142 +---------------------------- gramps2/src/AddrEdit.py | 5 - gramps2/src/AttrEdit.py | 5 - gramps2/src/AutoComp.py | 5 - gramps2/src/Bookmarks.py | 5 - gramps2/src/ChooseParents.py | 5 - gramps2/src/DateEdit.py | 5 - gramps2/src/DbPrompter.py | 5 - gramps2/src/DisplayTrace.py | 5 - gramps2/src/EditPerson.py | 5 - gramps2/src/EditPlace.py | 5 - gramps2/src/EditSource.py | 5 - gramps2/src/EventEdit.py | 5 - gramps2/src/FamilyView.py | 5 - gramps2/src/Filter.py | 5 - gramps2/src/Find.py | 5 - gramps2/src/GenericFilter.py | 5 - gramps2/src/GrampsCfg.py | 5 - gramps2/src/ImageSelect.py | 11 ++- gramps2/src/ImgManip.py | 5 - gramps2/src/ListModel.py | 5 - gramps2/src/LocEdit.py | 4 - gramps2/src/Marriage.py | 4 - gramps2/src/MediaView.py | 4 - gramps2/src/MergeData.py | 4 - gramps2/src/NameEdit.py | 4 - gramps2/src/NoteEdit.py | 4 - gramps2/src/PaperMenu.py | 4 - gramps2/src/PedView.py | 7 +- gramps2/src/PlaceView.py | 4 - gramps2/src/Plugins.py | 4 - gramps2/src/QuestionDialog.py | 5 - gramps2/src/QuickAdd.py | 4 - gramps2/src/RelImage.py | 4 - gramps2/src/Report.py | 4 - gramps2/src/SelectChild.py | 4 - gramps2/src/SourceView.py | 4 - gramps2/src/Sources.py | 4 - gramps2/src/StartupDialog.py | 5 - gramps2/src/StyleEditor.py | 4 - gramps2/src/UrlEdit.py | 4 - gramps2/src/Utils.py | 4 - gramps2/src/VersionControl.py | 4 - gramps2/src/gramps.py | 11 --- gramps2/src/gramps_main.py | 5 - 47 files changed, 9 insertions(+), 354 deletions(-) diff --git a/gramps2/example/gramps/data.gramps b/gramps2/example/gramps/data.gramps index 3e43c08f8dcea48227972f74d871445b338262ed..f0d1b873a27675608c4488955dbe4890d8674cfd 100644 GIT binary patch delta 3695 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 N{{s|ORuF+<008EW799Wp delta 3681 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 diff --git a/gramps2/src/AddMedia.py b/gramps2/src/AddMedia.py index 7e6b9133d..dd5a9c2e3 100644 --- a/gramps2/src/AddMedia.py +++ b/gramps2/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 #------------------------------------------------------------------------- diff --git a/gramps2/src/AddSpouse.py b/gramps2/src/AddSpouse.py index 5aaf41b6f..a8823ec7a 100644 --- a/gramps2/src/AddSpouse.py +++ b/gramps2/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() diff --git a/gramps2/src/AddrEdit.py b/gramps2/src/AddrEdit.py index c2f7b86fb..2a50ca338 100644 --- a/gramps2/src/AddrEdit.py +++ b/gramps2/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 #------------------------------------------------------------------------- diff --git a/gramps2/src/AttrEdit.py b/gramps2/src/AttrEdit.py index 87f3ee602..ce4dfb4a8 100644 --- a/gramps2/src/AttrEdit.py +++ b/gramps2/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 #------------------------------------------------------------------------- diff --git a/gramps2/src/AutoComp.py b/gramps2/src/AutoComp.py index 9188d369f..38e9e6e57 100644 --- a/gramps2/src/AutoComp.py +++ b/gramps2/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 #------------------------------------------------------------------------- diff --git a/gramps2/src/Bookmarks.py b/gramps2/src/Bookmarks.py index d31e5054a..64da9c652 100644 --- a/gramps2/src/Bookmarks.py +++ b/gramps2/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 diff --git a/gramps2/src/ChooseParents.py b/gramps2/src/ChooseParents.py index c1bad335a..756dcb560 100644 --- a/gramps2/src/ChooseParents.py +++ b/gramps2/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 diff --git a/gramps2/src/DateEdit.py b/gramps2/src/DateEdit.py index 4618e6a2a..b87920a97 100644 --- a/gramps2/src/DateEdit.py +++ b/gramps2/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 diff --git a/gramps2/src/DbPrompter.py b/gramps2/src/DbPrompter.py index 08f8283b1..23582d6bd 100644 --- a/gramps2/src/DbPrompter.py +++ b/gramps2/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 diff --git a/gramps2/src/DisplayTrace.py b/gramps2/src/DisplayTrace.py index 75d09b114..b9dd97e4d 100644 --- a/gramps2/src/DisplayTrace.py +++ b/gramps2/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 #------------------------------------------------------------------------- diff --git a/gramps2/src/EditPerson.py b/gramps2/src/EditPerson.py index 316b7f3a6..abcc74542 100644 --- a/gramps2/src/EditPerson.py +++ b/gramps2/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 diff --git a/gramps2/src/EditPlace.py b/gramps2/src/EditPlace.py index 3fe816aaa..10f56124e 100644 --- a/gramps2/src/EditPlace.py +++ b/gramps2/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 diff --git a/gramps2/src/EditSource.py b/gramps2/src/EditSource.py index 8ea4696c6..404a4d77a 100644 --- a/gramps2/src/EditSource.py +++ b/gramps2/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 #------------------------------------------------------------------------- diff --git a/gramps2/src/EventEdit.py b/gramps2/src/EventEdit.py index bd82f1256..405cb4c83 100644 --- a/gramps2/src/EventEdit.py +++ b/gramps2/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 diff --git a/gramps2/src/FamilyView.py b/gramps2/src/FamilyView.py index fbb09412b..4acad7665 100644 --- a/gramps2/src/FamilyView.py +++ b/gramps2/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 diff --git a/gramps2/src/Filter.py b/gramps2/src/Filter.py index 5258d557a..16823e4a4 100644 --- a/gramps2/src/Filter.py +++ b/gramps2/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 _ diff --git a/gramps2/src/Find.py b/gramps2/src/Find.py index 7acefabbc..d57e814bd 100644 --- a/gramps2/src/Find.py +++ b/gramps2/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 * diff --git a/gramps2/src/GenericFilter.py b/gramps2/src/GenericFilter.py index ff95fd654..51b6f42cc 100644 --- a/gramps2/src/GenericFilter.py +++ b/gramps2/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 #------------------------------------------------------------------------- diff --git a/gramps2/src/GrampsCfg.py b/gramps2/src/GrampsCfg.py index 5a24f7a2d..8fdc7b51b 100644 --- a/gramps2/src/GrampsCfg.py +++ b/gramps2/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 diff --git a/gramps2/src/ImageSelect.py b/gramps2/src/ImageSelect.py index e3b6b4ae9..59118a953 100644 --- a/gramps2/src/ImageSelect.py +++ b/gramps2/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""" diff --git a/gramps2/src/ImgManip.py b/gramps2/src/ImgManip.py index bc4937a32..d7df9b9a6 100644 --- a/gramps2/src/ImgManip.py +++ b/gramps2/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 diff --git a/gramps2/src/ListModel.py b/gramps2/src/ListModel.py index 0eaf7e1f1..00fca8bcc 100644 --- a/gramps2/src/ListModel.py +++ b/gramps2/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 diff --git a/gramps2/src/LocEdit.py b/gramps2/src/LocEdit.py index f80f93641..05780a204 100644 --- a/gramps2/src/LocEdit.py +++ b/gramps2/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 #------------------------------------------------------------------------- diff --git a/gramps2/src/Marriage.py b/gramps2/src/Marriage.py index 96885b135..17b6ebe01 100644 --- a/gramps2/src/Marriage.py +++ b/gramps2/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 diff --git a/gramps2/src/MediaView.py b/gramps2/src/MediaView.py index c6252ef6e..ff7296a17 100644 --- a/gramps2/src/MediaView.py +++ b/gramps2/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 diff --git a/gramps2/src/MergeData.py b/gramps2/src/MergeData.py index 0c0ef72da..62389d8b1 100644 --- a/gramps2/src/MergeData.py +++ b/gramps2/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 #------------------------------------------------------------------------- diff --git a/gramps2/src/NameEdit.py b/gramps2/src/NameEdit.py index e7acc3808..7cf73c804 100644 --- a/gramps2/src/NameEdit.py +++ b/gramps2/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 #------------------------------------------------------------------------- diff --git a/gramps2/src/NoteEdit.py b/gramps2/src/NoteEdit.py index c68066875..ed380352e 100644 --- a/gramps2/src/NoteEdit.py +++ b/gramps2/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 diff --git a/gramps2/src/PaperMenu.py b/gramps2/src/PaperMenu.py index b7d0d4b71..d4c8b2261 100644 --- a/gramps2/src/PaperMenu.py +++ b/gramps2/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 #------------------------------------------------------------------------- diff --git a/gramps2/src/PedView.py b/gramps2/src/PedView.py index 9a931cc4a..a5af737b0 100644 --- a/gramps2/src/PedView.py +++ b/gramps2/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() diff --git a/gramps2/src/PlaceView.py b/gramps2/src/PlaceView.py index fe382ac6f..852b596ab 100644 --- a/gramps2/src/PlaceView.py +++ b/gramps2/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 diff --git a/gramps2/src/Plugins.py b/gramps2/src/Plugins.py index 61721c990..71d17bbc7 100644 --- a/gramps2/src/Plugins.py +++ b/gramps2/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 diff --git a/gramps2/src/QuestionDialog.py b/gramps2/src/QuestionDialog.py index f0db00470..163da9e73 100644 --- a/gramps2/src/QuestionDialog.py +++ b/gramps2/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 _ diff --git a/gramps2/src/QuickAdd.py b/gramps2/src/QuickAdd.py index cab195419..685b39360 100644 --- a/gramps2/src/QuickAdd.py +++ b/gramps2/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 diff --git a/gramps2/src/RelImage.py b/gramps2/src/RelImage.py index de665eed8..48d8bfc51 100644 --- a/gramps2/src/RelImage.py +++ b/gramps2/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 diff --git a/gramps2/src/Report.py b/gramps2/src/Report.py index b711876d6..2331b61ae 100644 --- a/gramps2/src/Report.py +++ b/gramps2/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 diff --git a/gramps2/src/SelectChild.py b/gramps2/src/SelectChild.py index 9a45436c3..03ba2f6c5 100644 --- a/gramps2/src/SelectChild.py +++ b/gramps2/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 #------------------------------------------------------------------------- diff --git a/gramps2/src/SourceView.py b/gramps2/src/SourceView.py index 5d49fe7e9..dfa6c695c 100644 --- a/gramps2/src/SourceView.py +++ b/gramps2/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 diff --git a/gramps2/src/Sources.py b/gramps2/src/Sources.py index 844daa20d..dc5438e40 100644 --- a/gramps2/src/Sources.py +++ b/gramps2/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 diff --git a/gramps2/src/StartupDialog.py b/gramps2/src/StartupDialog.py index bde13dda8..211d33d29 100644 --- a/gramps2/src/StartupDialog.py +++ b/gramps2/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 diff --git a/gramps2/src/StyleEditor.py b/gramps2/src/StyleEditor.py index 954ca6709..7d23ba734 100644 --- a/gramps2/src/StyleEditor.py +++ b/gramps2/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 diff --git a/gramps2/src/UrlEdit.py b/gramps2/src/UrlEdit.py index f020c5b21..0680e361d 100644 --- a/gramps2/src/UrlEdit.py +++ b/gramps2/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 #------------------------------------------------------------------------- diff --git a/gramps2/src/Utils.py b/gramps2/src/Utils.py index b7e530be6..3950dff17 100644 --- a/gramps2/src/Utils.py +++ b/gramps2/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 diff --git a/gramps2/src/VersionControl.py b/gramps2/src/VersionControl.py index 83ac4a6ad..5587b6c0e 100644 --- a/gramps2/src/VersionControl.py +++ b/gramps2/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 #------------------------------------------------------------------------- diff --git a/gramps2/src/gramps.py b/gramps2/src/gramps.py index f7468aaca..18e8c02ed 100755 --- a/gramps2/src/gramps.py +++ b/gramps2/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 diff --git a/gramps2/src/gramps_main.py b/gramps2/src/gramps_main.py index 3b19e1721..4df47d2f4 100755 --- a/gramps2/src/gramps_main.py +++ b/gramps2/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