fix bug #2709, merged from gramps31 (thanks Jérôme for the patch)
svn: r12080
This commit is contained in:
parent
049ea61b10
commit
dfb71b6cd2
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# Gramps - a GTK+/GNOME based genealogy program
|
# Gramps - a GTK+/GNOME based genealogy program
|
||||||
#
|
#
|
||||||
# Copyright (C) 2007 Stephane Charette
|
# Copyright (C) 2007-2009 Stephane Charette
|
||||||
# Copyright (C) 2008 Brian Matherly
|
# Copyright (C) 2008 Brian 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
|
||||||
@ -46,6 +46,7 @@ import gobject
|
|||||||
from PluginUtils import Tool
|
from PluginUtils import Tool
|
||||||
from gen.plug import PluginManager
|
from gen.plug import PluginManager
|
||||||
from ReportBase import ReportUtils
|
from ReportBase import ReportUtils
|
||||||
|
from PluginUtils import Tool
|
||||||
from Editors import EditPerson, EditFamily
|
from Editors import EditPerson, EditFamily
|
||||||
import ManagedWindow
|
import ManagedWindow
|
||||||
import Utils
|
import Utils
|
||||||
@ -65,10 +66,14 @@ WIKI_HELP_SEC = _('manual|Not_Related...')
|
|||||||
#
|
#
|
||||||
#
|
#
|
||||||
#------------------------------------------------------------------------
|
#------------------------------------------------------------------------
|
||||||
class NotRelated(Tool.Tool, ManagedWindow.ManagedWindow) :
|
class NotRelated(Tool.ActivePersonTool, ManagedWindow.ManagedWindow) :
|
||||||
|
|
||||||
def __init__(self, dbstate, uistate, options_class, name, callback=None):
|
def __init__(self, dbstate, uistate, options_class, name, callback=None):
|
||||||
Tool.Tool.__init__(self, dbstate, options_class, name)
|
Tool.ActivePersonTool.__init__(self, dbstate, options_class, name)
|
||||||
|
|
||||||
|
if self.fail: # bug #2709 -- fail if we have no active person
|
||||||
|
return
|
||||||
|
|
||||||
person = dbstate.get_active_person()
|
person = dbstate.get_active_person()
|
||||||
self.name = person.get_primary_name().get_regular_name()
|
self.name = person.get_primary_name().get_regular_name()
|
||||||
self.title = _('Not related to "%s"') % self.name
|
self.title = _('Not related to "%s"') % self.name
|
||||||
@ -212,7 +217,7 @@ class NotRelated(Tool.Tool, ManagedWindow.ManagedWindow) :
|
|||||||
EditPerson(self.dbstate, self.uistate, [], person)
|
EditPerson(self.dbstate, self.uistate, [], person)
|
||||||
except Errors.WindowActiveError:
|
except Errors.WindowActiveError:
|
||||||
pass
|
pass
|
||||||
#
|
|
||||||
def on_help_clicked(self, obj):
|
def on_help_clicked(self, obj):
|
||||||
"""Display the relevant portion of GRAMPS manual"""
|
"""Display the relevant portion of GRAMPS manual"""
|
||||||
GrampsDisplay.help(WIKI_HELP_PAGE , WIKI_HELP_SEC)
|
GrampsDisplay.help(WIKI_HELP_PAGE , WIKI_HELP_SEC)
|
||||||
|
Loading…
Reference in New Issue
Block a user