From 028ed21efc371b36bc565bc411c9e6f16b80cdc7 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Wed, 2 Mar 2005 14:00:51 +0000 Subject: [PATCH] * src/DbPrompter.py (ImportDbPrompter.chooser): Explicitly import XML and GEDCOM. * src/plugins/FilterEditor.py (MySelect.get_text): Typo. svn: r4108 --- gramps2/ChangeLog | 5 +++++ gramps2/src/DbPrompter.py | 12 +++++++++++- gramps2/src/plugins/FilterEditor.py | 3 ++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 7d99c8560..774298462 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,8 @@ +2005-03-02 Alex Roitman + * src/DbPrompter.py (ImportDbPrompter.chooser): Explicitly + import XML and GEDCOM. + * src/plugins/FilterEditor.py (MySelect.get_text): Typo. + 2005-02-27 Alex Roitman * src/DbPrompter.py (format_maker): Add mnemonic activation target to the format selector label; Use new import format; don't treat diff --git a/gramps2/src/DbPrompter.py b/gramps2/src/DbPrompter.py index bf906e5b3..b579fcaf3 100644 --- a/gramps2/src/DbPrompter.py +++ b/gramps2/src/DbPrompter.py @@ -293,11 +293,21 @@ class ImportDbPrompter: if filetype == 'auto': filetype = get_mime_type(filename) - if filetype == 'application/x-gramps': + if filetype == const.app_gramps: choose.destroy() ReadGrdb.importData(self.parent.db,filename) self.parent.import_tool_callback() return True + elif filetype == const.app_gramps_xml: + choose.destroy() + import ReadXML + ReadXML.importData(self.parent.db,filename) + return True + elif filetype == const.app_gramps_gedcom: + choose.destroy() + import ReadGedcom + ReadGedcom.importData(self.parent.db,filename) + return True (the_path,the_file) = os.path.split(filename) GrampsKeys.save_last_import_dir(the_path) diff --git a/gramps2/src/plugins/FilterEditor.py b/gramps2/src/plugins/FilterEditor.py index 538d3c654..d4dafd38f 100644 --- a/gramps2/src/plugins/FilterEditor.py +++ b/gramps2/src/plugins/FilterEditor.py @@ -1,7 +1,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Copyright (C) 2000-2004 Donald N. Allingham +# Copyright (C) 2000-2005 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 @@ -200,6 +200,7 @@ class MySelect(gtk.ComboBoxEntry): def __init__(self,transtable): gtk.ComboBoxEntry.__init__(self) + self.transtable = transtable AutoComp.fill_combo(self,transtable.get_values()) self.show()