From be7b3b54cb51937232fd98b64ec8e597bdf8378b Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Sun, 21 Apr 2002 14:53:28 +0000 Subject: [PATCH] General cleaup svn: r940 --- gramps/example/gramps/data.gramps | Bin 3538 -> 3552 bytes gramps/src/DbPrompter.py | 4 +- gramps/src/EditPerson.py | 16 ------- gramps/src/EditPlace.py | 40 ++++++++-------- gramps/src/EditSource.py | 36 ++++++--------- gramps/src/GenericFilter.py | 8 ---- gramps/src/Report.py | 3 +- gramps/src/Sources.py | 5 +- gramps/src/TextDoc.py | 4 ++ gramps/src/data/templates/blue_edge.tpkg | Bin 652 -> 690 bytes gramps/src/data/templates/sepia.tpkg | Bin 0 -> 2656 bytes gramps/src/data/templates/templates.xml | 1 + gramps/src/docgen/HtmlDoc.py | 20 +++++++- gramps/src/gramps.glade | 56 ++++++++++++++++++++--- gramps/src/places.glade | 2 +- gramps/src/plugins/WebPage.py | 6 +++ gramps/src/sort.py | 16 +++---- 17 files changed, 126 insertions(+), 91 deletions(-) create mode 100644 gramps/src/data/templates/sepia.tpkg diff --git a/gramps/example/gramps/data.gramps b/gramps/example/gramps/data.gramps index e2ce3daeec06fa824f22b2d199962478ab93a94c..45e7f86e207904d37c9d96155c384ad2621bf53b 100644 GIT binary patch delta 3526 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 mG|=_ebp01hw}7Jjf~Z3Kc(@Ua 0: - add(_("Individual Events")) - add("\n-----------------------------\n") for p in p_event_list: - add("%s: %s\n" % (p[0],const.display_pevent(p[1]))) + slist.append([_("Individual Events"),p[0], + const.display_pevent(p[1])]) if len(p_attr_list) > 0: - add(_("Individual Attributes")) - add("\n-----------------------------\n") for p in p_attr_list: - add("%s: %s\n" % (p[0],const.display_pattr(p[1]))) + slist.append([_("Individual Attributes"),p[0], + const.display_pattr(p[1])]) if len(p_name_list) > 0: - add(_("Individual Names")) - add("\n-----------------------------\n") for p in p_name_list: - add("%s: %s\n" % p) + slist.append([_("Individual Names"),p[0],p[1]]) if len(f_event_list) > 0: - add(_("Family Events")) - add("\n-----------------------------\n") for p in f_event_list: - add("%s: %s\n" % (p[0],const.display_fevent(p[1]))) + slist.append([_("Family Events"),p[0], + const.display_fevent(p[1])]) if len(f_attr_list) > 0: - add(_("Family Attributes")) - add("\n-----------------------------\n") for p in f_event_list: - add("%s: %s\n" % (p[0],const.display_fattr(p[1]))) + slist.append([_("Family Attributes"),p[0], + const.display_fattr(p[1])]) if len(m_list) > 0: - add(_("Media Objects")) - add("\n-----------------------------\n") for p in m_list: - add("%s\n" % m) - if len(m_list) > 0: - add(_("Places")) - add("\n-----------------------------\n") + slist.append([_("Media Objects"),p,'']) + if len(p_list) > 0: for p in p_list: - add("%s\n" % m) + slist.append([_("Places"),p,'']) def on_source_apply_clicked(self,obj): diff --git a/gramps/src/GenericFilter.py b/gramps/src/GenericFilter.py index 4d51590ca..bb4f9f6ce 100644 --- a/gramps/src/GenericFilter.py +++ b/gramps/src/GenericFilter.py @@ -37,7 +37,6 @@ except: # Standard Python modules # #------------------------------------------------------------------------- -import types import os from string import find,join,strip,replace import gtk @@ -329,7 +328,6 @@ class HasRelationship(Rule): cnt = cnt + len(f.getChildList()) if self.list[1] and f.getRelationship() == self.list[1]: rel_type = 1 - rval = 0 # if number of relations specified if self.list[0]: @@ -537,12 +535,6 @@ class GenericFilter: self.logical_op = 'and' self.invert = 0 - def set_logical_or(self,val): - self.logical_op = 'or' - - def get_logical_or(self): - return self.logical_op == 'or' - def set_logical_op(self,val): if val in const.logical_functions: self.logical_op = val diff --git a/gramps/src/Report.py b/gramps/src/Report.py index e70e67254..b5aa3dcfa 100644 --- a/gramps/src/Report.py +++ b/gramps/src/Report.py @@ -630,7 +630,8 @@ class ReportDialog: FILL|EXPAND,FILL|EXPAND,pad,pad) table.attach(GtkLabel(_("User Template")),0,1,1,2, FILL,FILL,pad,pad) - self.html_fileentry = GnomeFileEntry(_("HTML Template"),_("Choose File")) + self.html_fileentry = GnomeFileEntry(_("HTML Template"), + _("Choose File")) self.html_fileentry.set_sensitive(0) table.attach(self.html_fileentry,1,2,1,2, FILL|EXPAND,FILL|EXPAND,pad,pad) diff --git a/gramps/src/Sources.py b/gramps/src/Sources.py index cc63b7ae0..0fef65706 100644 --- a/gramps/src/Sources.py +++ b/gramps/src/Sources.py @@ -42,8 +42,6 @@ from RelLib import * # #------------------------------------------------------------------------- -_MENUVAL = "a" - class SourceSelector: def __init__(self,srclist,parent,update=None): @@ -206,7 +204,8 @@ class SourceEditor: page = self.get_widget("spage").get_text() date = self.get_widget("sdate").get_text() text = self.get_widget("stext").get_chars(0,-1) - conf = self.get_widget("conf").get_menu().get_active().get_data(_MENUVAL) + conf = self.get_widget("conf").get_menu().get_active().get_data('a') + comments = self.get_widget("scomment").get_chars(0,-1) self.source_ref.setPage(page) diff --git a/gramps/src/TextDoc.py b/gramps/src/TextDoc.py index 5a35fc8cb..a61361d6e 100644 --- a/gramps/src/TextDoc.py +++ b/gramps/src/TextDoc.py @@ -591,6 +591,7 @@ class TextDoc: self.lmargin = 2.54 self.rmargin = 2.54 self.title = "" + self.owner = '' self.font = FontStyle() self.style_list = styles.get_styles() @@ -599,6 +600,9 @@ class TextDoc: self.name = "" self.photo_list = [] + def set_owner(self,owner): + self.owner = owner + def add_photo(self,name,align,w_cm,h_cm): """adds a photo of the specified width (in centimeters)""" pass diff --git a/gramps/src/data/templates/blue_edge.tpkg b/gramps/src/data/templates/blue_edge.tpkg index 3946012dca549da68a6279ed4e67db00e94d07f3..34722c11f1a4c4ed29c2b60fb5cce0619b5c6aaf 100644 GIT binary patch delta 236 zcmVb7y`u&jf{+pNAo{DfQ?6pua6y< zjfbnF3y=!&4DoRV()w@)R03R1AW8{aC1^3B1k&W_M)Mn3>W(2ebiy2FCFAzkxX@{~H+@nT_UudH@@b5MLiVE*lS5 zM;9O!;u+%O3Z(Vn45$RSoIsQkwo1@qLJ6eF(aFbEA>7j?#KTqz7}u&`!5|Rf0v9$l zP*MnU^zn4}vsEg|F90d=^mSJV4sy0tf;U2ykd=d-;euj{rKu{0DT=zf3c(>BjzJ*` yy1H<#e*lCBF+d;e7=5riK@5;*zEC5g&xHS}JWn%$_ zitF3hKmj1=d!5w^F>DTr1p)!WnGDi@s<+znzbNTGUhXQujX;s9g7I*{0|0VPB3oAB zBT<}VT&pQc6r()?*Z_c%x;RL+3lran3gtN%oU44h%sT0Hpo$P%4^dG7#sx))doqwWoCrH4 zo&mrkqCq?^C|^oRlqA#SOvI%{SBK@~X?HaH zeI5d<=-(0!|5g9iqAW~Q-$Gk>?9Jc@4RcaPSo97;Q9sLWKI1W`C@2wF&Ieb#techAWwxLj}u zk+vtGn_L>~)=SPS2d?$a4BCCffBTHOZiw%aN8O>PL5%PcMOz_}RjBvsaq;T{oxWEU z4wKEt3pKRvE&Zc?@$<9kUR_2>4$o~qcg9sKK82ZL89h*3K+HacJ<(3KWFZA zx>n=2+}x~7ceb9~dBOeOYmivR5;2+c))CL>O$@ud|at&WbHFKvinMV~rW`j5H5)dvC zGvfoTr0o^c&zn5R=jOg4jtmFA{u1UpKX!6z(!Fx$>F$?{OABpVck#G|$28lgZZ-8W z_Kpif>{1`!-D7fH=fu*|!rI2($sdwioTqVuJ6}hpG?G%(bdDH5SB56&89CK%+I7=i z)^PElp0nr4;$RIo@Ciz!X09rQIAf}mx&6oQf6UTuO-qr1w|FY=$H`WHf#bsyz9;D% z=(AAi>TGjK zf!;hGUDxROHO_G3XRvM8A2|`TZiVcP`n0V%#Yve5Mrh1vrORG{ZNQhoTUrcZBZ!B| zO37odkbH+}pn#X9hd#g6ke8b5@O1VC8@`C21joepmn09c=>8YCJ2&-{Ba%`D+C9t~ z+PrN3o7+#-su8sjH|o28x_{`wT$P^m9!yA6b4v0t>5)DmzwPIb)-)APWqUjD;f6cz z-p)9GtsQ9Go$KHpqGQ_zi2EhzyRLnA*LSpUDY@1CC|qa0saWdZi42UQmL1vwU57Ty zWYOG+_^IA!#sbx$q)yTeRe8o5c5VbMx-7%Dvirtu`Cm*od$j;lwZC&ZOO|;V#hdfN zP-&svbr+1}$`7E;=y`ItM1qY7PxbO^-{9G*a4H5@gMB)6B1C)JVs&@>r(ay8#(zAo zb3}UJrYgU$f^M`4L##gMrR)Q;&8n8`Nv+p6(7&V*4hgnT8zN`dIcaBLS}ar^5fvsm z6Mb(skn8{h<&AR^+w$QbE*VySaqMtl9ck^ZVZHKP7m6v8O;NydDCe z-aBc}o(U43D`b|XLaEmhPSKyGZr|Q!)9FZXR3TMl^DEXT3fV3rk@5d%?PgC-YvuPG z86*~8epqThb5k`!=h?W%6RX;dGlQ9Puax{cN|Y{-c1#(aX&8(x&gREn(dM!zrC*5} zA5U#7DJfwlEd{gBq7*AH3mZt|B|G^OIN7?+UdG{EZYXO1w}tr#Vee<_bQUbEkXPq! z`gb0+x3}Na*6MukT7!P>*ogbw0Gb~@5YC5ZjSSCxX{pqIdV}ZeCkczlfj1iIz|lL! z3CyAiH?PE={%*1&$qUP3&c1$e#nB6~h+2H{GWOBf%!pv@_`$lq7rH41H8n>PuZ1K` zU0Jwe=ev}I!(urIVG>|i3gvn~b?%<{%lP;3GuhFkFv@%W16=L@4`yX8_W!J`;c!d1 z_+JnPv$V94_EFfz z_Uru*3~DL<{##hUtR(vX5IA@ca9Bs6gNG~1MU)UQ1gxtlHGgNUJXk&_emfk zVQ#*11IlK`u)-)2Ocs@5#-MN@j=xRt_qU`F5DH5`LY!F?k!-?2_{d9q(^kc`(eDjARx3i-o+J