summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Jansen <jack.jansen@cwi.nl>1996-04-10 14:52:18 (GMT)
committerJack Jansen <jack.jansen@cwi.nl>1996-04-10 14:52:18 (GMT)
commit822a30b0eea58028eca93b34d7674fc511bbdbce (patch)
treecf2fe2d115e253fc638bec991cebe17102ef8e09
parent270f411f177f2e3b372f05cb470cc27ea154e4f9 (diff)
downloadcpython-822a30b0eea58028eca93b34d7674fc511bbdbce.zip
cpython-822a30b0eea58028eca93b34d7674fc511bbdbce.tar.gz
cpython-822a30b0eea58028eca93b34d7674fc511bbdbce.tar.bz2
Added region arg to update calls. And binhex files rebinhexed.
-rw-r--r--Mac/scripts/BuildApplet.rsrc.hqx66
-rw-r--r--Mac/scripts/ConfigurePython.py1
-rw-r--r--Mac/scripts/ConfigurePython.rsrc.hqx79
-rw-r--r--Mac/scripts/EditPythonPrefs.py162
-rw-r--r--Mac/scripts/EditPythonPrefs.rsrc.hqx107
-rw-r--r--Mac/scripts/MkDistr.rsrc.hqx52
-rw-r--r--Mac/scripts/MkDistr_ui.py4
-rw-r--r--Mac/scripts/PackLibDir.rsrc.hqx68
-rw-r--r--Mac/scripts/RunLibScript.rsrc.hqx99
9 files changed, 357 insertions, 281 deletions
diff --git a/Mac/scripts/BuildApplet.rsrc.hqx b/Mac/scripts/BuildApplet.rsrc.hqx
index 3209869..a1b530c 100644
--- a/Mac/scripts/BuildApplet.rsrc.hqx
+++ b/Mac/scripts/BuildApplet.rsrc.hqx
@@ -2,36 +2,36 @@
:$@eVBA"`E'9d,R*cFQ-!FR0bBe*6483"!*!(#bTr"J#3"!%!!!!++3!!#5N!!!%
"0K3J9#"S!"3J8(d4X'J4!$S"CbB5,`a1ZJ)-$$S!@RN0E@YKF("XCA3ZFR0bB`)
-!!!!rN!J!N!JrN!J!N"LYC+j,!*!'#bVr%F#SD3%G3"(rma0`!"!Zrr1pdK&Q%&%
-f[P9V!3&#4,fK[P9V!3%`86)"Caj%&3`!!"aP%R!!%#j$&3`!!"pL"R!"B!!"!3)
-X@P3Y,N5p!3!E2!&Q-#G92KT+J#"6!LJ![`!Z)J$Y#3)"!%#$+0Xd%kRA,`a1ZJ%
-*5QGV!3#Q9d-k!!!"!*!,3!!!!+!!!!&3!!!#U!!!"&3!!!NN!!!5P!!$rrm!"!!
-!J!2rr`!"!!)!!3!#!!%!!`!"!!2J!3!$)!%!!L!"!!)J!rrr,J3!!,i$rrm1!+`
-%!!'Z#!!"rK!!!"!J!!!)3!!!")!!!!-!N"K!!!!!i!!!!I!!!!2i!!!(r!!!$r`
-!!"rm!!2rr`!(rrq!!rrr!!(rrJ!"rri!!Irr!!(rrq!"rrmJ!Irq)!(rrL!$rrm
-Z"rrr[J2rr`i!rr`!!Iri!!(rm!!!(q!!!!r!!!!(J!!!!`#3%3T3i!!HK)!!"k%
-J!!!!"d&38%`!N!C!!!!"!!+!"8!)3$ri%"!3(K!5%"-rq`iJ$N!#J!%!N!8"!!1
-!"m!2`$ri(r!IrKrb(r-rq`rJ$m!$J!%!N!8%!*"5r`#3([m!r`#3(2m!X!$r!*!
-Dr`#`!,!!r`#3'2m!!!#`!2m&r`#3&[m!!,!!!2m&"Im!N"Ar!!#`!,!!!2m&r`#
-3%2q3%J#3$Im!!#X!+j!+q5[jqIm!N!hrN")!N!rr!!!VN!VjqIm!N"$r!!!!+j!
-)qIRjr`#3%2m!!#Z3#[Rjrrm!N!rr!!!!+j!)qIRjrj!&!*!-r`!!+j!+qIRrr`!
-!r`#3$2m!!!!VN!MjqIRr!!!!r`#3$2m!!#Z3#[Rjr`!!!2m!N![rN")!!2m!APj
-H!*!'r`!!+`!VN!Vj+rRjr`$rrejHAJ#3"rq3%J#3"&jHAJ#3#E!&X!@`X2NVN!A
-jr`#3%E#`"E!&X,#`q5XV+rRr!*!5X*!)q5XVqIm!N"IrqC!%+rRr!*!CrrNV+rR
-r!*!ErrRjr`#3(Irr!*"b!J#3+3m!N!r`m!#3$3m&$`#3$I"382!!N!X2!!82(`#
-3#r!&!2%I!*!+$`"38!mI!*!)rj!*!*!'$`$!c*!&h0h`!*!'rj!*!*!($`$-N!A
-Gm!#3"`m!$-c-c-hGm!#3"`m!c*!&hIm!N!F2!!c-c-c0hIrrm!#3"3m!c*!&hIm
-!m!#3"3m!$-c-c-hGm!$`!*!&$`$-N!AGm!$`!*!&rj!*!2#lX!!!$`$!c*!&h0h
-`rlZ`!!!!rj!*!!#lX!#3"&&49Gc-c0m!N!J&89&9AFc0m!#3#!99999Gc0m!N!X
-2hGh0m!#3$2h-h`#3$3rGm!#3$[m!N$S"!*!Br`#3$[m!r`#3$2m!X!$r!*!+r`#
-3"2m&!*!(rj!,!*!'r`!VN!Ajr`#3"rm!+j!&qIq3"!#3"2m!+j!&qIm!!2m!N!6
-r!#Z3"IRr!!"HAJ!!rj!,!&jH!*!%X,#`+b[jr`#3#E#`X#[jr`#3$2rjr`#3$[m
-!N"Z!!*!,$`#3"r$`!*!&$`82!*!&m!!2%!!!!2q3"I!!!!m-c-cI!!!!$`c-c0r
-rm!!2$-c-h`$`!!m-c-cI!,X!rj!&m,X!!&9FcI!!N!49A0m!N!Epm!#3"Jm!N!m
-(9%9B9!!"!*!%*&"jG$%!!!!"4P*&4J!"!!!!J!!"!)&*3diM!!%!!!%X!!%!N!8
-"!!!!!3!!!!ST!!!*+3!!!3%"`GTX%pB!!!!F!2)!#8*14%`!!!"55801)`!!!&j
-659T&!!!!DNC548B!!3"fD@0c)`!!!)jTBf`i!!!!QQPME$3!!!#QD@0c1!!!!,*
-TBh-d!!!![P"jG$%!!!$+!)$rr`!!#2`"`Hj8!5crr`#3"!("m%6rN!3!!!%%!*!
-&J2rr!!!"%J("lYJ!JIrr!!!)m3("m%J",2rr!!!"(3("llJ",2rr!!!"B3("lQ3
-",2rr!!!&C3("leJ",2rr!!!(D3("m"3",2rr!!!)E3("lS!!N!B**!("lr!16hG
-ZCA)JFQ9cEh9bBf9,E!:
+!N$1YM&Cl!*!'#bVr%F#SD3%G3"(rma0`!"!Zrr1pdK&Q%&%f[P9V!3&#4,fK[P9
+V!3%`86)"Caj%&3`!!"aP%R!!%#j$&3`!!"pL"R!"B!!"!3)X@P3Y,N5p!3!E2!&
+Q-#G92KT+J#"6!LJ![`!Z)J$Y#3)"!%#$+0Xd%kRA,`a1ZJ%*5QGV!3#Q9d-k!!!
+"!*!,3!!!!+!!!!&3!!!#U!!!"&3!!!NN!!!5P!!$rrm!"!!!J!2rr`!"!!)!!3!
+#!!%!!`!"!!2J!3!$)!%!!L!"!!)J!rrr,J3!!,i$rrm1!+`%!!'Z#!!"rK!!!"!
+J!!!)3!!!")!!!!-!N"K!!!!!i!!!!I!!!!2i!!!(r!!!$r`!!"rm!!2rr`!(rrq
+!!rrr!!(rrJ!"rri!!Irr!!(rrq!"rrmJ!Irq)!(rrL!$rrmZ"rrr[J2rr`i!rr`
+!!Iri!!(rm!!!(q!!!!r!!!!(J!!!!`#3%3T3i!!HK)!!"k%J!!!!"d&38%`!N!C
+!!!!"!!+!"8!)3$ri%"!3(K!5%"-rq`iJ$N!#J!%!N!8"!!1!"m!2`$ri(r!IrKr
+b(r-rq`rJ$m!$J!%!N!8%!*"5r`#3([m!r`#3(2m!X!$r!*!Dr`#`!,!!r`#3'2m
+!!!#`!2m&r`#3&[m!!,!!!2m&"Im!N"Ar!!#`!,!!!2m&r`#3%2q3%J#3$Im!!#X
+!+j!+q5[jqIm!N!hrN")!N!rr!!!VN!VjqIm!N"$r!!!!+j!)qIRjr`#3%2m!!#Z
+3#[Rjrrm!N!rr!!!!+j!)qIRjrj!&!*!-r`!!+j!+qIRrr`!!r`#3$2m!!!!VN!M
+jqIRr!!!!r`#3$2m!!#Z3#[Rjr`!!!2m!N![rN")!!2m!APjH!*!'r`!!+`!VN!V
+j+rRjr`$rrejHAJ#3"rq3%J#3"&jHAJ#3#E!&X!@`X2NVN!Ajr`#3%E#`"E!&X,#
+`q5XV+rRr!*!5X*!)q5XVqIm!N"IrqC!%+rRr!*!CrrNV+rRr!*!ErrRjr`#3(Ir
+r!*"b!J#3+3m!N!r`m!#3$3m&$`#3$I"382!!N!X2!!82(`#3#r!&!2%I!*!+$`"
+38!mI!*!)rj!*!*!'$`$!c*!&h0h`!*!'rj!*!*!($`$-N!AGm!#3"`m!$-c-c-h
+Gm!#3"`m!c*!&hIm!N!F2!!c-c-c0hIrrm!#3"3m!c*!&hIm!m!#3"3m!$-c-c-h
+Gm!$`!*!&$`$-N!AGm!$`!*!&rj!*!2#lX!!!$`$!c*!&h0h`rlZ`!!!!rj!*!!#
+lX!#3"&&49Gc-c0m!N!J&89&9AFc0m!#3#!99999Gc0m!N!X2hGh0m!#3$2h-h`#
+3$3rGm!#3$[m!N$S"!*!Br`#3$[m!r`#3$2m!X!$r!*!+r`#3"2m&!*!(rj!,!*!
+'r`!VN!Ajr`#3"rm!+j!&qIq3"!#3"2m!+j!&qIm!!2m!N!6r!#Z3"IRr!!"HAJ!
+!rj!,!&jH!*!%X,#`+b[jr`#3#E#`X#[jr`#3$2rjr`#3$[m!N"Z!!*!,$`#3"r$
+`!*!&$`82!*!&m!!2%!!!!2q3"I!!!!m-c-cI!!!!$`c-c0rrm!!2$-c-h`$`!!m
+-c-cI!,X!rj!&m,X!!&9FcI!!N!49A0m!N!Epm!#3"Jm!N!m(9%9B9!!"!*!%*&"
+jG$%!!!!"4P*&4J!"!!!!J!!"!)&*3diM!!%!!!%X!!%!N!8"!!!!!3!!!!ST!!!
+*+3!!!3%"`GTX%pB!!!!F!2)!#8*14%`!!!"55801)`!!!&j659T&!!!!DNC548B
+!!3"fD@0c)`!!!)jTBf`i!!!!QQPME$3!!!#QD@0c1!!!!,*TBh-d!!!![P"jG$%
+!!!$+!)$rr`!!#2`"`Hj8!5crr`#3"!("m%6rN!3!!!%%!*!&J2rr!!!"%J("lYJ
+!JIrr!!!)m3("m%J",2rr!!!"(3("llJ",2rr!!!"B3("lQ3",2rr!!!&C3("leJ
+",2rr!!!(D3("m"3",2rr!!!)E3("lS!!N!B**!("lr!16hGZCA)JFQ9cEh9bBfA
+ib3:
diff --git a/Mac/scripts/ConfigurePython.py b/Mac/scripts/ConfigurePython.py
index 135dc19..59e41d7 100644
--- a/Mac/scripts/ConfigurePython.py
+++ b/Mac/scripts/ConfigurePython.py
@@ -86,6 +86,7 @@ goals = [
("Qt.slb", "toolboxmodules.slb"),
("Res.slb", "toolboxmodules.slb"),
("Snd.slb", "toolboxmodules.slb"),
+ ("TE.slb", "toolboxmodules.slb"),
("Win.slb", "toolboxmodules.slb"),
("imgcolormap.slb", "imgmodules.slb"),
("imgformat.slb", "imgmodules.slb"),
diff --git a/Mac/scripts/ConfigurePython.rsrc.hqx b/Mac/scripts/ConfigurePython.rsrc.hqx
index 7c097ab..067d3b1 100644
--- a/Mac/scripts/ConfigurePython.rsrc.hqx
+++ b/Mac/scripts/ConfigurePython.rsrc.hqx
@@ -2,43 +2,42 @@
:&%eV8'aeCfPZ3@aTBA0PFbjbFh*M!(*cFQ058d9%!3#3"`X,1d-!N!3"!!!!#KB
!!!N@!!!!p6B8)&3JD!!8)&"p%E"S%3!k!@FQ%Lm-6VS#$!`k!&Tj&%eV8'aeCfP
-Z3@aTBA0PFbjbFh*MF`)!!!!rN!B!!$q3#!#3'+eNVNB!N!B,#rm4`+KT!4e!%Ir
-c%h!!%#lrmlh5%@B386Dq9@X"!8*%[D'q9@X"!6"4-J&R(N39$!!!('85F!!3,N-
-9$!!!(f)'F!&J!!%"!LaD9#dZ4,d"!"Xm!@B`*e8q'NU!)&-#+!#r!#iL!1d*!J%
-!3)-Sfc36UGF[$%kk!3P+CfX"!+CA3cS!!!%!!!%!!!!#J!!!"%!!!(JJ!!"`%!!
-!)!J!!2J%!!$i!J!"q!%!!rhiJ!Am#%!*r!JJ%eBF%#0@#!K$rJ!%J!$rJN!"!%%
-J!Ap#%!&"4!J"@8J%!9&3!J&"B!%"Id!!J3"!!%%23!!K!%!!%3"!!!MrJ!!%ri!
-!!L!!!!&!!!!!J!!!!3!!!!1!!!!(`!!!Iq!!!(r`!!!rq!!!rr`!!2rq!!(rr`!
-$rrq!"rrr`!rrrq!Irrr`2rrrq(rrrrcrrrrqIrrrrcrrrriIrrrm$rrrq!Irrr!
-$rrrJ!Irr`!$rrm!!Irr!!$rr`!!Irm!!$rq!!!IrJ!!$i!!!!F!!!!#!!*!%#P$
-J!"k%J!!(S5!!!!!(39"36!#3"Ka3HA3b!!!!!8C548B!N!@!5801)`#3"!%X!!!
-!3!%!!S!F3!JJ("!pk(BN[L*!q5#+%+`)L!5)!R!"3!#!!3!$J"r!$q!Im$riIrc
-rrRrr2riIr!ri"rJ$m!(!!)!!!!3!N"$r!*!Hr`$r!*!Fr`!!!2m!N"H`X,$r!*!
-&r`#3&V#`X#X!N!Er!*!@X#XV!*!(r`#3%l#3"3#3#2m!N"+`N!8V!*!)r`#3%2q
-`N!8V!*!*r`#3$[q`N!FVrj!'!!!!r`#3$2m!X*!(+`#3"Im!N!6r!*!+r`!!X*!
-(+`#3"Im!N!Ar!*!)r`!!X,!&X!@`"E#`+`!!!2rrr`#3"Im!N!Er!!!!X,!&X!@
-`"E#`+`#3"2m!N!Ir!*!%r`#3",#3#5X!N!hr!!$r+`#3"5Z3#Iq3#3#3"#[r!!$
-r+`#3$2mVN!Rr!!!!+b[r!!$r+`#3#rmVqC!'+b[r+`!V+rm!N!6r+`#3#[mVq5Z
-3"3!VrbXV+rm!N!Er+`#3#ImVq5Z3"3!VrbXVr`#3#2mV!*!)rb[j+j!&!#[r+rm
-!N!Vr+`#3"rmVq5Z3"3!Vrrm!N!cr+`#3"[mV+`#3"L[r!*!1rbX!N!Ar+j!*r`#
-3$rmV!*!%rbZ3"2crrr`Vr`#3%2mV!!!!rb[BibZ3"[m!N"(r+`!!rbZ3#Im!N",
-r+`!!rrb3"rm!N"6r+`$rN!N!N"Ar+bXVr`#3(2mVr`#3([m!N"%"!*!)r`#3$[r
-er`#3#V#`X2AepIm!N!U`pC!&r`#3#,#`X2@3"Im!N!ErX,#`!2q3"2Ar!*!%rl#
-`"E#`pIAerrAer`!!rr@`N!AepIArpIAer`!!rr@3"[q3"IAhr`!!rr@3"IrhprI
-rprm!N!6rpC!%rrIrprrr!*!'rrAepIrhprIr!*!)rrAerrIhprm!N!RrpIArrrm
-!N![rprm!N!lr!*!+J!!!!!m!N!I`m!#3"!99!!m!N!93!!$`!!!!"98!!!m!!!$
-e93rrm2!!$e898!$`$`$`9993!2!!m!m!!!$rrr$2!2!!!2c-r2!!$`!!r2cr!!!
-!m!$mc2!!!!!2!2c-m!#3"2!2r`#3"3r2!*!(m!#3"3)!N!J2!*!2m2!!N!d2!!m
-!N!X&9I!!!2!!N!S&9F!!!!m!N!YF`!!!!2!!N!P999!!!!!2!*!*999F!*!%m!#
-3"`p999`!N!32!*!(p9999Frrrr!!m!#3"3m&9999`!!!m!!2!*!&m!9999A!!!$
-`!!$`!!!!$`"9&489A!!2r`!!$`!!!2!!9489&9`!!2!!!!$`!!m!!&@3"&`!N!B
-2!2`!!!c-N!6rN!6`!!c`$m!!N!82c*!%c`!-c`$m!*!&$mhGhGc2`-c`!!r!!*!
-%$mh-c-$2c-m!!!$m!*!%$mh-c-$2c2!!!!!2`!!!!!r0c-c!cmm!N!Am!!!!$mh
--c-$2m!#3"3r!!!!2c!!!!-m!N!Im!!!2c*!%c`#3"`r!!!r-c1rqc`#3#2`!$m1
--c-c2!*!)$m!2c*!%c`#3#I`!rZlZl[!!N!N2`2q3"2!!N!Vmc2!!N!d2c`#3$r!
-!N!S"!!!!!3!!!!S@!!!*&J!!!28"`GTX%pB!!!!F!1B!#8*14%`!!!"55801)`!
-!!&j659T&!!!!DNC548B!!!"fD@0c)`!!!)*TBf`i!!!!MQPMFcJ!!!#DD@0c0!!
-!!+CTBf`d!!!!XP"jG$)!!!#q!)$rr`!!!4d"`HlB!5crr`#3"!(!mN6rN!3!!!%
-%!*!&J2rr!!!"%J("lX!",2rr!!!"23("lXJ",2rr!!!"J3("lQ!",2rr!!!&K3(
-"lS3",2rr!!!'L3("lS`",2rr!!!($3("le!!N!B*%3("dM316hGZCA)JFQ9cEh9
-bBf9Pf!:
+Z3@aTBA0PFbjbFh*MF`)!N#ZYM&Ck!*!'#`[r%F#SD3%G3"(rma0`!"!Zrr1pdK&
+Q%&%f[P9V!3&#4,fK[P9V!3%`86)"Caj%&3`!!"aP%R!!%#j$&3`!!"pL"R!"B!!
+"!3)X@P3Y,N5p!3!E2!&Q-#G92KT+J#"6!LJ![`!Z)J$Y#3)"!%#$+0Xd%kRA,`a
+1ZJ%*5QGV!3#Q9d-k!!!"!!!"!!!!!S!!!!4!!!"i)!!!F"!!!#!)!!$i"!!!q!)
+!!IJ"!!2pq)!&r!K!#I`))"0@("!M9JJ)3ri!")!!ri*!!3"")!&r3K!"383)!9P
+)"!&48!)"3@!"!Ap!!)%!3!""$d!!)3"!!"%!3!!)ri!!"2q!!!)J!!!"3!!!!)!
+!!!%!!!!$J!!!"m!!!(rJ!!"rm!!!2rJ!!2rm!!$rrJ!"rrm!!rrrJ!Irrm!2rrr
+J(rrrm$rrrrKrrrrmrrrrrRrrrrmrrrrq(rrrr!rrrrJ(rrr`!rrri!(rrm!!rrr
+!!(rr`!!rrm!!(rr!!!rrJ!!(ri!!!q!!!!(!!!!!J!#3"!T3i!!HK)!!"k%J!!!
+!"d&38%`!N!BF8(Pd-J!!!!&'8N9'!*!&J%P$6L-!N!3",!!!!%!"!!+!(%!))"`
+32HKf*,iL32NJLK#X#)J%L!*`!8!!J!%!!i!I`!rJ(r!rq(rmrrjrrcrq(r`2q!I
+i!r!"`!#!!!!%!*!3r`#3([m!r`#3(2m!!!$r!*!AX,#`r`#3"Im!N"D`X,!V!*!
+'r`#3&V!V+`#3"rm!N"1`N!8!N!Mr!*!5X*!&+`#3#2m!N"$rX*!&+`#3#Im!N!l
+rX*!(+rq3"J!!!2m!N!cr!,#3"bX!N!Ar!*!%r`#3#[m!!,#3"bX!N!Ar!*!&r`#
+3#2m!!,#`"E!&X!@`X#X!!!$rrrm!N!Ar!*!'r`!!!,#`"E!&X!@`X#X!N!6r!*!
+(r`#3"2m!N!5`N!NV!*!0r`!!rbX!N!8VN!RrN!N!N!3Vr`!!rbX!N!cr+j!*r`!
+!!#XVr`!!rbX!N![r+rQ3"LXVrbX!+b[r!*!%rbX!N!Vr+rNVN!8!+rmV+b[r!*!
+'rbX!N!Rr+rNVN!8!+rmV+rm!N!Mr+`#3#2mVq5Z3"3!Vrb[r!*!+rbX!N!Ir+rN
+VN!8!+rrr!*!-rbX!N!Er+bX!N!BVr`#3$[mV!*!&rbZ3#Im!N!rr+`#3"2mVN!6
+mrrrm+rm!N"$r+`!!!2mVf1-VN!Er!*!4rbX!!2mVN!Rr!*!5rbX!!2rmN!Ir!*!
+8rbX!rj!*!*!9rbXV+rm!N"cr+rm!N"lr!*!4!3#3#2m!N!lrpIm!N!U`X,$epIA
+r!*!+X2@3"Im!N!L`X,$eN!Ar!*!'rl#`X!$rN!6er`#3"2q`X!@`X2AepIrepIm
+!!2reX*!&pIAerrAepIm!!2reN!ErN!Aeprm!!2reN!ArprIhrrIr!*!%rr@3"2r
+hrrIrr`#3"[repIArprIhr`#3#2repIrhprIr!*!*rrAerrrr!*!,rrIr!*!1r`#
+3#S!!!!!2!*!(m2!!N!3&93!2!*!&8!!!m!!!!!99!!!2!!!!p982rr$`!!p9&9!
+!m!m!m&998!$`!2!2!!!!rrr`c`$`!!$mc2c`!!m!!2cmr`!!!2!!r-c`!!!!$`$
+mc2!!N!6`$rm!N!82c`#3"r!!N!8#!*!)$`#3$r$`!*!0$`!2!*!,"9A`!!$`!*!
++"9A!!!!2!*!,A-!!!!$`!*!*9993!!!!$`#3#999A!#3"2!!N!F2999F!*!%$`#
+3"r9999A2rrr`!2!!N!82"9999F!!!2!!$`#3"I!&9999`!!!m!!!m!!!!!m!948
+9&9`!$rm!!!m!!!$`!&89&49F!!$`!!!!m!!2!!"9N!4F!*!'$`$m!!!-c*!%rj!
+%m!!-m!r!!*!&$mb3"-m!$-m!r!#3"3r0hGhFcm$-m!!2`!#3"!r0c-c!cmc2!!!
+!r!#3"!r0c-c!cmc`!!!!$m!!!!!2cFc-`-r2!*!&r!!!!!r0c-c!cr!!N!82`!!
+!$m`!!!$2!*!(r!!!$mb3"-m!N!F2`!!2c-c[rXm!N!Mm!!r$M-c-c`#3#!r!$mb
+3"-m!N!Rm!2lZlZl`!*!*$m$rN!6`!*!+r-c`!*!0$mm!N!r`!*!+!3!!!!%!!!!
++&J!!#4B!!!$e!F(DE"2@!!!!(!$Q!!P#6N4-!!!!8NP$6L-!!!"H8dPD43!!!'T
+'8N9'!!!!GQPMFb-!!!##D@0X1!!!!)jTBh-i!!!!QQPMFc3!!!#QD@0X0!!!!,*
+3HA3b!!!![J#!rrm!!!%G!F(Zf!%Xrrm!N!3"`2*%rj!%!!!""!#3"B$rr`!!!4)
+"`Hl!!5crr`!!!6d"`Hl)!5crr`!!!B%"`HjJ!5crr`!!"B8"`Hk%!5crr`!!"SN
+"`Hk-!5crr`!!"`d"`Hp3!*!'#4%"`G)d$NphEQ9b)(*PFfpeFQ0Pl"X:
diff --git a/Mac/scripts/EditPythonPrefs.py b/Mac/scripts/EditPythonPrefs.py
index 0fd6bed..40a406d 100644
--- a/Mac/scripts/EditPythonPrefs.py
+++ b/Mac/scripts/EditPythonPrefs.py
@@ -1,4 +1,7 @@
"""Edit the Python Preferences file."""
+#
+# This program is getting more and more clunky. It should really
+# be rewritten in a modeless way some time soon.
from Dlg import *
from Events import *
@@ -20,6 +23,14 @@ OK_ITEM = 2
CANCEL_ITEM = 3
DIR_ITEM = 4
TITLE_ITEM = 5
+OPTIONS_ITEM = 7
+
+# The options dialog. There is a correspondence between
+# the dialog item numbers and the option.
+OPT_DIALOG_ID = 513
+# 1 thru 7 are the options
+OD_OK_ITEM = 8
+OD_CANCEL_ITEM = 9
# Resource IDs in the preferences file
PATH_STRINGS_ID = 128
@@ -61,6 +72,7 @@ def listtores(list):
def message(str = "Hello, world!", id = MESSAGE_ID):
"""Show a simple alert with a text message"""
d = GetNewDialog(id, -1)
+ d.SetDialogDefaultItem(1)
print 'd=', d
tp, h, rect = d.GetDialogItem(2)
SetDialogItemText(h, str)
@@ -68,7 +80,26 @@ def message(str = "Hello, world!", id = MESSAGE_ID):
n = ModalDialog(None)
if n == 1: break
-def interact(list, pythondir, title):
+def optinteract(options):
+ """Let the user interact with the options dialog"""
+ old_options = options[:]
+ d = GetNewDialog(OPT_DIALOG_ID, -1)
+ d.SetDialogDefaultItem(OD_OK_ITEM)
+ d.SetDialogCancelItem(OD_CANCEL_ITEM)
+ while 1:
+ for i in range(len(options)):
+ tp, h, rect = d.GetDialogItem(i+1)
+ h.as_Control().SetControlValue(options[i])
+ n = ModalDialog(None)
+ if n == OD_OK_ITEM:
+ return options
+ elif n == OD_CANCEL_ITEM:
+ return old_options
+ elif 1 <= n <= len(options):
+ options[n-1] = (not options[n-1])
+
+
+def interact(list, pythondir, options, title):
"""Let the user interact with the dialog"""
opythondir = pythondir
try:
@@ -95,12 +126,14 @@ def interact(list, pythondir, title):
fss, ok = macfs.GetDirectory('Select python home folder:')
if ok:
pythondir = fss
+ if n == OPTIONS_ITEM:
+ options = optinteract(options)
tmp = string.splitfields(GetDialogItemText(h), '\r')
rv = []
for i in tmp:
if i:
rv.append(i)
- return rv, pythondir
+ return rv, pythondir, options
def getprefpath(id):
# Load the path and directory resources
@@ -119,6 +152,13 @@ def getprefdir(id):
except (MacOS.Error, Res.Error):
return None, None, 1
return fss, dr, fss_changed
+
+def getoptions(id):
+ try:
+ opr = GetResource('Popt', id)
+ except (MacOS.Error, Res.Error):
+ return [0]*7, None
+ return map(lambda x: ord(x), opr.data), opr
def openpreffile(rw):
# Find the preferences folder and our prefs file, create if needed.
@@ -155,38 +195,49 @@ def edit_preferences():
if fss == None:
fss = macfs.FSSpec(os.getcwd())
fss_changed = 1
+
+ options, opr = getoptions(OPTIONS_ID)
+ saved_options = options[:]
# Let the user play away
- result = interact(l, fss, 'System-wide preferences')
+ result = interact(l, fss, options, 'System-wide preferences')
# See what we have to update, and how
if result == None:
sys.exit(0)
- pathlist, nfss = result
+ pathlist, nfss, options = result
if nfss != fss:
fss_changed = 1
- if fss_changed or pathlist != l:
- if fss_changed:
- alias = nfss.NewAlias()
- if dr:
- dr.data = alias.data
- dr.ChangedResource()
- else:
- dr = Resource(alias.data)
- dr.AddResource('alis', DIRECTORY_ID, '')
-
- if pathlist != l:
- if pathlist == []:
- if sr.HomeResFile() == preff_handle:
- sr.RemoveResource()
- elif sr.HomeResFile() == preff_handle:
- sr.data = listtores(pathlist)
- sr.ChangedResource()
- else:
- sr = Resource(listtores(pathlist))
- sr.AddResource('STR#', PATH_STRINGS_ID, '')
+ if fss_changed:
+ alias = nfss.NewAlias()
+ if dr:
+ dr.data = alias.data
+ dr.ChangedResource()
+ else:
+ dr = Resource(alias.data)
+ dr.AddResource('alis', DIRECTORY_ID, '')
+
+ if pathlist != l:
+ if pathlist == []:
+ if sr.HomeResFile() == preff_handle:
+ sr.RemoveResource()
+ elif sr.HomeResFile() == preff_handle:
+ sr.data = listtores(pathlist)
+ sr.ChangedResource()
+ else:
+ sr = Resource(listtores(pathlist))
+ sr.AddResource('STR#', PATH_STRINGS_ID, '')
+
+ if options != saved_options:
+ newdata = reduce(lambda x, y: x+chr(y), options, '')
+ if opr and opr.HomeResFile() == preff_handle:
+ opr.data = newdata
+ opr.ChangedResource()
+ else:
+ opr = Resource(newdata)
+ opr.AddResource('Popt', OPTIONS_ID, '')
CloseResFile(preff_handle)
@@ -207,49 +258,66 @@ def edit_applet(name):
fss, dr, fss_changed = getprefdir(OVERRIDE_DIRECTORY_ID)
if fss == None:
if notfound:
- notfound = notfound + ' and ' + 'directory'
+ notfound = notfound + ', directory'
else:
notfound = 'directory'
fss, dummy, dummy2 = getprefdir(DIRECTORY_ID)
if fss == None:
fss = macfs.FSSpec(os.getcwd())
fss_changed = 1
+
+ options, opr = getoptions(OVERRIDE_OPTIONS_ID)
+ if not opr:
+ if notfound:
+ notfound = notfound + ', options'
+ else:
+ notfound = 'options'
+ options, dummy = getoptions(OPTIONS_ID)
+ saved_options = options[:]
dummy = dummy2 = None # Discard them.
if notfound:
message('Warning: initial %s taken from system-wide defaults'%notfound)
# Let the user play away
- result = interact(l, fss, name)
+ result = interact(l, fss, options, name)
# See what we have to update, and how
if result == None:
sys.exit(0)
- pathlist, nfss = result
+ pathlist, nfss, options = result
if nfss != fss:
fss_changed = 1
- if fss_changed or pathlist != l:
- if fss_changed:
- alias = nfss.NewAlias()
- if dr:
- dr.data = alias.data
- dr.ChangedResource()
- else:
- dr = Resource(alias.data)
- dr.AddResource('alis', OVERRIDE_DIRECTORY_ID, '')
-
- if pathlist != l:
- if pathlist == []:
- if sr.HomeResFile() == app_handle:
- sr.RemoveResource()
- elif sr and sr.HomeResFile() == app_handle:
- sr.data = listtores(pathlist)
- sr.ChangedResource()
- else:
- sr = Resource(listtores(pathlist))
- sr.AddResource('STR#', OVERRIDE_PATH_STRINGS_ID, '')
+ if fss_changed:
+ alias = nfss.NewAlias()
+ if dr:
+ dr.data = alias.data
+ dr.ChangedResource()
+ else:
+ dr = Resource(alias.data)
+ dr.AddResource('alis', OVERRIDE_DIRECTORY_ID, '')
+
+ if pathlist != l:
+ if pathlist == []:
+ if sr.HomeResFile() == app_handle:
+ sr.RemoveResource()
+ elif sr and sr.HomeResFile() == app_handle:
+ sr.data = listtores(pathlist)
+ sr.ChangedResource()
+ else:
+ sr = Resource(listtores(pathlist))
+ sr.AddResource('STR#', OVERRIDE_PATH_STRINGS_ID, '')
+
+ if options != saved_options:
+ newdata = reduce(lambda x, y: x+chr(y), options, '')
+ if opr and opr.HomeResFile() == app_handle:
+ opr.data = newdata
+ opr.ChangedResource()
+ else:
+ opr = Resource(newdata)
+ opr.AddResource('Popt', OVERRIDE_OPTIONS_ID, '')
CloseResFile(app_handle)
diff --git a/Mac/scripts/EditPythonPrefs.rsrc.hqx b/Mac/scripts/EditPythonPrefs.rsrc.hqx
index bfdab11..59a4b22 100644
--- a/Mac/scripts/EditPythonPrefs.rsrc.hqx
+++ b/Mac/scripts/EditPythonPrefs.rsrc.hqx
@@ -1,51 +1,60 @@
(This file must be converted with BinHex 4.0)
-:&%9NDA43HA4SEfj3FQ9QFbjbFh*M!(*cFQ058d9%!3#3"`a4jf8!N!3"!!!!#bJ
-!!!SS!!!"+6B8)&3JD!!8)&"p%E"S%3!k!@FQ%Lm-6VS#$!`k!&Tj&%9NDA43HA4
-SEfj3FQ9QFbjbFh*MF`)!!!"bFh*M8P-!!(*cFQ058d9%!3!!!!%!N"1YC+j$!*!
-'$&(r%F#SD3%G3"(rma0`!"!Zrr1pdK&Q%&%f[P9V!3&#4,fK[P9V!3%`86)"Caj
-%&3`!!"aP%R!!%#j$&3`!!"pL"R!"B!!"!3)X@P3Y,N5p!3!E2!&Q-#G92KT+J#"
-6!LJ![`!Z)J$Y#3)"!%#$+0Xd%kRA,`a1ZJ%*5QGV!3#Q9d-k!!!"!!!"!!!!!S!
-!!!4!!!!))!!!%"!!!#')!!""K!!!Jm)!!32"!!)(q)!%"i4!#!3#)"!)i4!J%b#
-)3"iJI)!$i$T!$!!j)"-!1K!3i$`)$"ii"!!"q!)-!$J"%J"!!*,iJ!"-!3!!)!)
-!!"!%!!!)#!!!""!!!!)J!!!"3!!!!)!!!!%!!!!$J!!!"m!!!!rJ!!!Im!!!2rJ
-!!(rm!!$rrJ!"rrm!!rrrJ!Irrm!2rrrJ(rrrm$rrrrKrrrrmrrrrrRrrrrmrrrr
-q(rrrr!rrrrJ(rrri!rrrq!(rrm!!rrq!!(rr!!!rrJ!!(r`!!!ri!!!(m!!!!q!
-!!!(!!!!!J!#3"!T3i!!HK)!!"k%J!!!!"d&38%`!N!C!!3!#J!4!#f!6N!!L#%8
-NJZ0"!b$$%cm,#`33!L!"3!#!!3!$J!I!$q!Im$riIrcrrhrr2rmIr`rl"r!$i!(
-!!)!!!!3!N"$r!*!Hr`$r!*!Fr`!!!2m!N"Vr!!$ep3$r!*!Br`!!pC!%!2m!N"E
-r!!$epE#`pI8!r`#3&2m!!2AepE#`pIAe!2m!N",r!!$epI@`N!6epI8!r`#3%2m
-!!2@3",#3"2@3"!$r!*!1r`!!pC!%X*!%rj!%pI8!r`#3$2m!!2@3"E$rrrm)N!6
-rpI8!r`#3#[m!!2@3"[mc#*!(rrAe!2m!N!Mr!!$eN!Er#!Jcrrrr#*!%rrAe!2m
-!N!Er!!$eN!Er#$2rrrIhr`L3"Irep3$r!*!%r`!!pC!(rj!%prAerc-)N!ArN!8
-!!2m!!2@3#rq3"3%)N!8crrrrprm!!2rhpC!*rrmc#*!+-rrrrrIhr`!!rrIeN!I
-r"IIrrc-c-`L3"M2rrrrhr`#3"2rhpC!'r`8&prIrrrmcN!3)#$2rN!3!N!Erpr@
-3"[rrpIAhprIrN!3c-c2rrrm!N!Mrpr@3$2H3"2q3"J#3#IrhpC!%rrreN!MhN!6
-rrrm!N!VrprAerrAerr@3#2Ihr`#3$[rhpIrepIrerj!&pIIhr`#3%2rhpIrrpC!
-(prIr!*!5rrIeN!Mhprm!N"6rpr@3"[Ihr`#3&[rhpC!%prIr!*!BrrIepIIhr`#
-3'[rhprIr!*!FrrIr!*!Hr`#3%3%!N!Mr!*!1rrAr!*!-rrAepIm!N!VrpE#`pIr
-r!*!)rrAeX2rr#!Mr!*!'rrAepIm)N!Ar!*!%rrAepIm)r`J)r`J)r`!!rr@3"Ir
-hrrrr#!Jcrrm!rr@3"[mc-`Jc-rrr!!$rpC!&rrmcN!6rr`!!!2repIrrpIArN!B
-!N!6rpIrrpIAeprm!rrm!N!ArpC!%prm!N!VrpIAhr`#3$2rhr`#3$[m!N!U!!!!
-!$`#3"r$`!*!&$`!2!*!&m&82m!!!!!m!Ar!2!!!!m!$`!!$`!!m!$mm!m!m!m!!
-!r2r`$Im2!!!!rG$Gr`$`!!$rhGhr!!m!r`$rrrm!!2$r!!c`r`!!$`!!c`#3"I!
--m!#3"3r2!*!(m!#3"3)!N!J2!*!2m2!!N!d2!!m!N!h`!!$`!*!,$`!!!!m!N![
-`!!93!2!!N!N2!!!&8!!2!*!*m!!!998!!2!!N!F2!!!!998!!!m!N!I`!!!&99r
-rm!$`!*!&$`!!!!Arm!!2!!m!N!A`!!!!$p!!!!$`!2!!!!!2!*!%r-hrm!!2!!m
-!!!$`!!!!$mhrc2!!!2!!m!!2!*!%$rrm!2!!!!rrr`$`!*!'rrr`!!!0rrc`$m!
-!N!6rd!#3"!hrr-m!r!!!!!mFrph3!!!0rrc`!!r!!!!2%FcrrGh3$Irr!!!!r!!
-!!2m!c-rrrGhrm!!!!!r!!*!&$-c2rrr`!*!%r!!!r`#3"-c-rr!!N!32`!m!m!!
-!!!c2!*!(r!m!m2rrm-c`!*!($m$r!!!!$-m!N!Rm!*!%c2!!N!N2`!!!$-m!N![
-m!!$-m!#3#`r!$-m!N!hmc2!!N!d2c`#3$r!!N!S9!#)!D!&D!Cm!!3%!!3#3"3)
-!N!AL!!8!N!95!"8!m`%R%!P&C'Pd)&4PH(5(!*!%!4J!m!%X!5`%!Np,!*!%!4J
-!&!%X!%i%"N0KEQ0PE!#3"IS!&!%-!5X%(e0PE'9MG#!N+&"C9%K26LNJD'pYC5"
-QEfaNCA)Z,LjQ!*!&$3!A!"i"*JJ*4@4TG#"8CAKd,J#3"5S!&3"1!5H)6d9ZG'9
-b)(0jFbj`BA4S)'0[EA"[EQ9ZG(-X)'pZC5"`CA)JE'PZC3dS9A0P)#3S8&P85%p
-1+5"QEh)JF(PdD'pZ)'K[E@8JCQpXC'9b+6S!N!3"!*!%"bU3"!!"!*!%*&"jG$!
-!!!!"4P*&4J!"!!!!J!!"!)&*3diM!!%!!!%X!!%!N!3"!!!!#bJ!!!SS!!!"+3'
-3!-'8'$i!!!!F!4S!#d*14%`!!!"L5801)`!!!'j659T&!!!!HNC548B!!3#'D@0
-c)`!!!*jTBf`i!!!!UQPMFcJ!!!#fD@0c0!!!!-*TBf`d!!!!cN4-6dF!!!$D4%P
-86!!!!1C3HA3`!!!!mJ#!rrm!!!S!N!8",2rr!*!)rj!%!!!""!#3"B$rr`!!!4)
-!N!@"rrm!!!Re!*!%!5crr`!!!4d!N!3",2rr!!!"B3#3"!%Xrrm!!!9P!*!%!5c
-rr`!!"QN!N!3",2rr!!!'l3#3"!)!rrm!!!Ma!*!%!J$rr`!!#3S"N!#q&!#3"JR
-`!*!%$NphEQ9b)(*PFfpeFQ0PDV%:
+:&%9NDA43HA4SEfj3FQ9QFbjbFh*M!(*cFQ058d9%!3#3"`iJll%!N!3"!!!!$0m
+!!![I!!!"36B8)&3JD!!8)&"p%E"S%3!k!@FQ%Lm-6VS#$!`k!&Tj&%9NDA43HA4
+SEfj3FQ9QFbjbFh*MC3)!!!"bFh*M8P-!!(*cFQ058d9%!3!"e!%!N"'qK+f-AEB
+!N!B1)2m4`+KT!4e!%Irc%h!!%#lrmlh5%@B386Dq9@X"!8*%[D'q9@X"!6"4-J&
+R(N39$!!!('85F!!3,N-9$!!!(f)'F!&J!!%"!LaD9#dZ4,d"!"Xm!@B`*e8q'NU
+!)&-#+!#r!#iL!1d*!J%!3)-Sfc36UGF[$%kk!3P+CfX"!+CA3cS!!!%!!!%!!!!
+#J!!!"%!!!!JJ!!!3%!!!)BJ!!%'%!!#$`J!"!m%!!JIiJ!3(K%!)"!)J%!MK%#!
+6))K!(L"mJ!2J1N!-!$NJ%`!k%"$J2!J-(MJ%!!(i!J`!1!%5!%!!N[L!!%`"!!!
+J!J!!%!3!!!J)!!!%%!!!!L!!!!&!!!!!J!!!!3!!!!1!!!!(`!!!$q!!!"r`!!!
+rq!!!Ir`!!2rq!!(rr`!$rrq!"rrr`!rrrq!Irrr`2rrrq(rrrrcrrrrqIrrrrcr
+rrriIrrrm$rrrq!IrrrJ$rrri!Irr`!$rri!!Irm!!$rq!!!Ir!!!$rJ!!!I`!!!
+$i!!!!F!!!!#!!*!%#P$J!"k%J!!(S5!!!!!(39"36!#3"N!"!!+!"%!,B"13!#)
+)455#id%$)--62`X,""!#)!&!!)!"!!1!"m!2i"r`2rKrr2rrIrmrrarr$rX(m!2
+J!F!!J!!!"!#3%2m!N"lr!2m!N"cr!!!!r`#3'[m!!2Ae!2m!N"Mr!!$eN!3!r`#
+3&[m!!2AeX,$ep3$r!*!8r`!!pIAeX,$epI8!r`#3%[m!!2AepE#3"2Aep3$r!*!
+3r`!!pC!%X*!%pC!%!2m!N!lr!!$eN!5`N!6rN!6ep3$r!*!-r`!!pC!&X2rrr`L
+3"2rep3$r!*!+r`!!pC!'rc-)N!IrpI8!r`#3#2m!!2@3"[m)#$2rrrm)N!6rpI8
+!r`#3"[m!!2@3"[m)-rrrprIr#*!&rrAe!2m!N!6r!!$eN!IrN!6hpIAr-`L3"Iq
+3"3!!r`!!pC!,rj!&!3L3"62rrrrhr`!!rrIeN!Rrrc-)N!ScrrrrprIr!!$rpr@
+3"rm&prrr-c-c#*!'-rrrrrIr!*!%rrIeN!Er"3Ahprrrrc13"!J)-rq3"!#3"[r
+hpC!'rrrepIIhprq3"$-c-rrrr`#3#2rhpC!-pj!%rj!'!*!*rrIeN!6rrr@3#2H
+3"2rrr`#3#[rhpIArpIArpC!)prIr!*!1rrIerrAerrArN!AeprIr!*!3rrIerrr
+eN!Ihprm!N",rpr@3#2Ihr`#3&2rhpC!'prIr!*!@rrIeN!6hprm!N"MrprAeprI
+r!*!DrrIhprm!N"crprm!N"lr!*!4!3#3#2m!N!lrpIm!N!crpIAer`#3#[reX,$
+errm!N!MrpI@`rrm)#2m!N!ErpIAer`L3"Im!N!6rpIAer`Mr#!Mr#!Mr!!$rpC!
+&rrIrrrm)#$2rr`$rpC!'rc-c#$-crrm!!2reN!Arrc13"2rr!!!!rrAerrrepIq
+3"J#3"2rerrrepIAhr`$rr`#3"IreN!6hr`#3#[repIIr!*!-rrIr!*!1r`#3#S!
+!!!!2!*!(m2!!N!82!!m!N!A`93r`!!!!$`"Im!m!!!$`!2!!!2!!$`!2c`$`$`$
+`!!$mrr!0r`m!!!$pd0hr!2!!!2rGhIm!$`$r!2rrr`!!m2m!$2$r!!!2!!$2!*!
+&m!c`!*!&$mm!N!I`!*!&!J#3#!m!N!r`m!#3$3m!$`#3$I!!!2!!N!X2!!!!$`#
+3#r!!"9!!m!#3#3m!!!93!!m!N!R`!!"993!!m!#3"`m!!!"993!!$`#3"r!!!!9
+9Arr`!2!!N!82!!!!"Ir`!!m!$`#3"I!!!!!2d!!!!2!!m!!!!!m!N!6mcIr`!!m
+!$`!!!2!!!!!2cIr-m!!!m!$`!!m!N!32rr`!m!!!$rrr!2!!N!Errr!!!!hrr2!
+2`!#3"2r3!*!%$Irmc`$m!!!!$acrhG!!!!hrr2!!$m!!!!m4c2rphG!0rrm!!!$
+m!!!!r`$-crrphIr`!!!!$m!!N!8-c-rrrr!!N!6m!!$r!*!%c-crm!#3"!r!$`$
+`!!!!$-m!N!Im$`$`rrr`c2!!N!F2`2m!!!!-c`#3#I`!N!6-m!#3#3r!!!!-c`#
+3#r`!!-c`!*!,$m!-c`#3$Ic-m!#3$3r2!*!2m!#3#K8!)J"S!B!"R`!"!3!"!*!
+&!J#3"3%!N!3(+T!%!!%!N!3N8(Pd-!!!!!&'8N9'!!%!!!#!!!%!J8P$6L-!!3!
+!!5`!!3#3"!%+!!B!N!95!"8!m`%R%!P&C'Pd)&4PH(5(!*!%!6X!m!&2!5`%!Np
+,!*!%!6X!&!&2!%i%"N0KEQ0PE!#3"IS!&!%-!5X%(e0PE'9MG#!N+&"C9%K26LN
+JD'pYC5"QEfaNCA)Z,LjQ!*!&$3!A!"i"*JJ*4@4TG#"8CAKd,J#3"5S!&3"1!5H
+)6d9ZG'9b)(0jFbj`BA4S)'0[EA"[EQ9ZG(-X)'pZC5"`CA)JE'PZC3dS9A0P)#3
+S8&P85%p1+5"QEh)JF(PdD'pZ)'K[E@8JCQpXC'9b+6S!N!8"%`!8!58"+`3D4'9
+QBA9XG#"cG'&bG(9`)'p`G'P[ER-Z,Li!!!&b!!S!N!8H!!N!-!%1"50&ER4PFL"
+TER4PFQ&MG'PfC5"YEf4P)'&QG'9b)(0MFQP`G#-!N!8c!!N!43%1"4G8FQ&MC5"
+TEA"[FR3JFh4KG'9YC@jdFi)!N!9*!!N!@`%0"4a6GA"`FQ9cFb"PH("bCA0cD@p
+Z)("bD@jdD@jR!*!&A`!*!(%"$!8B9@jLG@CQCA*PC#"cG'4[GA3[Fh4NCA*b!*!
+&G3!*!)F"#`864'9LG@FJF'&bFf9b)'peG("eG'8!N!@J!"i!XJ#-"3Y1Eh*YB@`
+JCAKTG(-!N!@J!+!!XJ%+"3TPFR*[FL"PH'Pd!*!&``$9!0F"$`3#6dX!N!A$!!S
+!e`"("!C$B@jMC@`!N!8'!#B!&`$ZL"T3HA4SEfiJD@jdCA*`FQ9dCA)JEh"dD@p
+ZF`#3"B`!#J#F!3Z)'NYPCA!JFh4ND@mJGfPZC'ph)'p`C@iJEfik!!!!&3"1!(!
+"0J'#!!%"!!%!N!8#!3!!!!%!!!!-h`!!#pm!!!&"!),[e"*H!!!!(!%b!!Y#6N4
+-!!!!BNP$6L-!!!"Z8dPD43!!!(T'8N9'!!%!KQPMFb-!!!#HD@0X1!!!!+TTBh-
+i!!!!YQPMFc3!!!$#D@0X0!!!!-j%6%p(!!%!fN4*9%`!!3$b8(Pd-!!!!3S!J2r
+r!!!*'J##l(J",2rr!*!&JZcXrj!%!!!""!##dN`!J2rr!!!"%J##l23!JIrr!!!
+*$`##l&3",2rr!!!"(3##l,`",2rr!!!"B3##l3J",2rr!!!&C3##kp`",2rr!!!
+'D3##l9`",2rr!!!'l3##l8!#!2rr!!!)m3##lBJ#!Irr!!!,aJ##l2`#!2rr!!!
+*3J##lFJ#!Irr!!!+8!##kk3!N!B*#J##lF!16hGZCA)JFQ9cEh9bBf9Qd3:
diff --git a/Mac/scripts/MkDistr.rsrc.hqx b/Mac/scripts/MkDistr.rsrc.hqx
index d20e5b9..265d221 100644
--- a/Mac/scripts/MkDistr.rsrc.hqx
+++ b/Mac/scripts/MkDistr.rsrc.hqx
@@ -1,30 +1,30 @@
(This file must be converted with BinHex 4.0)
:$%eV4'PcG()ZFR0bB`"bFh*M8P0&4!%!N!F&SINN!*!%!3!!!!5[!!!$V`!!!2)
-8T8SJ&+9+%"5P5rJ6'6!)%!!!#"!!!!J3!!!)%!!!#!a0Dd4TFh4b,R*cFQ0b!J!
-!!$q3#!#3#$q3#!#3'+eNVN8!N!B&SIri(rrq!"rrr`!Irrq!(rrr`"rrrq!Irrr
-`(rrrq"rrrrJIrrri(rrrq"rrrrJIrrri(rrrq"rrrrJIrrri(rrrq"rrrrJIrrr
+8T8SJ&+9+%"5P5rJ6'6!)%!!!#"!!!!J3!!!)%!!!#!a0Dd4TFh4b,R*cFQ0b!J#
+3-kf-9RX!N!B&SIri(rrq!"rrr`!Irrq!(rrr`"rrrq!Irrr`(rrrq"rrrrJIrrr
i(rrrq"rrrrJIrrri(rrrq"rrrrJIrrri(rrrq"rrrrJIrrri(rrrq"rrrrJIrrr
-i(rrrq"rrrrJ!!!!9!&`!2J$q!D%!"3%!!3#3"3)!N!89!&`!2J$q!D%!"3%!!3#
-3"3)"!*!%c!!)!*!&JJ%L!*B"A!3#6dX!N!@#!!S!PJ"%"!C$B@jMC@`!N!9N!0`
-!GJ&E"3C6Eh9bBf8!N!93!0`!BJ&E"3Y38%-JC'9fC@a[F!#3"P!!EJ"L!0J&#MB
-i5b"#D@jKFRN!N!9N!'i!GJ$B"3T38%-JBQPZBA*j!*!&&!"Z!#-"9K!*4@4TG#"
-8CAKd@`#3"43!#J!N!'')#&"KG(4PFQik!*!&8!!+!'!!BSJ,4AKME(9NC5"TEMS
-!N!6d!!S!N!@#!5)!PJ&F"!*25`#3"B)!#J#@!%3%"N0KEQ0PE!#3"@3!h!"f!9X
-&"P0[GA*MC3#3"9!!h!"L!9X&#e"33b"NCACPE'p`!*!'8!"Z!')!f!8+0MK,)%*
-TEQ&bH3#3"@3!EJ"f!0J&#P"33b"LD@jKFRN!N!88!'i!)`&@%!P&C'Pd)&4PH(4
-E!*!&-J"Z!%%"9a!!N!B8!!S!*!"KL!G6Eh9bBf8k$`#3"6)!#J"#!'')$%4PFh4
-TEQ&dD@pZ1J#3"9!!#J"J!'+)#dPZBfaeC'8JD@ikE!!!!"8!+!!S!6S"a!!!!3!
-"!*!&!J)!N!39!#J!+!%k!F3!!!%!!3#3"3)$!*!%6J!$!*!&#J!+!0d"MJ#3"r!
-""!%%!Bm%"N4PE'9dC3#3"I!!EJ%%!2N%"d9NDA3Z,Li!N!E`!!S""!"L"!C"C'3
-Z,Li!!!!9!(!!EJ$V!9X!!!%!!3#3"3)%!*!%SJ!%!*!&(J!8!$!!j!B,4R9XE#"
-cEh9bBf9d!*!&-J!8!%3!j!B28&"$)'4PGQ9XEh"YC@jdj`#3"8B!&!"B!13'$cB
-i5b"LD@jKFRNYEfjXHHF!N!9D!"3!E!$N"Jp38%-JBQPZBA*j,@pZE(RR!*!&#J!
-+!"S!jSJH9(P`C5"[CL"NDA0dFQPLGA4TEfiJG'mJBR9TE'3k!!!!EJ!%!*!&#J!
-+!0d"MJ#3"r!"0J%&!B`%#N4TFh4bD@*eG'8!N!A`!0)""!%Z"!T$D'9MDb"dFQ9
-P!*!&m!!+!33!BJ3+5@jME(9NC5iZ,J#3"I!!EJ%%!-B%"d9iBfaeC'8!!!!"!!!
-!"+m!!!1[!!!!mJ$0P*344!!!!"`!TJ!"4%a24`!%!"*%594-!!3!6J)!N!M0Nh!
-#!3!2!!!!'3$0NhJ#!J!H!!!"qJ$0Nf`#!`!M!!!#%`$0NfJ#"!!k!!!#IJ$0Nf3
-#!2rr!!!"!J#3"!)"rrm!!!!b!*!%!J,rr`!!!cd!cC)m!J2rr`!!!L`!N!3#"2r
-r!!!#P`#3"!j*EQ0XG@4P)'4TB@a[C`j&H'0XG@4P)'4TB@a[C`40B@PZ&NPZBfa
-eC'8[CAKME(9NC5"hD@jNEhF44'PcG(*TBR9dD@pZ)(4jF'Aj@J:
+i(rrrq"rrrrJIrrri(rrrq"rrrrJIrrri(rrrq"rrrrJIrrri(rrrq"rrrrJ!!!!
+9!&`!2J$q!D%!"3%!!3#3"3)!N!89!&`!2J$q!D%!"3%!!3#3"3)"!*!%c!!)!*!
+&JJ%L!*B"A!3#6dX!N!@#!!S!PJ"%"!C$B@jMC@`!N!9N!0`!GJ&E"3C6Eh9bBf8
+!N!93!0`!BJ&E"3Y38%-JC'9fC@a[F!#3"P!!EJ"L!0J&#MBi5b"#D@jKFRN!N!9
+N!'i!GJ$B"3T38%-JBQPZBA*j!*!&&!"Z!#-"9K!*4@4TG#"8CAKd@`#3"43!#J!
+N!'')#&"KG(4PFQik!*!&8!!+!'!!BSJ,4AKME(9NC5"TEMS!N!6d!!S!N!@#!5)
+!PJ&F"!*25`#3"B)!#J#@!%3%"N0KEQ0PE!#3"@3!h!"f!9X&"P0[GA*MC3#3"9!
+!h!"L!9X&#e"33b"NCACPE'p`!*!'8!"Z!')!f!8+0MK,)%*TEQ&bH3#3"@3!EJ"
+f!0J&#P"33b"LD@jKFRN!N!88!'i!)`&@%!P&C'Pd)&4PH(4E!*!&-J"Z!%%"9a!
+!N!B8!!S!*!"KL!G6Eh9bBf8k$`#3"6)!#J"#!'')$%4PFh4TEQ&dD@pZ1J#3"9!
+!#J"J!'+)#dPZBfaeC'8JD@ikE!!!!"8!+!!S!6S"a!!!!3!"!*!&!J)!N!39!#J
+!+!%k!F3!!!%!!3#3"3)$!*!%6J!$!*!&#J!+!0d"MJ#3"r!""!%%!Bm%"N4PE'9
+dC3#3"I!!EJ%%!2N%"d9NDA3Z,Li!N!E`!!S""!"L"!C"C'3Z,Li!!!!9!(!!EJ$
+V!9X!!!%!!3#3"3)%!*!%SJ!%!*!&(J!8!$!!j!B,4R9XE#"cEh9bBf9d!*!&-J!
+8!%3!j!B28&"$)'4PGQ9XEh"YC@jdj`#3"8B!&!"B!13'$cBi5b"LD@jKFRNYEfj
+XHHF!N!9D!"3!E!$N"Jp38%-JBQPZBA*j,@pZE(RR!*!&#J!+!"S!jSJH9(P`C5"
+[CL"NDA0dFQPLGA4TEfiJG'mJBR9TE'3k!!!!EJ!%!*!&#J!+!0d"MJ#3"r!"0J%
+&!B`%#N4TFh4bD@*eG'8!N!A`!0)""!%Z"!T$D'9MDb"dFQ9P!*!&m!!+!33!BJ3
++5@jME(9NC5iZ,J#3"I!!EJ%%!-B%"d9iBfaeC'8!!!!"!!!!"+m!!!1[!!!!mJ$
+0P*344!!!!"`!TJ!"4%a24`!%!"*%594-!!3!6J)!N!M0Nh!#!3!2!!!!'3$0NhJ
+#!J!H!!!"qJ$0Nf`#!`!M!!!#%`$0NfJ#"!!k!!!#IJ$0Nf3#!2rr!!!"!J#3"!)
+"rrm!!!!b!*!%!J,rr`!!!cd!cC)m!J2rr`!!!L`!N!3#"2rr!!!#P`#3"!j*EQ0
+XG@4P)'4TB@a[C`j&H'0XG@4P)'4TB@a[C`40B@PZ&NPZBfaeC'8[CAKME(9NC5"
+hD@jNEhF44'PcG(*TBR9dD@pZ)(4jF'@B,`:
diff --git a/Mac/scripts/MkDistr_ui.py b/Mac/scripts/MkDistr_ui.py
index f9192f5..1c482ef 100644
--- a/Mac/scripts/MkDistr_ui.py
+++ b/Mac/scripts/MkDistr_ui.py
@@ -127,7 +127,7 @@ class ListWindow(DialogWindow):
for i in range(len(contents)):
self.list.LSetCell(contents[i], (0, i))
self.list.LSetDrawingMode(1)
- self.list.LUpdate()
+ self.list.LUpdate(self.wid.GetWindowPort().visRgn)
def additem(self, item):
where = self.list.LAddRow(1, 0)
@@ -161,7 +161,7 @@ class ListWindow(DialogWindow):
return values
def do_rawupdate(self, window, event):
- self.list.LUpdate()
+ self.list.LUpdate(self.wid.GetWindowPort().visRgn)
def do_close(self):
self.close()
diff --git a/Mac/scripts/PackLibDir.rsrc.hqx b/Mac/scripts/PackLibDir.rsrc.hqx
index 558181a..89b41fd 100644
--- a/Mac/scripts/PackLibDir.rsrc.hqx
+++ b/Mac/scripts/PackLibDir.rsrc.hqx
@@ -2,37 +2,37 @@
:$e"KBfY-D@*%DA)ZFR0bB`"bFh*M8P0&4!%!N!F,#b%@!*!%!3!!!!S@!!!*&J!
!!28f&#"8)'J!&#"3I4'`D"%!1J&R*K)[$%kk!J`-1J"DH3p3B@0V6'PL4'Pb,R*
-cFQ-#!!!!2j!)!*!'2j!)!*!BV@5Z5!#3"JX,ra(!U'N"(8!4rr-6F!!3,[rc[G)
-4CK"40Vj9D`%"3N5pSEj9D`%"-&%b!@FH4"8-!!!FC4*`!"!Z3a8-!!!IBJC`!@!
-!!3%#,&T8,5j%[3%!'c`"CM!R96iD5S!J8`)S!,m!,L)!l3N#!3"!JbME0"1Tebm
--6VS"#8TRD`%!TPG$1J!!!3#3$M`!!!"#!!!!rr`!!)!%!!#!"!!!J!3!!rrr!!3
-!!)!$rrm!!3!#!!%!!J!"!!-!!3!$i!%!!b!"!!)J!3!#)!2rrbi%!!#q!rrr$J#
-!"!!!J%3!!)$N!!#)T!!!RI3!!*3%!!#q"!!!J!3!!2rm!*!52!!!!(i!!!$rr!!
-!rr`!!2rm!!$rr!!$rrm!"rrrJ!2rr`!"rri!!Irq!!(rr`!"rrrJ!Irr)!(rrL!
-"rriJ!rrr,JIrrli$rrm1!2rm!!$rr!!!rr`!!2rm!!$rr!!!rr`!!2rm!!$rr!!
-!rr`!N!J+81!!(S5!!!HK)!!!!!G"8&"-!*!'(&"jG$-!!!!"4P*&4J#3"B"*3di
-M!*!%!5`!!!"!!*!%$J!*i!JJ2rJ3%"!H%")3%crl#+!+S!SJ$q!!N!B1!!rJ$q!
-rq"r`(riImKrc2rX2i!rJ$q!2i!#3"!3!N'[rN!3!N"[r!*!%r`#3'Iq3$J#3%[m
-!9!"8!&3!9!"8!&6r!*!5re3!9!"8!&3!9!"8!2m!N",r!&3!9!"8!&3!9!"8r`#
-3%2q3%J#3$Im!!#X!+j!+q5[jqIm!N!hrN")!N!rr!!!VN!VjqIm!N"$r!!!!+j!
-)qIRjr`#3%2m!!#Z3#[Rjrrm!N!rr!!!!+j!)qIRjrj!&!*!-r`!!+j!+qIRrr`!
-!r`#3$2m!!!!VN!MjqIRr!!!!r`#3$2m!!#Z3#[Rjr`!!!2m!N![rN")!!2m!APj
-H!*!'r`!!+`!VN!Vj+rRjr`$rrejHAJ#3"rq3%J#3"&jHAJ#3#Im!N!cr!*!5r`#
-3#,!!!!$r!*!5r`#3"l#`X!!!r`#3%[m!!!#`!!!!X!@`!!$r!*!5r`!!X,#`!,#
-3"3$r!*!5r`!!X!@`!*!(r`#3%[m!X*!&!*!'r`#3%[m!N!cr!*!5rj!1!*!X!3#
-3*Irrr`#3$ImU+[q3"!#3#ImU!#S!+[m!N!IrN!X!N!Er!#Z3"IRr!*!(r`!VN!A
-jrj!%!*!%r`!VN!Ajr`!!r`#3"2m!+j!&qIm!!&jH!!$rN!X!APi!N!6r!!!!X!$
-r!*!*r`#`!,!!r`#3#Im!X!!!!2m!N!RrN!F!N"F#!*!frrm!N!d2!!$`!*!-rj!
-(!*!*m-#3"Fm!N!Rm$*!&$`#3#I$!N!A2!*!)rj!*!*!'$`$!c*!&h0h`!*!'rj!
-*!*!($`$-N!AGm!#3"`m!$-c-c-hGm!#3"`m!c*!&hIm!N!F2!!c-c-c0hIrrm!#
-3"3m!c*!&hIm!m!#3"3m!$-c-c-hGm!$`!*!&$`$-N!AGm!$`!*!&rj!*!2#lX!!
-!$`$!c*!&h0h`rlZ`!!!!rj!*!!#lX!#3"2!!N!82!*!*m!!!!!8!$`#3#I!!!!"
-98!m!N!R`!&!!89!2!*!*m!99"999$`#3#I!&&3!!!!m!N!R`9993!!!2!*!*m!#
-3"3m!N!RrN!F!N"L!!*!5rr!!N!Emcrr`!*!%r!`-m!!!!2q3"I!!!!m-c-cI!!!
-!$`c-c0rrm!!2$-c-h`$`!!m-c-cI!,X!rj!&m,X!!2!!82!!N!6`8&$`!*!%m&!
-!m!#3"2rrrr!!N!d"!!!!!3!!!!S@!!!*&J!!!28"`GTX%pB!!!!F!1B!#8*14%`
-!!!"55801)`!!!&j659T&!!!!DNC548B!!!"fD@0c)`!!!)*TBf`i!!!!MQPMFcJ
-!!!#DD@0X0!!!!+CTBh-d!!!!XP"jG$-!!!#q!)$rr`!!!4d"`HpB!5crr`#3"!(
-"lL6rN!3!!!%%!*!&J2rr!!!"%J("lj!!!5crr`!!!6d"`Hk%!5crr`!!!B%"`Hp
-3!5crr`!!"B8"`HjJ!5crr`!!"SN"`Hjd!5crr`!!#)d"`Hk-!*!'#4%"`I!i$Np
-hEQ9b)(*PFfpeFQ0PHc3:
+cFQ-#!*!aVBa@H3#3"JX,ra(!U'N"(8!4rr-6F!!3,[rc[G)4CK"40Vj9D`%"3N5
+pSEj9D`%"-&%b!@FH4"8-!!!FC4*`!"!Z3a8-!!!IBJC`!@!!!3%#,&T8,5j%[3%
+!'c`"CM!R96iD5S!J8`)S!,m!,L)!l3N#!3"!JbME0"1Tebm-6VS"#8TRD`%!TPG
+$1J!!!3#3$M`!!!"#!!!!rr`!!)!%!!#!"!!!J!3!!rrr!!3!!)!$rrm!!3!#!!%
+!!J!"!!-!!3!$i!%!!b!"!!)J!3!#)!2rrbi%!!#q!rrr$J#!"!!!J%3!!)$N!!#
+)T!!!RI3!!*3%!!#q"!!!J!3!!2rm!*!52!!!!(i!!!$rr!!!rr`!!2rm!!$rr!!
+$rrm!"rrrJ!2rr`!"rri!!Irq!!(rr`!"rrrJ!Irr)!(rrL!"rriJ!rrr,JIrrli
+$rrm1!2rm!!$rr!!!rr`!!2rm!!$rr!!!rr`!!2rm!!$rr!!!rr`!N!J+81!!(S5
+!!!HK)!!!!!G"8&"-!*!'(&"jG$-!!!!"4P*&4J#3"B"*3diM!*!%!5`!!!"!!*!
+%$J!*i!JJ2rJ3%"!H%")3%crl#+!+S!SJ$q!!N!B1!!rJ$q!rq"r`(riImKrc2rX
+2i!rJ$q!2i!#3"!3!N'[rN!3!N"[r!*!%r`#3'Iq3$J#3%[m!9!"8!&3!9!"8!&6
+r!*!5re3!9!"8!&3!9!"8!2m!N",r!&3!9!"8!&3!9!"8r`#3%2q3%J#3$Im!!#X
+!+j!+q5[jqIm!N!hrN")!N!rr!!!VN!VjqIm!N"$r!!!!+j!)qIRjr`#3%2m!!#Z
+3#[Rjrrm!N!rr!!!!+j!)qIRjrj!&!*!-r`!!+j!+qIRrr`!!r`#3$2m!!!!VN!M
+jqIRr!!!!r`#3$2m!!#Z3#[Rjr`!!!2m!N![rN")!!2m!APjH!*!'r`!!+`!VN!V
+j+rRjr`$rrejHAJ#3"rq3%J#3"&jHAJ#3#Im!N!cr!*!5r`#3#,!!!!$r!*!5r`#
+3"l#`X!!!r`#3%[m!!!#`!!!!X!@`!!$r!*!5r`!!X,#`!,#3"3$r!*!5r`!!X!@
+`!*!(r`#3%[m!X*!&!*!'r`#3%[m!N!cr!*!5rj!1!*!X!3#3*Irrr`#3$ImU+[q
+3"!#3#ImU!#S!+[m!N!IrN!X!N!Er!#Z3"IRr!*!(r`!VN!Ajrj!%!*!%r`!VN!A
+jr`!!r`#3"2m!+j!&qIm!!&jH!!$rN!X!APi!N!6r!!!!X!$r!*!*r`#`!,!!r`#
+3#Im!X!!!!2m!N!RrN!F!N"F#!*!frrm!N!d2!!$`!*!-rj!(!*!*m-#3"Fm!N!R
+m$*!&$`#3#I$!N!A2!*!)rj!*!*!'$`$!c*!&h0h`!*!'rj!*!*!($`$-N!AGm!#
+3"`m!$-c-c-hGm!#3"`m!c*!&hIm!N!F2!!c-c-c0hIrrm!#3"3m!c*!&hIm!m!#
+3"3m!$-c-c-hGm!$`!*!&$`$-N!AGm!$`!*!&rj!*!2#lX!!!$`$!c*!&h0h`rlZ
+`!!!!rj!*!!#lX!#3"2!!N!82!*!*m!!!!!8!$`#3#I!!!!"98!m!N!R`!&!!89!
+2!*!*m!99"999$`#3#I!&&3!!!!m!N!R`9993!!!2!*!*m!#3"3m!N!RrN!F!N"L
+!!*!5rr!!N!Emcrr`!*!%r!`-m!!!!2q3"I!!!!m-c-cI!!!!$`c-c0rrm!!2$-c
+-h`$`!!m-c-cI!,X!rj!&m,X!!2!!82!!N!6`8&$`!*!%m&!!m!#3"2rrrr!!N!d
+"!!!!!3!!!!S@!!!*&J!!!28"`GTX%pB!!!!F!1B!#8*14%`!!!"55801)`!!!&j
+659T&!!!!DNC548B!!!"fD@0c)`!!!)*TBf`i!!!!MQPMFcJ!!!#DD@0X0!!!!+C
+TBh-d!!!!XP"jG$-!!!#q!)$rr`!!!4d"`HpB!5crr`#3"!("lL6rN!3!!!%%!*!
+&J2rr!!!"%J("lj!!!5crr`!!!6d"`Hk%!5crr`!!!B%"`Hp3!5crr`!!"B8"`Hj
+J!5crr`!!"SN"`Hjd!5crr`!!#)d"`Hk-!*!'#4%"`I!i$NphEQ9b)(*PFfpeFQ0
+P$a8:
diff --git a/Mac/scripts/RunLibScript.rsrc.hqx b/Mac/scripts/RunLibScript.rsrc.hqx
index 1e4900c..b523a5b 100644
--- a/Mac/scripts/RunLibScript.rsrc.hqx
+++ b/Mac/scripts/RunLibScript.rsrc.hqx
@@ -2,53 +2,52 @@
:%9*eENaTBP0MFQP`G#jbFh*M!(*cFQ058d9%!3#3"`cLBVi!N!3"!!!!#m8!!!V
&!!!"(6B8)&3JD!!8)&"p%E"S%3!k!@FQ%Lm-6VS#$!`k!&Tj%9*eENaTBP0MFQP
-`G#jbFh*M!J!!!$q3#!#3"$q3#!#3'+eNVNN!N!B-i[m4`+KT!4e!%Irc%h!!%#l
-rmlh5%@B386Dq9@X"!8*%[D'q9@X"!6"4-J&R(N39$!!!('85F!!3,N-9$!!!(f)
-'F!&J!!%"!LaD9#dZ4,d"!"Xm!@B`*e8q'NU!)&-#+!#r!#iL!1d*!J%!3)-Sfc3
-6UGF[$%kk!3P+CfX"!+CA3cS!!!%!!!%!!!!#J!!!"%!!!!JJ!"rm%!!3"JJ!%a8
-%!"5AJJ!8N!#"!"53!)#!%a#!3"!!J#!3!)!3-!#!#&!%J!53!*5!!P#)J!%d()!
-#&45!""1qJ!J5J)!3&m#!)"!!J%!3!)#!(rq"!!!J!J!!%!3!!!J)!!!%%!!!!L!
-!!!&!!!!!J!!!!3!!!!1!!!!(`!!!$q!!(rr`!"rrq!!Irr`!(rrq!"rrr`!Irrq
-!(rrr`"rrrq!Irrr`2rrrq(rrrrcrrrrqIrrrrcrrrriIrrrm(rrrq"rrrr!Irrr
-J(rrr`"rrri!Irrm!!$rq!!!Ir!!!$rJ!!!I`!!!$i!!!!F!!!!#!!*!%#P$J!"k
-%J!!(S5!!!!!(39"36!#3"Ka3HA3d!!!!!8C548B!N!@!5801)`#3"!%X!!!!3!%
-!!S"m3%)J94""#%%%a3*9!9%#334r#!33!L!"3!#!!3!$J(r!Iq"rm(riIrcrrRr
-rIrjrr(ri"r!$i!(!!)!!!!3!N"$r!*!Hr`$r!*!Fr`!!!2m!N"Vr!!$ep3$r!*!
-3rj!,pC!%!2m!N!rr!*!*rrreN!3!r`#3$[m!!2rr!!!!r`$rpIreN!3!r`#3$Im
-!r`!!r`!!r`$rN!6eN!3!r`#3$2m!r`!!r`!!r`#3"2rhpC!%!2m!N![r!2m!!2m
-!!2m!N!6rprIeN!3!r`#3#[m!!2rr!!!!r`#3"2rhpr@3"3$r!*!*r`#3$2rhpr@
-3"J$r!*!)r`#3$2rhpr@3"`$r!*!'rrm!N!crprIeN!Rr!*!%r`$r!*!*r`!!rrI
-hpC!+r`!!r`!!r`#3"2m!!2m!r`!!rrIhpC!+prm!!2rhr`#3"2m!!!#`!!!!rrI
-hpC!+prIr!!$rr`$r!*!&X,#`!!$rprIeN!Rhprm!N!6r!2m!X!!!!,!&X!!!rrI
-hpC!)prIr!*!&r`!!X,#`!,#3"3$rprIeN!Ihprm!N!Er!!#`"E!!N!IrprIeN!E
-hprm!N!Ir!,#3"3#3"[rhpr@3"IIhr`#3#2m!N!crprIeN!6hprm!N!Rr!*!-rrI
-hpIAeprIr!*!+rj!1prIepIIhr`#3%[rhN!MeprIr!*!8rrH3#Im!N"Erpr@3"2I
-hr`#3'2rhpIAhprm!N"VrprIhr`#3(2rhr`#3([m!N"%"!*!)r`#3$[rer`#3#2q
-3"IAepIm!N!Ir!*!%rrAepIm!N!Er!2m!rrArprAer`#3"Im!N!ArprAepIm!N!6
-r!*!&rrIeN!6r!!$rr`!!!,!!rrIeN!Ar!!$r!,!!X!$rpr@3"IIr!2m!X!!!!2r
-hpC!%prm!!2m!N!ArprAepIIr!!!!rj!(prAeprm!N!MrprIhpIIr!*!+rrAeprm
-!N!crprm!N!lr!*!+J!!!!!m!N!I`m!!!!!rrr`!2!!!!$`!!m!$`!!!2N!6!$`!
-!$`!!$m!!m!!2!!!2`!!2!2m!"3r!!!$`$`8&$m!!!-m2"3!2`!!-m!m!!!r!!-m
-!$rrrrm!-m!!!!!r-`-m!N!A`$2!!N!82c`#3"r!!N!8#!*!)$`#3$r$`!*!0$`!
-2!*!0m!!!m!#3"`rrN!8!!!m!N!F2!*!%$r!!!2!!N!B2!2m!$`m2!!!2!*!'$`m
-!m!m2rr!!!2!!N!82$`$`$`!!r!!!$`#3"3m2!2!2!!$m`!!!m!#3"!m!r`!2!!$
-m`!!!$`#3"!m!N!Em`!!!!2!!!!!2!*!'r-!!!!!2!!!!r`#3"[c!!*!%m!!2$`#
-3"!m!r-!!N!32!2!2!!$`$`m!r-!!N!3-m!r2!!$`!&!!r-!!N!3-c`$r$`!!"98
-!r-!!N!6-m!!2$`8!"48!r-!!!!!-c`!!$`"98&9982c!!!!!c2!!!!m!89!!!!$
-m`!!!$-m!!!!2"999!!!!r-!!!-c`!!!!$`#3"[c!!!c2!*!%$`#3"[c!!-c`!*!
-%$rq3"[c!$-m!N!Rmc-c-`-c`!*!*$mb3"-m!N![m!!$-m!#3#`r!$-m!N!hmc2!
-!N!d2c`#3$r!!N!S9!%!!'J%5!Ei!"3%!!3#3"3)!N!3"NJ!2!*!&Y`&D!-X"P!3
-$8R9Z!*!'Y`%8!-X"6J3'3f&ZBf9X!*!&(`#L!$%"N!!3!*!'13#L!%`"N!!3!*!
-'9J$e!'N"A!B,9A0P)'0[ER0[E'AA!*!&9J#J!'S!l!B*8f9XC@0d,LiZQ`#3"@m
-!pJ##!9d'#e9cC5"MEfjcEfaPe`#3"@i!S!##!1`'#90PE'9MG#iZ,YF!N!@(!+%
-!Q`$Y"!P6C@aPBh3Z,LiJ!*!&S3#K!,)"H!8D4'pZ*h3JBfa[Ff8JGfPZC'ph)'p
-Z)'9iDA3!N!8I!!S!-!#EL!G0Ef4eE'8ke`#3"6N!#J"-!*Z)#N&bCh9YC@jdFcS
-!N!9B!!S!D!#DL!CcG'4TEMS!N!9`!!S!J3#DL!GcG'4[GA3kC3#3"BN!#J#C!*Z
-)%RG[FQYTEQFJC'PbC@0dEh*j1J#3"3B!43!@!8b))e*eEL"K)("jG'K[EL"YEf4
-eE'8JBA-JE@&TEL"`FQpRFQ&Y!*!%!3!!!!%!!!!,a3!!#X8!!!%G!F(DE"2@!!!
-!(!%1!!Y#6N4-!!!!BNP$6L-!!!"Z8dPD43!!!(T'8N9'!!!!KQPMFb-!!!#5D@0
-X1!!!!*jTBh-i!!!!UQPMFc3!!!#fD@0X0!!!!-*%6%p(!!!!cN4*9%`!!!$D8(P
-d0!!!!1B!J2rr!!!"(3("leJ",2rr!*!%!F(Zc2q3"!!!!33!N!@!rrm!!!%5!F(
-[0!%Xrrm!!!%p!F([U!%Xrrm!!!'"!F(`B!%Xrrm!!!@&!F([X!%Xrrm!!!D*!F(
-Zr!%Xrrm!!!F0!F(ZH!)!rrm!!!N4!*!%!J$rr`!!#5S!N!S+`!("lL`16hGZCA)
-JFQ9cEh9bBf@NN`:
+`G#jbFh*M!J#3,kf-9RN!N!B-i[m4`+KT!4e!%Irc%h!!%#lrmlh5%@B386Dq9@X
+"!8*%[D'q9@X"!6"4-J&R(N39$!!!('85F!!3,N-9$!!!(f)'F!&J!!%"!LaD9#d
+Z4,d"!"Xm!@B`*e8q'NU!)&-#+!#r!#iL!1d*!J%!3)-Sfc36UGF[$%kk!3P+CfX
+"!+CA3cS!!!%!!!%!!!!#J!!!"%!!!!JJ!"rm%!!3"JJ!%a8%!"5AJJ!8N!#"!"5
+3!)#!%a#!3"!!J#!3!)!3-!#!#&!%J!53!*5!!P#)J!%d()!#&45!""1qJ!J5J)!
+3&m#!)"!!J%!3!)#!(rq"!!!J!J!!%!3!!!J)!!!%%!!!!L!!!!&!!!!!J!!!!3!
+!!!1!!!!(`!!!$q!!(rr`!"rrq!!Irr`!(rrq!"rrr`!Irrq!(rrr`"rrrq!Irrr
+`2rrrq(rrrrcrrrrqIrrrrcrrrriIrrrm(rrrq"rrrr!IrrrJ(rrr`"rrri!Irrm
+!!$rq!!!Ir!!!$rJ!!!I`!!!$i!!!!F!!!!#!!*!%#P$J!"k%J!!(S5!!!!!(39"
+36!#3"Ka3HA3d!!!!!8C548B!N!@!5801)`#3"!%X!!!!3!%!!S"m3%)J94""#%%
+%a3*9!9%#334r#!33!L!"3!#!!3!$J(r!Iq"rm(riIrcrrRrrIrjrr(ri"r!$i!(
+!!)!!!!3!N"$r!*!Hr`$r!*!Fr`!!!2m!N"Vr!!$ep3$r!*!3rj!,pC!%!2m!N!r
+r!*!*rrreN!3!r`#3$[m!!2rr!!!!r`$rpIreN!3!r`#3$Im!r`!!r`!!r`$rN!6
+eN!3!r`#3$2m!r`!!r`!!r`#3"2rhpC!%!2m!N![r!2m!!2m!!2m!N!6rprIeN!3
+!r`#3#[m!!2rr!!!!r`#3"2rhpr@3"3$r!*!*r`#3$2rhpr@3"J$r!*!)r`#3$2r
+hpr@3"`$r!*!'rrm!N!crprIeN!Rr!*!%r`$r!*!*r`!!rrIhpC!+r`!!r`!!r`#
+3"2m!!2m!r`!!rrIhpC!+prm!!2rhr`#3"2m!!!#`!!!!rrIhpC!+prIr!!$rr`$
+r!*!&X,#`!!$rprIeN!Rhprm!N!6r!2m!X!!!!,!&X!!!rrIhpC!)prIr!*!&r`!
+!X,#`!,#3"3$rprIeN!Ihprm!N!Er!!#`"E!!N!IrprIeN!Ehprm!N!Ir!,#3"3#
+3"[rhpr@3"IIhr`#3#2m!N!crprIeN!6hprm!N!Rr!*!-rrIhpIAeprIr!*!+rj!
+1prIepIIhr`#3%[rhN!MeprIr!*!8rrH3#Im!N"Erpr@3"2Ihr`#3'2rhpIAhprm
+!N"VrprIhr`#3(2rhr`#3([m!N"%"!*!)r`#3$[rer`#3#2q3"IAepIm!N!Ir!*!
+%rrAepIm!N!Er!2m!rrArprAer`#3"Im!N!ArprAepIm!N!6r!*!&rrIeN!6r!!$
+rr`!!!,!!rrIeN!Ar!!$r!,!!X!$rpr@3"IIr!2m!X!!!!2rhpC!%prm!!2m!N!A
+rprAepIIr!!!!rj!(prAeprm!N!MrprIhpIIr!*!+rrAeprm!N!crprm!N!lr!*!
++J!!!!!m!N!I`m!!!!!rrr`!2!!!!$`!!m!$`!!!2N!6!$`!!$`!!$m!!m!!2!!!
+2`!!2!2m!"3r!!!$`$`8&$m!!!-m2"3!2`!!-m!m!!!r!!-m!$rrrrm!-m!!!!!r
+-`-m!N!A`$2!!N!82c`#3"r!!N!8#!*!)$`#3$r$`!*!0$`!2!*!0m!!!m!#3"`r
+rN!8!!!m!N!F2!*!%$r!!!2!!N!B2!2m!$`m2!!!2!*!'$`m!m!m2rr!!!2!!N!8
+2$`$`$`!!r!!!$`#3"3m2!2!2!!$m`!!!m!#3"!m!r`!2!!$m`!!!$`#3"!m!N!E
+m`!!!!2!!!!!2!*!'r-!!!!!2!!!!r`#3"[c!!*!%m!!2$`#3"!m!r-!!N!32!2!
+2!!$`$`m!r-!!N!3-m!r2!!$`!&!!r-!!N!3-c`$r$`!!"98!r-!!N!6-m!!2$`8
+!"48!r-!!!!!-c`!!$`"98&9982c!!!!!c2!!!!m!89!!!!$m`!!!$-m!!!!2"99
+9!!!!r-!!!-c`!!!!$`#3"[c!!!c2!*!%$`#3"[c!!-c`!*!%$rq3"[c!$-m!N!R
+mc-c-`-c`!*!*$mb3"-m!N![m!!$-m!#3#`r!$-m!N!hmc2!!N!d2c`#3$r!!N!S
+9!%!!'J%5!Ei!"3%!!3#3"3)!N!3"NJ!2!*!&Y`&D!-X"P!3$8R9Z!*!'Y`%8!-X
+"6J3'3f&ZBf9X!*!&(`#L!$%"N!!3!*!'13#L!%`"N!!3!*!'9J$e!'N"A!B,9A0
+P)'0[ER0[E'AA!*!&9J#J!'S!l!B*8f9XC@0d,LiZQ`#3"@m!pJ##!9d'#e9cC5"
+MEfjcEfaPe`#3"@i!S!##!1`'#90PE'9MG#iZ,YF!N!@(!+%!Q`$Y"!P6C@aPBh3
+Z,LiJ!*!&S3#K!,)"H!8D4'pZ*h3JBfa[Ff8JGfPZC'ph)'pZ)'9iDA3!N!8I!!S
+!-!#EL!G0Ef4eE'8ke`#3"6N!#J"-!*Z)#N&bCh9YC@jdFcS!N!9B!!S!D!#DL!C
+cG'4TEMS!N!9`!!S!J3#DL!GcG'4[GA3kC3#3"BN!#J#C!*Z)%RG[FQYTEQFJC'P
+bC@0dEh*j1J#3"3B!43!@!8b))e*eEL"K)("jG'K[EL"YEf4eE'8JBA-JE@&TEL"
+`FQpRFQ&Y!*!%!3!!!!%!!!!,a3!!#X8!!!%G!F(DE"2@!!!!(!%1!!Y#6N4-!!!
+!BNP$6L-!!!"Z8dPD43!!!(T'8N9'!!!!KQPMFb-!!!#5D@0X1!!!!*jTBh-i!!!
+!UQPMFc3!!!#fD@0X0!!!!-*%6%p(!!!!cN4*9%`!!!$D8(Pd0!!!!1B!J2rr!!!
+"(3("leJ",2rr!*!%!F(Zc2q3"!!!!33!N!@!rrm!!!%5!F([0!%Xrrm!!!%p!F(
+[U!%Xrrm!!!'"!F(`B!%Xrrm!!!@&!F([X!%Xrrm!!!D*!F(Zr!%Xrrm!!!F0!F(
+ZH!)!rrm!!!N4!*!%!J$rr`!!#5S!N!S+`!("lL`16hGZCA)JFQ9cEh9bBf9$B3: