2008-01-09 Raphael Ackermann <raphael.ackermann@gmail.com>

svn: r9760
This commit is contained in:
Raphael Ackermann 2008-01-09 06:45:15 +00:00
parent 0af382cf1e
commit b7c7952058
4 changed files with 14 additions and 18 deletions

View File

@ -1,3 +1,8 @@
2008-01-09 Raphael Ackermann <raphael.ackermann@gmail.com>
* src/ViewManager.py: delete unneded method import_pkg
* src/ArgHandler.py: fix import CompressionError instead of CompressError
* src/gen/proxy/filter.py: fix not needed family= line
2008-01-08 Brian Matherly <brian@gramps-project.org> 2008-01-08 Brian Matherly <brian@gramps-project.org>
* src/PluginUtils/_MenuOptions.py: * src/PluginUtils/_MenuOptions.py:
Fix 0001539: Tab order incorrect - Statistics Chart configuration Fix 0001539: Tab order incorrect - Statistics Chart configuration

View File

@ -2,7 +2,7 @@
# Gramps - a GTK+/GNOME based genealogy program # Gramps - a GTK+/GNOME based genealogy program
# #
# Copyright (C) 2000-2006 Donald N. Allingham, A. Roitman # Copyright (C) 2000-2006 Donald N. Allingham, A. Roitman
# Copyright (C) 2007 B. Malengier # Copyright (C) 2007-2008 B. Malengier
# #
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
@ -527,7 +527,7 @@ class ArgHandler:
except tarfile.ReadError, msg: except tarfile.ReadError, msg:
print "Error reading archive:", msg print "Error reading archive:", msg
sys.exit(1) sys.exit(1)
except tarfile.CompressError, msg: except tarfile.CompressionError, msg:
print "Error uncompressing archive:", msg print "Error uncompressing archive:", msg
sys.exit(1) sys.exit(1)
except: except:

View File

@ -77,7 +77,7 @@ import UndoHistory
from DbLoader import DbLoader from DbLoader import DbLoader
import GrampsDisplay import GrampsDisplay
from gen.utils import ProgressMonitor from gen.utils import ProgressMonitor
import gen.db #import gen.db
import ProgressDialog import ProgressDialog
@ -1033,14 +1033,6 @@ class ViewManager:
self._key = self.uistate.connect( self._key = self.uistate.connect(
'nameformat-changed', self.active_page.build_tree) 'nameformat-changed', self.active_page.build_tree)
def import_pkg(self, filename):
"""
Imports a GRAMPS package
"""
import ReadPkg
ReadPkg.impData(self.state.db, filename, self.uistate.pulse_progressbar)
self.__post_load()
def import_data(self, obj): def import_data(self, obj):
""" """
Imports a file Imports a file

View File

@ -1,7 +1,7 @@
# #
# Gramps - a GTK+/GNOME based genealogy program # Gramps - a GTK+/GNOME based genealogy program
# #
# Copyright (C) 2007 Brian G. Matherly # Copyright (C) 2007-2008 Brian G. Matherly
# #
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
@ -32,7 +32,7 @@ __revision__ = "$Revision: 8864 $"
# GRAMPS libraries # GRAMPS libraries
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from gen.lib import * #from gen.lib import *
from proxybase import ProxyDbBase from proxybase import ProxyDbBase
class FilterProxyDb(ProxyDbBase): class FilterProxyDb(ProxyDbBase):
@ -64,7 +64,6 @@ class FilterProxyDb(ProxyDbBase):
for handle in list(self.plist): for handle in list(self.plist):
person = self.db.get_person_from_handle(handle) person = self.db.get_person_from_handle(handle)
for family_handle in person.get_family_handle_list(): for family_handle in person.get_family_handle_list():
family = self.db.get_family_from_handle(family_handle)
self.flist.add(family_handle) self.flist.add(family_handle)
def get_person_from_handle(self, handle): def get_person_from_handle(self, handle):