From 7b9dec0fce63ceb55f55b73e4f54e60334bc5e73 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Sat, 30 Dec 2006 17:49:08 +0000 Subject: [PATCH] 2006-12-30 Don Allingham * src/DataViews/_RelationView.py: Add edit button to view, shorten names of buttons * src/GrampsDb/_GrampsGEDDB.py: properly handle bookmark list svn: r7858 --- gramps2/ChangeLog | 5 +++++ gramps2/FAQ | 19 ++++--------------- gramps2/src/DataViews/_RelationView.py | 21 ++++++++++++--------- gramps2/src/GrampsDb/_GrampsGEDDB.py | 8 ++------ 4 files changed, 23 insertions(+), 30 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index b2593faad..7742f5d88 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,8 @@ +2006-12-30 Don Allingham + * src/DataViews/_RelationView.py: Add edit button to view, shorten names of + buttons + * src/GrampsDb/_GrampsGEDDB.py: properly handle bookmark list + 2006-12-28 Don Allingham * src/docgen/PdfDoc.py: convert image name to str from unicode due to a ReportLab bug. diff --git a/gramps2/FAQ b/gramps2/FAQ index ef5a544f8..cb213d2ff 100644 --- a/gramps2/FAQ +++ b/gramps2/FAQ @@ -83,22 +83,12 @@ program and source code freely. 3. Does it work with Windows (tm)? -No. GRAMPS uses the GTK and GNOME libraries. While the GTK libraries -have been ported to Windows, the GNOME libraries have not. -This, however, may change in the future. +Yes, but it is not offically supported by the GRAMPS project. 4. Does it work with the Mac? -The Fink project (http://fink.sf.net) has ported an old version of -GRAMPS (0.8.0) to OSX. The Mac OSX port is not directly supported by -the GRAMPS project, primarily because none of the GRAMPS developers -have access to Mac OSX. - -The GNOME 2 version of GRAMPS (0.9.x) does not appear to have been -ported by the Fink project. Please contact the Fink project for more -information. - +Several people have managed to get GRAMPS to work under OSX using the darwin ports. 5. Does it work with KDE? @@ -108,12 +98,11 @@ Yes, as long as the required GNOME libraries are installed. 6. Do I really have to have GNOME installed? Yes, but you do not have to be running the GNOME desktop. - +n 7. What version of GNOME do I need? -The latest versions of gramps (0.9.0 and higher) require GNOME 2.0 or higher. -Previous versions required GNOME 1.X. +The latest versions of gramps require GNOME 2.8 or higher. 8. Is GRAMPS compatible with other genealogical software (GenApps)? diff --git a/gramps2/src/DataViews/_RelationView.py b/gramps2/src/DataViews/_RelationView.py index d05e48228..619b80c4c 100644 --- a/gramps2/src/DataViews/_RelationView.py +++ b/gramps2/src/DataViews/_RelationView.py @@ -255,6 +255,7 @@ class RelationshipView(PageView.PersonNavView): + @@ -279,6 +280,7 @@ class RelationshipView(PageView.PersonNavView): + @@ -304,11 +306,13 @@ class RelationshipView(PageView.PersonNavView): self.family_action = gtk.ActionGroup(self.title + '/Family') self.family_action.add_actions([ - ('AddSpouse', 'gramps-spouse', _('Add Spouse'), None , + ('Edit', gtk.STOCK_EDIT, _('Edit'), None , + _("Edits the active person"), self.edit_active), + ('AddSpouse', 'gramps-spouse', _('Spouse'), None , _("Adds a new relationship"), self.add_spouse), - ('AddParents', 'gramps-parents', _('Add Parents'), None , + ('AddParents', 'gramps-parents', _('Add'), None , _("Adds a new set of parents"), self.add_parents), - ('ShareFamily', 'gramps-sharefamily', _('Share Parents'), None , + ('ShareFamily', 'gramps-sharefamily', _('Share'), None , _("Adds an existing set of parents"), self.select_parents), ]) @@ -980,12 +984,7 @@ class RelationshipView(PageView.PersonNavView): def edit_button_press(self, obj, event, handle): if event.type == gtk.gdk.BUTTON_PRESS and event.button == 1: - from Editors import EditPerson - person = self.dbstate.db.get_person_from_handle(handle) - try: - EditPerson(self.dbstate, self.uistate, [], person) - except Errors.WindowActiveError: - pass + self.edit_person(obj, handle) def edit_person(self, obj, handle): from Editors import EditPerson @@ -1035,6 +1034,10 @@ class RelationshipView(PageView.PersonNavView): except Errors.WindowActiveError: pass + def edit_active(self, obj): + phandle = self.dbstate.get_active_person().handle + self.edit_person(obj, phandle) + def select_family(self, obj, event, handle): if event.type == gtk.gdk.BUTTON_PRESS and event.button == 1: from Selectors import selector_factory diff --git a/gramps2/src/GrampsDb/_GrampsGEDDB.py b/gramps2/src/GrampsDb/_GrampsGEDDB.py index 16480080e..b0add8bf4 100644 --- a/gramps2/src/GrampsDb/_GrampsGEDDB.py +++ b/gramps2/src/GrampsDb/_GrampsGEDDB.py @@ -51,18 +51,14 @@ class GrampsGEDDB(GrampsInMemDB): GrampsInMemDB.load(self,name,callback,mode) importData(self,name,callback,use_trans=False) - self.bookmarks = self.metadata.get('bookmarks') - if self.bookmarks == None: - self.bookmarks = [] + self.bookmarks = GrampsDbBookmarks(self.metadata.get('bookmarks',[])) self.db_is_open = True return 1 def load_from(self, other_database, filename, callback): db_copy(other_database,self,callback) GrampsInMemDB.load(self,filename,callback) - self.bookmarks = self.metadata.get('bookmarks') - if self.bookmarks == None: - self.bookmarks = [] + self.bookmarks = GrampsDbBookmarks(self.metadata.get('bookmarks',[])) self.db_is_open = True writer = GedcomWriter(self,self.get_default_person(), callback=callback)