From 9212db19bcecf9cfa26b1089a5ab49782b2fcec0 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Mon, 8 May 2006 01:42:30 +0000 Subject: [PATCH] * src/DisplayState.py: include name and relationship on statusbar svn: r6575 --- gramps2/ChangeLog | 1 + gramps2/src/DisplayState.py | 14 ++++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 4aea1df70..db4acbede 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,4 +1,5 @@ 2006-05-07 Don Allingham + * src/DisplayState.py: include name and relationship on statusbar * src/DataViews/_MediaView.py: tool tips * src/DataViews/_RepositoryView.py: tool tips * src/DataViews/_SourceView.py: tool tips diff --git a/gramps2/src/DisplayState.py b/gramps2/src/DisplayState.py index b8647c3c1..64d614838 100644 --- a/gramps2/src/DisplayState.py +++ b/gramps2/src/DisplayState.py @@ -325,12 +325,14 @@ class DisplayState(GrampsDb.GrampsDBCallback): if self.dbstate.active == None: self.status.push(self.status_id,"") else: - if Config.get(Config.STATUSBAR) <= 1: - person = self.dbstate.get_active_person() - pname = NameDisplay.displayer.display(person) - name = "[%s] %s" % (person.get_gramps_id(),pname) - else: - name = self.display_relationship() + person = self.dbstate.get_active_person() + pname = NameDisplay.displayer.display(person) + name = "[%s] %s" % (person.get_gramps_id(),pname) + if Config.get(Config.STATUSBAR) > 1: + if person.handle != self.dbstate.db.get_default_person().handle: + msg = self.display_relationship() + if msg: + name = "%s (%s)" % (name,msg) self.status.push(self.status_id,name) while gtk.events_pending():