Merge changes made in gramps20 into HEAD
svn: r4549
This commit is contained in:
@ -27,6 +27,15 @@
|
||||
#-------------------------------------------------------------------------
|
||||
from gettext import gettext as _
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
#
|
||||
# GTK/Gnome modules
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
import gtk
|
||||
import pango
|
||||
from gnome import help_display
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
#
|
||||
# GRAMPS modules
|
||||
@ -37,8 +46,6 @@ import ReportUtils
|
||||
import Utils
|
||||
import NameDisplay
|
||||
import const
|
||||
import gtk
|
||||
import pango
|
||||
|
||||
sex = ( _("female"), _("male"), _("unknown"))
|
||||
|
||||
@ -62,10 +69,15 @@ class Compare:
|
||||
|
||||
self.glade.get_widget('cancel').connect('clicked',self.cancel)
|
||||
self.glade.get_widget('close').connect('clicked',self.merge)
|
||||
self.glade.get_widget('help').connect('clicked',self.help)
|
||||
|
||||
def cancel(self,obj):
|
||||
self.top.destroy()
|
||||
|
||||
def help(self,obj):
|
||||
"""Display the relevant portion of GRAMPS manual"""
|
||||
help_display('gramps-manual','adv-merge-people')
|
||||
|
||||
def merge(self,obj):
|
||||
if self.glade.get_widget('select1').get_active():
|
||||
merge = MergePeople(self.db,self.p1,self.p2)
|
||||
@ -219,8 +231,11 @@ class MergePeopleUI:
|
||||
p1.set_label(n1)
|
||||
p2.set_label(n2)
|
||||
Utils.set_titles(top,glade.get_widget('title'),_("Merge People"))
|
||||
glade.get_widget('help').connect('clicked',self.help)
|
||||
|
||||
ret = top.run()
|
||||
ret = gtk.RESPONSE_HELP
|
||||
while ret == gtk.RESPONSE_HELP:
|
||||
ret = top.run()
|
||||
|
||||
if ret == gtk.RESPONSE_OK:
|
||||
if p1.get_active():
|
||||
@ -231,6 +246,11 @@ class MergePeopleUI:
|
||||
update()
|
||||
top.destroy()
|
||||
|
||||
def help(self,obj):
|
||||
"""Display the relevant portion of GRAMPS manual"""
|
||||
help_display('gramps-manual','adv-merge-people')
|
||||
|
||||
|
||||
def name_of(p):
|
||||
if not p:
|
||||
return ""
|
||||
|
Reference in New Issue
Block a user