* src/plugins/DetDescendantReport.py (get_xpm_image): Remove
function, import it from Utils.py instead. * src/plugins/DetAncestralReport.py (get_xpm_image): Remove function, import it from Utils.py instead. * src/plugins/FtmStyleDescendants.py (get_xpm_image): Remove function, import it from Utils.py instead. * src/plugins/FtmStyleAncestors.py (get_xpm_image): Remove function, import it from Utils.py instead. * src/plugins/FamilyGroup.py (get_xpm_image): Remove function, import it from Utils.py instead. * src/plugins/IndivComplete.py (get_xpm_image): Remove function, import it from Utils.py instead. * src/plugins/IndivSummary.py (get_xpm_image): Remove function, import it from Utils.py instead; Convert to db. svn: r3125
This commit is contained in:
Alex Roitman
parent
d327a58277
commit
aad9127cc4
16
ChangeLog
16
ChangeLog
@ -1,3 +1,19 @@
|
|||||||
|
2004-05-04 Alex Roitman <shura@alex.neuro.umn.edu>
|
||||||
|
* src/plugins/DetDescendantReport.py (get_xpm_image): Remove
|
||||||
|
function, import it from Utils.py instead.
|
||||||
|
* src/plugins/DetAncestralReport.py (get_xpm_image): Remove
|
||||||
|
function, import it from Utils.py instead.
|
||||||
|
* src/plugins/FtmStyleDescendants.py (get_xpm_image): Remove
|
||||||
|
function, import it from Utils.py instead.
|
||||||
|
* src/plugins/FtmStyleAncestors.py (get_xpm_image): Remove
|
||||||
|
function, import it from Utils.py instead.
|
||||||
|
* src/plugins/FamilyGroup.py (get_xpm_image): Remove
|
||||||
|
function, import it from Utils.py instead.
|
||||||
|
* src/plugins/IndivComplete.py (get_xpm_image): Remove
|
||||||
|
function, import it from Utils.py instead.
|
||||||
|
* src/plugins/IndivSummary.py (get_xpm_image): Remove
|
||||||
|
function, import it from Utils.py instead; Convert to db.
|
||||||
|
|
||||||
2004-05-03 Alex Roitman <shura@alex.neuro.umn.edu>
|
2004-05-03 Alex Roitman <shura@alex.neuro.umn.edu>
|
||||||
* src/plugins/DetDescendantReport.py: Convert to db interface.
|
* src/plugins/DetDescendantReport.py: Convert to db interface.
|
||||||
* src/plugins/DetAncestralReport.py: Translate string.
|
* src/plugins/DetAncestralReport.py: Translate string.
|
||||||
|
|||||||
@ -28,6 +28,7 @@ import Errors
|
|||||||
|
|
||||||
from gettext import gettext as _
|
from gettext import gettext as _
|
||||||
from QuestionDialog import ErrorDialog
|
from QuestionDialog import ErrorDialog
|
||||||
|
from Utils import get_xpm_image
|
||||||
|
|
||||||
import Report
|
import Report
|
||||||
import BaseDoc
|
import BaseDoc
|
||||||
@ -1209,66 +1210,6 @@ def write_book_item(database,person,doc,options,newpage=0):
|
|||||||
#
|
#
|
||||||
#
|
#
|
||||||
#------------------------------------------------------------------------
|
#------------------------------------------------------------------------
|
||||||
def get_xpm_image():
|
|
||||||
return [
|
|
||||||
"48 48 4 1",
|
|
||||||
" c None",
|
|
||||||
". c #FFFFFF",
|
|
||||||
"+ c #C0C0C0",
|
|
||||||
"@ c #000000",
|
|
||||||
" ",
|
|
||||||
" ",
|
|
||||||
" ",
|
|
||||||
" ++++++++++++++++++++++++++++++++++ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +...@@@@@@@@@@@@@@@@@@@@@@@@@@...+ ",
|
|
||||||
" +...@@@@@@@@@@@@@@@@@@@@@@@@@@...+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +.....@@@@@@@@@@@@@@@@@@@@@@@@...+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +........@@@@@@@@@@@@@@@@@@@@@...+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +.....@@@@@@@@@@@@@@@@@@@@@@@@...+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +........@@@@@@@@@@@@@@@@@@@@@...+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +.....@@@@@@@@@@@@@@@@@@@@@@@@...+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +.........@@@@@@@@@@@@@@@@@@@@...+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +.....@@@@@@@@@@@@@@@@@@@@@@@@...+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +.........@@@@@@@@@@@@@@@@@@@@...+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +.........@@@@@@@@@@@@@@@@@@@@...+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +.....@@@@@@@@@@@@@@@@@@@@@@@@...+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +.........@@@@@@@@@@@@@@@@@@@@...+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +.....@@@@@@@@@@@@@@@@@@@@@@@@...+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +.........@@@@@@@@@@@@@@@@@@@@...+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" ++++++++++++++++++++++++++++++++++ ",
|
|
||||||
" ",
|
|
||||||
" ",
|
|
||||||
" "]
|
|
||||||
#------------------------------------------------------------------------
|
|
||||||
#
|
|
||||||
#
|
|
||||||
#
|
|
||||||
#------------------------------------------------------------------------
|
|
||||||
from Plugins import register_report, register_book_item
|
from Plugins import register_report, register_book_item
|
||||||
|
|
||||||
register_report(
|
register_report(
|
||||||
|
|||||||
@ -27,6 +27,7 @@ import os
|
|||||||
import Errors
|
import Errors
|
||||||
|
|
||||||
from QuestionDialog import ErrorDialog
|
from QuestionDialog import ErrorDialog
|
||||||
|
from Utils import get_xpm_image
|
||||||
from gettext import gettext as _
|
from gettext import gettext as _
|
||||||
|
|
||||||
import Report
|
import Report
|
||||||
@ -1221,66 +1222,6 @@ def write_book_item(database,person,doc,options,newpage=0):
|
|||||||
#
|
#
|
||||||
#
|
#
|
||||||
#------------------------------------------------------------------------
|
#------------------------------------------------------------------------
|
||||||
def get_xpm_image():
|
|
||||||
return [
|
|
||||||
"48 48 4 1",
|
|
||||||
" c None",
|
|
||||||
". c #FFFFFF",
|
|
||||||
"+ c #C0C0C0",
|
|
||||||
"@ c #000000",
|
|
||||||
" ",
|
|
||||||
" ",
|
|
||||||
" ",
|
|
||||||
" ++++++++++++++++++++++++++++++++++ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +...@@@@@@@@@@@@@@@@@@@@@@@@@@...+ ",
|
|
||||||
" +...@@@@@@@@@@@@@@@@@@@@@@@@@@...+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +.....@@@@@@@@@@@@@@@@@@@@@@@@...+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +........@@@@@@@@@@@@@@@@@@@@@...+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +.....@@@@@@@@@@@@@@@@@@@@@@@@...+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +........@@@@@@@@@@@@@@@@@@@@@...+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +.....@@@@@@@@@@@@@@@@@@@@@@@@...+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +.........@@@@@@@@@@@@@@@@@@@@...+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +.....@@@@@@@@@@@@@@@@@@@@@@@@...+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +.........@@@@@@@@@@@@@@@@@@@@...+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +.........@@@@@@@@@@@@@@@@@@@@...+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +.....@@@@@@@@@@@@@@@@@@@@@@@@...+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +.........@@@@@@@@@@@@@@@@@@@@...+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +.....@@@@@@@@@@@@@@@@@@@@@@@@...+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +.........@@@@@@@@@@@@@@@@@@@@...+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" +................................+ ",
|
|
||||||
" ++++++++++++++++++++++++++++++++++ ",
|
|
||||||
" ",
|
|
||||||
" ",
|
|
||||||
" "]
|
|
||||||
#------------------------------------------------------------------------
|
|
||||||
#
|
|
||||||
#
|
|
||||||
#
|
|
||||||
#------------------------------------------------------------------------
|
|
||||||
from Plugins import register_report, register_book_item
|
from Plugins import register_report, register_book_item
|
||||||
|
|
||||||
register_report(
|
register_report(
|
||||||
|
|||||||
@ -40,6 +40,7 @@ import Report
|
|||||||
import BaseDoc
|
import BaseDoc
|
||||||
import Errors
|
import Errors
|
||||||
import Utils
|
import Utils
|
||||||
|
from Utils import get_xpm_image
|
||||||
from gettext import gettext as _
|
from gettext import gettext as _
|
||||||
from QuestionDialog import ErrorDialog
|
from QuestionDialog import ErrorDialog
|
||||||
|
|
||||||
@ -711,96 +712,6 @@ def _build_spouse_map(database,person):
|
|||||||
spouse_map[name] = family_id
|
spouse_map[name] = family_id
|
||||||
return spouse_map
|
return spouse_map
|
||||||
|
|
||||||
#------------------------------------------------------------------------
|
|
||||||
#
|
|
||||||
#
|
|
||||||
#
|
|
||||||
#------------------------------------------------------------------------
|
|
||||||
def get_xpm_image():
|
|
||||||
return [
|
|
||||||
"48 48 33 1",
|
|
||||||
" c None",
|
|
||||||
". c #1A1A1A",
|
|
||||||
"+ c #6A665E",
|
|
||||||
"@ c #A6A6A6",
|
|
||||||
"# c #BABAB6",
|
|
||||||
"$ c #D2D2D2",
|
|
||||||
"% c #EDE2D2",
|
|
||||||
"& c #7A7262",
|
|
||||||
"* c #F1EADF",
|
|
||||||
"= c #867A6E",
|
|
||||||
"- c #56524E",
|
|
||||||
"; c #868686",
|
|
||||||
"> c #E2CAA2",
|
|
||||||
", c #F2EEE2",
|
|
||||||
"' c #4E4E4E",
|
|
||||||
") c #B2966E",
|
|
||||||
"! c #FAFAFA",
|
|
||||||
"~ c #A29E96",
|
|
||||||
"{ c #BEA27A",
|
|
||||||
"] c #CECABE",
|
|
||||||
"^ c #968A76",
|
|
||||||
"/ c #DAD2C6",
|
|
||||||
"( c #423E3E",
|
|
||||||
"_ c #BA9E72",
|
|
||||||
": c #B7AC9A",
|
|
||||||
"< c #E9DAC3",
|
|
||||||
"[ c #E6E2E2",
|
|
||||||
"} c #322E2A",
|
|
||||||
"| c #9E9286",
|
|
||||||
"1 c #E6D2B6",
|
|
||||||
"2 c #F2EEE9",
|
|
||||||
"3 c #5E5A56",
|
|
||||||
"4 c #F6F2EE",
|
|
||||||
" ",
|
|
||||||
" ",
|
|
||||||
" ^=^=====&&&+&++++333+& ",
|
|
||||||
" =##############:#:~;33& ",
|
|
||||||
" =#!!!!!!!!!!!!!!*[$#;;|- ",
|
|
||||||
" ;#!!!!!!!!!!!!!!!2[$@&]|( ",
|
|
||||||
" =#!!!!!!!!!!!!!!!!2[$-[];} ",
|
|
||||||
" =#!!!!@@@@@@@@!!!!![4'![];} ",
|
|
||||||
" =#!!!!!!4!!4!!!!!!!!4'!![];} ",
|
|
||||||
" =#!!!!!!!!!!!!!!!!!!!'*!![];( ",
|
|
||||||
" =#!!!!!!!!!!!!!!!!!!!'[*!![]|- ",
|
|
||||||
" &#!!!!@@~@@@~@@~@@@@@'][4!![#|+ ",
|
|
||||||
" &#!4!!!!!!!!!!!!!4!!!'..}('3&=+& ",
|
|
||||||
" =#!!!!@@@@@@@@@@@@@@@@##@~;=+3(+ ",
|
|
||||||
" &#!!!!!!!!!!!!!!!!!!!![$##~;;='( ",
|
|
||||||
" &#!!!!@@@@@~@@@~@@@@~@@@@@#~~;+( ",
|
|
||||||
" &#!!!!!!!!!!!!!!!!!!!!444[]#@~&} ",
|
|
||||||
" &#!!!!!!!!!!!!!!!!!!4442[[$]#@=} ",
|
|
||||||
" &#!!!!!!!!!!!!!!!!!!4444[[$]]:;} ",
|
|
||||||
" +#!!!!@~@@@@@@@@~@@@@@~~~|;]]];} ",
|
|
||||||
" +#!!!!!!!!!!!!!!!!!44444,[$/]:^} ",
|
|
||||||
" +#!!!!@@@~@@@@@@@@~@~~~~~~|1>$|} ",
|
|
||||||
" +#!!!!!!!!!!!!!!!44442[*%[[<$]|} ",
|
|
||||||
" +#!!!!@@@@~@@@@~~@~~~~~~~~|1/>~} ",
|
|
||||||
" +#!!!!!!!!!!!!!!44444**[%%</1])} ",
|
|
||||||
" +#!!!!!!!!!!!!!4422******%%<1/|} ",
|
|
||||||
" +#!!!!!!!!!!!!!!4,*,**2***%<1/)} ",
|
|
||||||
" 3#!!!!@@@@@~,442,*,*,2**,,[<1/)} ",
|
|
||||||
" +#!!!!!!4!!444444**[%%%%%%<<1>~} ",
|
|
||||||
" 3#!!!!@@4*@@@~~~~~~~~~~||||<11)} ",
|
|
||||||
" +#4!!4444444,24[[*[<%<%<<<<<11|} ",
|
|
||||||
" 3#!!!44,,,@~~~~~~~~~|||||||111_} ",
|
|
||||||
" 3#!!!!!44444[4[[%%%%%<<<<11111)} ",
|
|
||||||
" 3#!!!!~@,*~~~~~~~~||||||^|^1>1_} ",
|
|
||||||
" 3#!!!444442%**[%<%%%<<<<11111>_} ",
|
|
||||||
" 3#!!!4***[~~~~~~|||||||^|^^1>>{} ",
|
|
||||||
" -#!444444**[%<%%%<<<<11111>1>>_} ",
|
|
||||||
" -#4444~~[[~~~|||||||^)^^^^^>>>_} ",
|
|
||||||
" -#4444[**[%%%%%%<<<<11111>>>>>)} ",
|
|
||||||
" '#4444****%%%%%<<<111<11>>>>>>_} ",
|
|
||||||
" ':44****%%%%%<<<1<1<1>>1>>>>>>)} ",
|
|
||||||
" -@4******%%%<%<1<<1111>>>>>>>>)} ",
|
|
||||||
" '#****%%%%<%<<<<1<11>1>>>>>>>>)} ",
|
|
||||||
" ':##:::::::{{{{{{__{___))^)))))} ",
|
|
||||||
" }}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}} ",
|
|
||||||
" ",
|
|
||||||
" ",
|
|
||||||
" "]
|
|
||||||
|
|
||||||
#------------------------------------------------------------------------
|
#------------------------------------------------------------------------
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
|
|||||||
@ -38,6 +38,7 @@ import BaseDoc
|
|||||||
import RelLib
|
import RelLib
|
||||||
import Errors
|
import Errors
|
||||||
from QuestionDialog import ErrorDialog
|
from QuestionDialog import ErrorDialog
|
||||||
|
from Utils import get_xpm_image
|
||||||
from gettext import gettext as _
|
from gettext import gettext as _
|
||||||
|
|
||||||
#------------------------------------------------------------------------
|
#------------------------------------------------------------------------
|
||||||
@ -1227,96 +1228,6 @@ def write_book_item(database,person,doc,options,newpage=0):
|
|||||||
import DisplayTrace
|
import DisplayTrace
|
||||||
DisplayTrace.DisplayTrace()
|
DisplayTrace.DisplayTrace()
|
||||||
|
|
||||||
#------------------------------------------------------------------------
|
|
||||||
#
|
|
||||||
#
|
|
||||||
#
|
|
||||||
#------------------------------------------------------------------------
|
|
||||||
def get_xpm_image():
|
|
||||||
return [
|
|
||||||
"48 48 33 1",
|
|
||||||
" c None",
|
|
||||||
". c #1A1A1A",
|
|
||||||
"+ c #847B6E",
|
|
||||||
"@ c #B7AC9C",
|
|
||||||
"# c #D1D1D0",
|
|
||||||
"$ c #EEE2D0",
|
|
||||||
"% c #6A655C",
|
|
||||||
"& c #868686",
|
|
||||||
"* c #F1EADF",
|
|
||||||
"= c #5C5854",
|
|
||||||
"- c #B89C73",
|
|
||||||
"; c #E2C8A1",
|
|
||||||
"> c #55524C",
|
|
||||||
", c #F5EEE6",
|
|
||||||
"' c #4F4E4C",
|
|
||||||
") c #A19C95",
|
|
||||||
"! c #B3966E",
|
|
||||||
"~ c #CDC8BF",
|
|
||||||
"{ c #F6F2ED",
|
|
||||||
"] c #A6A5A4",
|
|
||||||
"^ c #413F3F",
|
|
||||||
"/ c #D8D1C5",
|
|
||||||
"( c #968977",
|
|
||||||
"_ c #BAB9B6",
|
|
||||||
": c #FAFAF9",
|
|
||||||
"< c #BEA27B",
|
|
||||||
"[ c #E9DAC2",
|
|
||||||
"} c #9D9385",
|
|
||||||
"| c #E4E3E3",
|
|
||||||
"1 c #7A7062",
|
|
||||||
"2 c #E6D3B4",
|
|
||||||
"3 c #BAA488",
|
|
||||||
"4 c #322E2B",
|
|
||||||
" ",
|
|
||||||
" ",
|
|
||||||
" (+(+++++111%1%%%%===%1 ",
|
|
||||||
" +______________@_@)&==1 ",
|
|
||||||
" +_::::::::::::::*|#_&&}> ",
|
|
||||||
" &_:::::::::::::::{|#]1~}^ ",
|
|
||||||
" +_::::::::::::::::{|#=|~&4 ",
|
|
||||||
" +_::::]]]]]]]]:::::|{':|~&4 ",
|
|
||||||
" +_::::::::::::::::::{'::|~&4 ",
|
|
||||||
" +_:::::::::::::::::::'*::|~&^ ",
|
|
||||||
" +_:::::::::::::::::::'|*::|~}> ",
|
|
||||||
" 1_::::]]]]]]]]]]]]:::'~|{::|_}% ",
|
|
||||||
" 1_:::::::::::::::::::'..4^'=1+%1 ",
|
|
||||||
" +_::::]]]]]]]]]]]]:::|__])&+%=^% ",
|
|
||||||
" 1_::::::::::::::::::::|#__)&&+'^ ",
|
|
||||||
" 1_::::]]]]]]]]]::::::::|#~_])&%^ ",
|
|
||||||
" 1_::::::::::::::::::::{||#~_])14 ",
|
|
||||||
" 1_::::]]]]]]]]]]]]]]]]]]&}#~_]+4 ",
|
|
||||||
" 1_::::::::::::::::::{{{{||#~~@&4 ",
|
|
||||||
" %_::::]]]]]]]]]]]]]]]])))}(~~~&4 ",
|
|
||||||
" %_:::::::::::::::::{{{{{*|#/~_(4 ",
|
|
||||||
" %_::::]]]]]]]]]]]]]]])))))}2;/}4 ",
|
|
||||||
" %_:::::::::::::::{{{{{***||[#~}4 ",
|
|
||||||
" %_::::]]]]]]]]]])]))))))))}2/;)4 ",
|
|
||||||
" %_::::::::::::::{{{{{**|$$[/2~!4 ",
|
|
||||||
" %_::::]]]]]]]]){{{{******$$[2/}4 ",
|
|
||||||
" %_::::::::::::{{{{****$$$$$[2/!4 ",
|
|
||||||
" =_::::]]]]]]])]))))))))})}}[2/!4 ",
|
|
||||||
" %_:::::::::{{{{{{**|$$$$$$[[2;)4 ",
|
|
||||||
" =_::::]]]])]]))))))))))}}}}[22!4 ",
|
|
||||||
" %_::::::::{{{{{|**|$$[$[[[[[22}4 ",
|
|
||||||
" =_::::]]])])))))))))}}}}}}}222-4 ",
|
|
||||||
" =_:::::{{{{{|{*|$$$$$[[[[22222!4 ",
|
|
||||||
" =_::::)]])))))))))}}}}}}(}(2;2-4 ",
|
|
||||||
" =_:::{{{{{{***|$$$$$[[[[22222;-4 ",
|
|
||||||
" =_:::{])))))))))}}}}}}}(}((2;;<4 ",
|
|
||||||
" >_:{{{{{{**|$$$$$[[[[22222;2;;-4 ",
|
|
||||||
" >_{{{{)))))))}}}}}}}(!(((((;;;-4 ",
|
|
||||||
" >_{{{{|**|*$$$$$[[[[22222;;;;;!4 ",
|
|
||||||
" '_{{{{****$$$$$2[[222222;2;;;;-4 ",
|
|
||||||
" '@{{****$$$$$[[[2[222;;2;;;;;;!4 ",
|
|
||||||
" >]{******$$$[$[2[[2222;;;;;;;;!4 ",
|
|
||||||
" '_****$$$$[$[[[[2222;2;;;;;;;;!4 ",
|
|
||||||
" '@__@@@@@@@33<3<<<<<<-<-!!!!!!!4 ",
|
|
||||||
" 44444444444444444444444444444444 ",
|
|
||||||
" ",
|
|
||||||
" ",
|
|
||||||
" "]
|
|
||||||
|
|
||||||
#------------------------------------------------------------------------
|
#------------------------------------------------------------------------
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
|
|||||||
@ -45,6 +45,7 @@ import RelLib
|
|||||||
import Errors
|
import Errors
|
||||||
import Utils
|
import Utils
|
||||||
from QuestionDialog import ErrorDialog
|
from QuestionDialog import ErrorDialog
|
||||||
|
from Utils import get_xpm_image
|
||||||
from gettext import gettext as _
|
from gettext import gettext as _
|
||||||
|
|
||||||
#------------------------------------------------------------------------
|
#------------------------------------------------------------------------
|
||||||
@ -1661,96 +1662,6 @@ def write_book_item(database,person,doc,options,newpage=0):
|
|||||||
import DisplayTrace
|
import DisplayTrace
|
||||||
DisplayTrace.DisplayTrace()
|
DisplayTrace.DisplayTrace()
|
||||||
|
|
||||||
#------------------------------------------------------------------------
|
|
||||||
#
|
|
||||||
#
|
|
||||||
#
|
|
||||||
#------------------------------------------------------------------------
|
|
||||||
def get_xpm_image():
|
|
||||||
return [
|
|
||||||
"48 48 33 1",
|
|
||||||
" c None",
|
|
||||||
". c #1A1A1A",
|
|
||||||
"+ c #847B6E",
|
|
||||||
"@ c #B7AC9C",
|
|
||||||
"# c #D1D1D0",
|
|
||||||
"$ c #EEE2D0",
|
|
||||||
"% c #6A655C",
|
|
||||||
"& c #868686",
|
|
||||||
"* c #F1EADF",
|
|
||||||
"= c #5C5854",
|
|
||||||
"- c #B89C73",
|
|
||||||
"; c #E2C8A1",
|
|
||||||
"> c #55524C",
|
|
||||||
", c #F5EEE6",
|
|
||||||
"' c #4F4E4C",
|
|
||||||
") c #A19C95",
|
|
||||||
"! c #B3966E",
|
|
||||||
"~ c #CDC8BF",
|
|
||||||
"{ c #F6F2ED",
|
|
||||||
"] c #A6A5A4",
|
|
||||||
"^ c #413F3F",
|
|
||||||
"/ c #D8D1C5",
|
|
||||||
"( c #968977",
|
|
||||||
"_ c #BAB9B6",
|
|
||||||
": c #FAFAF9",
|
|
||||||
"< c #BEA27B",
|
|
||||||
"[ c #E9DAC2",
|
|
||||||
"} c #9D9385",
|
|
||||||
"| c #E4E3E3",
|
|
||||||
"1 c #7A7062",
|
|
||||||
"2 c #E6D3B4",
|
|
||||||
"3 c #BAA488",
|
|
||||||
"4 c #322E2B",
|
|
||||||
" ",
|
|
||||||
" ",
|
|
||||||
" (+(+++++111%1%%%%===%1 ",
|
|
||||||
" +______________@_@)&==1 ",
|
|
||||||
" +_::::::::::::::*|#_&&}> ",
|
|
||||||
" &_:::::::::::::::{|#]1~}^ ",
|
|
||||||
" +_::::::::::::::::{|#=|~&4 ",
|
|
||||||
" +_::::]]]]]]]]:::::|{':|~&4 ",
|
|
||||||
" +_::::::::::::::::::{'::|~&4 ",
|
|
||||||
" +_:::::::::::::::::::'*::|~&^ ",
|
|
||||||
" +_:::::::::::::::::::'|*::|~}> ",
|
|
||||||
" 1_::::]]]]]]]]]]]]:::'~|{::|_}% ",
|
|
||||||
" 1_:::::::::::::::::::'..4^'=1+%1 ",
|
|
||||||
" +_::::]]]]]]]]]]]]:::|__])&+%=^% ",
|
|
||||||
" 1_::::::::::::::::::::|#__)&&+'^ ",
|
|
||||||
" 1_::::]]]]]]]]]::::::::|#~_])&%^ ",
|
|
||||||
" 1_::::::::::::::::::::{||#~_])14 ",
|
|
||||||
" 1_::::]]]]]]]]]]]]]]]]]]&}#~_]+4 ",
|
|
||||||
" 1_::::::::::::::::::{{{{||#~~@&4 ",
|
|
||||||
" %_::::]]]]]]]]]]]]]]]])))}(~~~&4 ",
|
|
||||||
" %_:::::::::::::::::{{{{{*|#/~_(4 ",
|
|
||||||
" %_::::]]]]]]]]]]]]]]])))))}2;/}4 ",
|
|
||||||
" %_:::::::::::::::{{{{{***||[#~}4 ",
|
|
||||||
" %_::::]]]]]]]]]])]))))))))}2/;)4 ",
|
|
||||||
" %_::::::::::::::{{{{{**|$$[/2~!4 ",
|
|
||||||
" %_::::]]]]]]]]){{{{******$$[2/}4 ",
|
|
||||||
" %_::::::::::::{{{{****$$$$$[2/!4 ",
|
|
||||||
" =_::::]]]]]]])]))))))))})}}[2/!4 ",
|
|
||||||
" %_:::::::::{{{{{{**|$$$$$$[[2;)4 ",
|
|
||||||
" =_::::]]]])]]))))))))))}}}}[22!4 ",
|
|
||||||
" %_::::::::{{{{{|**|$$[$[[[[[22}4 ",
|
|
||||||
" =_::::]]])])))))))))}}}}}}}222-4 ",
|
|
||||||
" =_:::::{{{{{|{*|$$$$$[[[[22222!4 ",
|
|
||||||
" =_::::)]])))))))))}}}}}}(}(2;2-4 ",
|
|
||||||
" =_:::{{{{{{***|$$$$$[[[[22222;-4 ",
|
|
||||||
" =_:::{])))))))))}}}}}}}(}((2;;<4 ",
|
|
||||||
" >_:{{{{{{**|$$$$$[[[[22222;2;;-4 ",
|
|
||||||
" >_{{{{)))))))}}}}}}}(!(((((;;;-4 ",
|
|
||||||
" >_{{{{|**|*$$$$$[[[[22222;;;;;!4 ",
|
|
||||||
" '_{{{{****$$$$$2[[222222;2;;;;-4 ",
|
|
||||||
" '@{{****$$$$$[[[2[222;;2;;;;;;!4 ",
|
|
||||||
" >]{******$$$[$[2[[2222;;;;;;;;!4 ",
|
|
||||||
" '_****$$$$[$[[[[2222;2;;;;;;;;!4 ",
|
|
||||||
" '@__@@@@@@@33<3<<<<<<-<-!!!!!!!4 ",
|
|
||||||
" 44444444444444444444444444444444 ",
|
|
||||||
" ",
|
|
||||||
" ",
|
|
||||||
" "]
|
|
||||||
|
|
||||||
#------------------------------------------------------------------------
|
#------------------------------------------------------------------------
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
|
|||||||
@ -48,6 +48,7 @@ import StyleEditor
|
|||||||
import Report
|
import Report
|
||||||
import Errors
|
import Errors
|
||||||
from QuestionDialog import ErrorDialog
|
from QuestionDialog import ErrorDialog
|
||||||
|
from Utils import get_xpm_image
|
||||||
from gettext import gettext as _
|
from gettext import gettext as _
|
||||||
|
|
||||||
#------------------------------------------------------------------------
|
#------------------------------------------------------------------------
|
||||||
@ -124,13 +125,13 @@ class IndivSummary(Report.Report):
|
|||||||
place = ""
|
place = ""
|
||||||
|
|
||||||
description = event.get_description()
|
description = event.get_description()
|
||||||
if date == "":
|
if not date:
|
||||||
if place == "":
|
if not place:
|
||||||
return
|
return
|
||||||
else:
|
else:
|
||||||
val = place + ". " + description
|
val = place + ". " + description
|
||||||
else:
|
else:
|
||||||
if place == "":
|
if not place:
|
||||||
val = date + ". " + description
|
val = date + ". " + description
|
||||||
else:
|
else:
|
||||||
val = date + " in " + place + ". " + description
|
val = date + " in " + place + ". " + description
|
||||||
@ -173,15 +174,12 @@ class IndivSummary(Report.Report):
|
|||||||
spouse_id = family.get_mother_id()
|
spouse_id = family.get_mother_id()
|
||||||
else:
|
else:
|
||||||
spouse_id = family.get_father_id()
|
spouse_id = family.get_father_id()
|
||||||
if spouse_id:
|
|
||||||
spouse = self.database.find_person_from_id(spouse_id)
|
|
||||||
else:
|
|
||||||
spouse = None
|
|
||||||
|
|
||||||
self.d.start_row()
|
self.d.start_row()
|
||||||
self.d.start_cell("IVS-NormalCell",2)
|
self.d.start_cell("IVS-NormalCell",2)
|
||||||
self.d.start_paragraph("IVS-Spouse")
|
self.d.start_paragraph("IVS-Spouse")
|
||||||
if spouse:
|
if spouse_id:
|
||||||
|
spouse = self.database.find_person_from_id(spouse_id)
|
||||||
self.d.write_text(spouse.get_primary_name().get_regular_name())
|
self.d.write_text(spouse.get_primary_name().get_regular_name())
|
||||||
else:
|
else:
|
||||||
self.d.write_text(_("unknown"))
|
self.d.write_text(_("unknown"))
|
||||||
@ -194,7 +192,7 @@ class IndivSummary(Report.Report):
|
|||||||
self.write_fact(event)
|
self.write_fact(event)
|
||||||
|
|
||||||
child_list = family.get_child_id_list()
|
child_list = family.get_child_id_list()
|
||||||
if len(child_list) > 0:
|
if len(child_list):
|
||||||
self.d.start_row()
|
self.d.start_row()
|
||||||
self.d.start_cell("IVS-NormalCell")
|
self.d.start_cell("IVS-NormalCell")
|
||||||
self.d.start_paragraph("IVS-Normal")
|
self.d.start_paragraph("IVS-Normal")
|
||||||
@ -414,96 +412,6 @@ class IndivSummaryDialog(Report.TextReportDialog):
|
|||||||
def report(database,person):
|
def report(database,person):
|
||||||
IndivSummaryDialog(database,person)
|
IndivSummaryDialog(database,person)
|
||||||
|
|
||||||
#------------------------------------------------------------------------
|
|
||||||
#
|
|
||||||
# get_xpm_image
|
|
||||||
#
|
|
||||||
#------------------------------------------------------------------------
|
|
||||||
def get_xpm_image():
|
|
||||||
return [
|
|
||||||
"48 48 33 1",
|
|
||||||
" c None",
|
|
||||||
". c #312D2A",
|
|
||||||
"+ c #4773AA",
|
|
||||||
"@ c #A8A7A5",
|
|
||||||
"# c #BABAB6",
|
|
||||||
"$ c #CECECE",
|
|
||||||
"% c #ECDECB",
|
|
||||||
"& c #5C5C60",
|
|
||||||
"* c #7C7262",
|
|
||||||
"= c #F2EADE",
|
|
||||||
"- c #867A6F",
|
|
||||||
"; c #8E887E",
|
|
||||||
"> c #E2CAA2",
|
|
||||||
", c #565354",
|
|
||||||
"' c #4C4E51",
|
|
||||||
") c #6D655E",
|
|
||||||
"! c #B69970",
|
|
||||||
"~ c #F6F2EE",
|
|
||||||
"{ c #9E9286",
|
|
||||||
"] c #416CA3",
|
|
||||||
"^ c #3D4557",
|
|
||||||
"/ c #A29E96",
|
|
||||||
"( c #FAFAFA",
|
|
||||||
"_ c #BA7458",
|
|
||||||
": c #C67C5E",
|
|
||||||
"< c #BDA37E",
|
|
||||||
"[ c #CECABE",
|
|
||||||
"} c #A26E62",
|
|
||||||
"| c #E6E2E2",
|
|
||||||
"1 c #423E43",
|
|
||||||
"2 c #966A60",
|
|
||||||
"3 c #D2D2D2",
|
|
||||||
"4 c #E5D2B8",
|
|
||||||
" ",
|
|
||||||
" ",
|
|
||||||
" ;-;-----***)*))))&,&)* ",
|
|
||||||
" -##############@#@/;&,* ",
|
|
||||||
" -#((((((((((((((=|$#;;{, ",
|
|
||||||
" ;#(((((((((((((((~|3/*[{1 ",
|
|
||||||
" -#((((((((((((((((~|3,|[;. ",
|
|
||||||
" -#((((((((@/@@@@@@/@/'(|[;. ",
|
|
||||||
" -#((((((((((((((((((~'((|[;. ",
|
|
||||||
" -#(((((((((((]+]+]]+('=((|[;1 ",
|
|
||||||
" -#(((((((((((]+]}2&+('|=((|[{, ",
|
|
||||||
" *#(((((((((((]+}<:-+('[|~((|#{) ",
|
|
||||||
" *#(((((((((((+]2_:)+('...1'&*-)* ",
|
|
||||||
" -#(((((((((((]&1(_&+(3@#//--)&1) ",
|
|
||||||
" *#~((((((((((+]1}/^]((|$##/;--'1 ",
|
|
||||||
" *#(((((((((((]]^)11,(((|$[#@/;)1 ",
|
|
||||||
" *#(((((((((((]^.^^&&((~=|$[#@/*. ",
|
|
||||||
" *#(((((((((((((~(((((((|$[$[#/-. ",
|
|
||||||
" *#~(((((((((((((((((~~~~||$[[@;. ",
|
|
||||||
" )#((((@@@@@@/@@/@/@@@@///{;[[[;. ",
|
|
||||||
" )#(((((((((((((((((~~~~==|$$[#;. ",
|
|
||||||
" )#((((@/@@/@@@@@@@@@//////{4>3{. ",
|
|
||||||
" )#(((((((((((((((~~~~==|=||%$[{. ",
|
|
||||||
" )#((((@@@@@/@@@///////////{43>/. ",
|
|
||||||
" )#((((((((((((((~~~~~==|||%>4[!. ",
|
|
||||||
" )#((((@/@@@@@//~~~~======%%%43{. ",
|
|
||||||
" )#((((((((((((~~~~=|==||=%%%44!. ",
|
|
||||||
" ,#((((@@/@@/@/@////////{/{{%4$!. ",
|
|
||||||
" )#~((((((((~~~~~~==||%=%=%%44>/. ",
|
|
||||||
" ,#((((/@@//@///////////{{{{%4>!. ",
|
|
||||||
" )#((((((((~~~=~||=|%%%%%4%%%44{. ",
|
|
||||||
" ,#((((@@@/@/////////{{{{{{{444!. ",
|
|
||||||
" &#(((((~~~~~|~|||%%|%%%%44444%!. ",
|
|
||||||
" ,#(((~/@//////////{{{{{{;{;4>4!. ",
|
|
||||||
" ,#(((~~~~=~|==|%|=%%%4%%44444>!. ",
|
|
||||||
" &#(((~//////////{{{{{{{;{;{4>><. ",
|
|
||||||
" ,#(~~~~~~==||%|%%%%%%44444>4>>!. ",
|
|
||||||
" '#~~~~///////{{{{{{{;!;{;;;>>>!. ",
|
|
||||||
" ,#~~~~||=||%|%=%%4%444>44>>>>>!. ",
|
|
||||||
" '#~~~~====%=%=%4%%444444>>>>>>!. ",
|
|
||||||
" '@~~====|%=%%%%%4%444>>4>>>>>>!. ",
|
|
||||||
" ,@~======%%%%%%>%%4444>>>>>>>>!. ",
|
|
||||||
" '#====||=%%%%4%44444>4>>>>>>>>!. ",
|
|
||||||
" ,@##@<#<<#@<<<<<<<<<<!<!!:!!!!!. ",
|
|
||||||
" ................................ ",
|
|
||||||
" ",
|
|
||||||
" ",
|
|
||||||
" "]
|
|
||||||
|
|
||||||
#------------------------------------------------------------------------
|
#------------------------------------------------------------------------
|
||||||
#
|
#
|
||||||
# Book Item Options dialog
|
# Book Item Options dialog
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user