Check for None as a spouse in filter, use tabs for options in reports
svn: r985
This commit is contained in:
parent
208a3d4b60
commit
fe9ab88ef0
@ -213,6 +213,7 @@ class IsDescendantFamilyOf(Rule):
|
||||
s = fm.getMother()
|
||||
else:
|
||||
s = fm.getFather()
|
||||
if s:
|
||||
for (f,r1,r2) in s.getParentList():
|
||||
for p1 in [f.getMother(),f.getFather()]:
|
||||
if p1:
|
||||
|
@ -667,11 +667,18 @@ class ReportDialog:
|
||||
if max_rows == 0:
|
||||
return
|
||||
|
||||
frame = GtkFrame(_("Report Options"))
|
||||
frame.set_border_width(ReportDialog.frame_pad)
|
||||
self.window.vbox.add(frame)
|
||||
table = GtkTable(2,max_rows)
|
||||
frame.add(table)
|
||||
|
||||
if len(self.frame_names) == 0:
|
||||
frame = GtkFrame(_("Report Options"))
|
||||
frame.set_border_width(ReportDialog.frame_pad)
|
||||
self.window.vbox.add(frame)
|
||||
frame.add(table)
|
||||
else:
|
||||
self.notebook = GtkNotebook()
|
||||
self.window.vbox.pack_start(self.notebook,padding=ReportDialog.frame_pad)
|
||||
self.notebook.append_page(table,GtkLabel(_("Report Options")))
|
||||
self.notebook.set_border_width(ReportDialog.frame_pad)
|
||||
|
||||
pad = ReportDialog.border_pad
|
||||
if len(local_filters):
|
||||
@ -747,15 +754,13 @@ class ReportDialog:
|
||||
table.attach(widget,1,2,row,row+1,xpadding=pad,ypadding=pad)
|
||||
row = row + 1
|
||||
|
||||
|
||||
def setup_other_frames(self):
|
||||
pad = ReportDialog.border_pad
|
||||
for key in self.frame_names:
|
||||
frame = GtkFrame(key)
|
||||
frame.set_border_width(ReportDialog.frame_pad)
|
||||
self.window.vbox.add(frame)
|
||||
list = self.frames[key]
|
||||
table = GtkTable(2,len(list))
|
||||
frame.add(table)
|
||||
self.notebook.append_page(table,GtkLabel(_(key)))
|
||||
|
||||
row = 0
|
||||
for (text,widget) in list:
|
||||
@ -766,7 +771,7 @@ class ReportDialog:
|
||||
text_widget = GtkLabel(text)
|
||||
text_widget.set_alignment(1.0,0)
|
||||
table.attach(text_widget,0,1,row,row+1,FILL,FILL,pad,pad)
|
||||
table.attach(widget,1,2,row,row+1,
|
||||
table.attach(widget,1,2,row,row+1,yoptions=0,
|
||||
xpadding=pad,ypadding=pad)
|
||||
row = row + 1
|
||||
|
||||
|
@ -758,16 +758,18 @@ class WebReportDialog(ReportDialog):
|
||||
|
||||
self.add_option(imgdir_msg,self.imgdir)
|
||||
self.add_option('',self.use_link)
|
||||
self.add_option('',self.include_id)
|
||||
self.add_option(_('GRAMPS ID link URL'),self.linkpath)
|
||||
|
||||
title = _("Privacy Options")
|
||||
|
||||
title = _("Privacy")
|
||||
self.add_frame_option(title,None,self.no_private)
|
||||
self.add_frame_option(title,None,self.restrict_living)
|
||||
self.add_frame_option(title,None,self.no_images)
|
||||
self.add_frame_option(title,None,self.no_living_images)
|
||||
self.add_frame_option(title,None,self.no_comments)
|
||||
|
||||
title = _('Advanced')
|
||||
self.add_frame_option(title,'',self.include_id)
|
||||
self.add_frame_option(title,_('GRAMPS ID link URL'),self.linkpath)
|
||||
|
||||
self.no_images.connect('toggled',self.on_nophotos_toggled)
|
||||
|
||||
def show_link(self,obj):
|
||||
|
Loading…
Reference in New Issue
Block a user