From e90133ebd0ef6f7692228a5b68dac188d5939f7d Mon Sep 17 00:00:00 2001
From: Antoine Mercadal <antoine.mercadal@inframonde.eu>
Date: Mon, 8 Nov 2010 16:46:51 +0100
Subject: [PATCH] uses the new CPPPopUpButton Aristo art

---
 .../Aristo/Resources/popup-bezel-center.png   | Bin 0 -> 1025 bytes
 .../Resources/popup-bezel-disabled-center.png | Bin 0 -> 1020 bytes
 .../Resources/popup-bezel-disabled-left.png   | Bin 0 -> 1103 bytes
 .../popup-bezel-disabled-right-pullsdown.png  | Bin 471 -> 1346 bytes
 .../Resources/popup-bezel-disabled-right.png  | Bin 614 -> 1406 bytes
 .../Aristo/Resources/popup-bezel-left.png     | Bin 0 -> 1107 bytes
 .../Resources/popup-bezel-right-pullsdown.png | Bin 464 -> 1399 bytes
 .../Aristo/Resources/popup-bezel-right.png    | Bin 590 -> 1493 bytes
 AppKit/Themes/Aristo/ThemeDescriptors.j       |  22 +++++++++---------
 9 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 AppKit/Themes/Aristo/Resources/popup-bezel-center.png
 create mode 100644 AppKit/Themes/Aristo/Resources/popup-bezel-disabled-center.png
 create mode 100644 AppKit/Themes/Aristo/Resources/popup-bezel-disabled-left.png
 create mode 100644 AppKit/Themes/Aristo/Resources/popup-bezel-left.png

diff --git a/AppKit/Themes/Aristo/Resources/popup-bezel-center.png b/AppKit/Themes/Aristo/Resources/popup-bezel-center.png
new file mode 100644
index 0000000000000000000000000000000000000000..a563df475a3d5c67c8dd27308cb878c1eb7db454
GIT binary patch
literal 1025
zcmbVL&ui0A9FI&?Cc}f5>BUEO@M4qqk|t^5;z*mu71uesg1y-^d0oSryqLV%ba?XS
zZ3jW{j}Y-7f}oxRMUT7e=3lU*LvZ-gHPgY^!9enU<oo%2zCWL>t=^rRy*|rv++1VX
zZn5<od*?4*VBg!{UhJ{u8m)KeI_cAqn_$lJNe_cY=x*Q^cKz|AFL;sTX8J+9Lp#kC
z!y}>K<~BkW#thAIi%VJTdYhPn9^MEdliz>;kq3cq@(+|IY{oS_2$r`KyuQ8K_O>@Y
z-RGC?fW^#U1R<s_$iiWi8kxyYcn!ACuSFhAOz5V`A34=&u7Mg!Fi-?o@}LTViUcH=
zHBGw(B#590B@sy_q#3egKnSJ}&(spXZ?tS@s>MzwKcF-=L~%442_sn`$%cq@UC%ir
zsl+Tw={TZpR*KSvg2BeAmjp2lNCa|5w@0?9$um!nLI~q#^O!hFr-@=I6Eim!kpRUo
z%;TC^r?iFtx^b#?+8)PPY~hq_B_69sf1v=g+?_3y8!~T<`$@ox;tp-%ZG||Z4cp||
zAHffN1ELB<NGn54f@%dJ9YNi;9o4ZcM^<gA;5ZFiwU8v2t#Vz~B!q0I0#&K1I+A78
zm3qCR71&0UQaAE&p&Kw=S+3X$Lh6}Vqn2QolB7+@u;_rb0ih%vkQmg~70`6OAj;2q
zd5)sBaS}YnzLSs;O!8|4r|3iFWZaglI2N*G9ieKu;y`|i_5UYlB6CK}o8zBmDXv%t
z=G)`eXNTkA!4aF7gpEcg`23QM6>8X4JKO7ZyWQ8`!IkqX4?jF{yT5+!-<Y|&a}ocz
nd3gBy-gD#K80=hr^L-wC;tqCe;n(5Y-Fzq;^;P>-wfpoB@JB$C

literal 0
HcmV?d00001

diff --git a/AppKit/Themes/Aristo/Resources/popup-bezel-disabled-center.png b/AppKit/Themes/Aristo/Resources/popup-bezel-disabled-center.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a36a79c93c4ceceda85afc107facc8cc62e969d
GIT binary patch
literal 1020
zcmbVLJ#W)M7&ZkVRH>pPh2`Wf42^wfCvoh?R8DNuNOh^wNMvA$V_y=hwa=Wd#O*?1
zV`V84|ACbOi83J}^%r#H53sVqIgJZQRR=8D_u=<>p7-<3&i3P_#runbAS`t@?Ji$$
z@b})G+x)wJc5=>_73TEWE*Y_@PqAQyWQaj0_Q$x3{qXSlH{2A2o1>`LXMJzW2uLjX
zg^iTQDMt%Jb0bgvU=K4e#N#M2#UGzeMG%Fi__XFhFKy#Vw0T7F?$LHHINA&JP~3O~
znz_LVV$6Jy$NNcU<fb^|HTb@`mPIf#VSA={;Z)z-0c}Dts7bIAz&ZqVBq6n`Y1$f4
zAc8VfWTaG(W~hn*A(%fRSEJ#`=-TdFi=Rw!!dPm^@^m_trm95fSVp?87aWRG;TDzb
zFkyaPNwU?F!NyrYqm)G?0R^K!BnQkCxu+K)#Hr_95+~U_Q9NaG?x!-6pd80VTr=y8
zb@3lJuC&g2hbfl3I3ou%;Pn`-mSCQ{>xBwK?v3$;M!YEgzD<II7$>Y_n<D=sg;8ig
z)PM+SRj4Vj-atr4P`7Qj?pl_s)@`NaxC+~{kfK(twxenaLblt0b){8z70YsJj?>Ue
zY$wT>p9HwnjkxX{+qxEOv?=x(p*=$O%MRF?5Js{INkMzJ20TBAlHy#H=OS7g)93{b
zT}omw%dZh#p$}{S#%-xJ*Fu)6Bh;!kTqw@5;s4}J=FZ4PbNtmT<rVM1Vtd*8{BSuu
zIN=jR`Di>lqc$I_wT^A|^7G+fFjyY{ynAcw^yRP7V1cf@J8nLF_0?J3e2b44mX=Q*
ZfG@(y=W6YH<>UKe9y`vq{h>8@{Tn-nIRgLy

literal 0
HcmV?d00001

diff --git a/AppKit/Themes/Aristo/Resources/popup-bezel-disabled-left.png b/AppKit/Themes/Aristo/Resources/popup-bezel-disabled-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..47a28bae821e870c2e33ecfe75c59a83becc1368
GIT binary patch
literal 1103
zcmbVLO=#0l9IraZ7!L6w&eJ1)A*{`NN!zqxab!!g71mkWq6H5&O<vcqB`+p#w%bK;
zCl4M(^djg@cA7^IR)!+tK=Gg_58`P%iHPC{^XsK+r^4`HAbB78|9-#!=cWAA_(1=`
z{zxP;ke$#9Y~97)1AV>hJCYt>XUibXlxdOFXv6SvM72m2gREmr;{rCU`E#pyn1O0`
zsZ7hcN!cV$%m{5_O~+&CNMv}V=^5q>rl5+aZCBym-CN;+Z7JO8L=NV>F<iGN7JOV>
zm@1hIGiKW2Moxg?rpyQ&ObyU<X5Bz;DqNdaX8Z7(=Rn(p&M4fbQ{`M9j1eD$L<~kv
zn1mpSVn~cjk~9Pah#(II9tlw-$)X@b2s#hP)O@QZ7c{-2#ZC%Wr__^qzR_sJ8e)w2
z(>zM2(;<f-M43f2n0KksjJm<0E`x>x)3-fp6BmSxMwQG_g=3y>hTwR)+!nDLbP~l<
z#y1U*M={7dP8e6)I-mvo+l_6lgVMZ*`2r5eoNuyv)DCsQEO-AF3JsYz@=4!jMKNYI
zV$M0(rCCkk*q@kXTQWo`h>#SAk^qw_gwhD6HBC?Is;Y}gP3UrLhaFXsAjZ{HMwA4E
zG(82A!e~+#R5g>xWKvQWn{@+fxF+uE+Dx~DmHvs9$9!y1;+F`S?RG%EPACcL!~<i+
z1jret?S|*DJe$#K*tgGPOZSNb+WD33ZS-N{@3>Vlp{qz0(+G{mQ##~2SnGds#xrO5
zusQx{mhKhnz;L_O`s}bZJlJIu<FnED@Sa>|V|5{`sio$ts#U2}da5p1>#6qMJa+Qt
z%WvN|J`XM~EiFB|b9UwRw;$g(Mkab6eck(T2q-^)F76)8rzZ0+-Uxfj*Y>SGfS0fA
zd2yic#^b}skFS1Qe}1b0cHDmYbaL&?UH4f}f6Mst>Fo_#EM8r1wOU6flqV4z?BCf3
YBS&7J64mSXAA}>G%}i;_qm_%l04LODG5`Po

literal 0
HcmV?d00001

diff --git a/AppKit/Themes/Aristo/Resources/popup-bezel-disabled-right-pullsdown.png b/AppKit/Themes/Aristo/Resources/popup-bezel-disabled-right-pullsdown.png
index 78249fb48f5868bd51163674e9f48e250ab98aca..38f4d61933f0ad521a2b954823bc8126106d0f8b 100644
GIT binary patch
literal 1346
zcmeAS@N?(olHy`uVBq!ia0vp^qChOc!3JV=Zu0<Ak|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+nA0*tB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%s|1+P|wiV
z#N6CmN5ROz&_Lh7NZ-&%*U;R`*vQJjKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8EkR}&8R-I5=oVMzl_XZ^<`pZ$OmImpPA<wUD9OyvQvjKmn3P{y
zVygsnDZ~r81-`y;gY$}^0R;>){ffi_eM3D1{oGuTzrd=COM+4n&cLd=IHa;5RX-@T
zIKQ+g85kdF$}r8qu)}W=NFmTQR{lkqz(`5Vami0E%}vcK@pQ3O0?O#6WTsdd7+M$@
z8k(CJm>U_GSr{5x8X8!-xVV|QIXb!-o4FXl%)qAC#l^_d+}y~-)!5v~(9p%r!obYP
z$;{2j(b3h^)z!irrq?sCxFj(zITdDaCeU7}USqs^t(=Qe6HD@oLh|!-U@0IVBfliS
zI3vG6!8zDe!8b8EGY`ZEMGwTcE~!PCWvMA{Mftf3;PAD|#A3gJDXPC6jZNJg4IPaw
z4Go=4EZhu~pn6lt2{V15WAs6Z11Yh<gn%g!#Dph(AP1g#QuBa0rU;ldcD~FMW?*0}
z@^o<wskpTz)YqFSP{h_)`Q?fk*Lqa7j1BWzR=BP%h+MtE^^5$W-0nKJEA|<JUy7Ti
zxw<KBo6#Dv<jnQi*Jn$%oRSQwiL>~yV|w+on0GV3v&@Nk+vLB4$C)j-qU!g8s?zLA
zH>Wet=T%<cwP&v<Yp4Hg9bYXjjn|@ImGqat51tal5@F`y68K9lI%vfd=I8GPl$Jg?
z=_Q%DVv4fnT#ctzcEMctyc}KgZud*p&$_ZHXHS`xLdvbflT;QaN}Nc!wDEEGWY@p$
zVSbA<Gd3p8YLmP6_?J>p*@wTGJLdJ9TC%U*^|w7>eQ1Q8G*IHkkEBJH7`Ax_goWg+
z5qEN08q%^#BhhZ9`lpvYuDvq+ZDH*<UMIV+PE4sTo>AZTwm(*$cW<Bm>A7!TCj9>V
zW6FkK1#fg-1<$(|e{}!;P0?M?YhMW(={!sA@T`j#>3hv97r%=?eQj;@fxzE0+E1Nz
v>YFF`&hq-(&*hD^Pa7T!+a|pD&tbr@!^%&(x#F)Cs8sWG^>bP0l+XkK<U-$d

delta 444
zcmV;t0Ym=63fBW6iBL{Q4GJ0x0000DNk~Le0000R0000O2nGNE01H5d`;j3he*t+(
zL_t(|+U%A=O9DX{hTmQHSYWK=LPV#6ilReAVzwBCSjP?>`bYhP{zV<Ee_+(1TiPK=
zgK|YPS<_tInQdlQ?dER9Y?nUxm^sZe?>Fx^Gt$Xf{uE-P$uiF}r%+09ytgTg)UkTe
zV(Df7{>hLP$8k`2wS>VGSwdXXe^4w}lCCmJ9bvE@Tf4_b#+e+zC`1QmxG)kXEJS4l
zgoFVjP&kONiRj>*KTs9|>`R$X85@lTE^`;4gkac_(qN1z5oEGisH*C#OeTbvaePjz
zQ#d-<9YG|?n{e=9CJim7BFH+j+h=5ab}SncF%3J3br0fr`t*%8MB_7Pe_MUuHC*ct
zsebX+CRkWngi))b@KD11+$@$?R#AKJ20XKo^@ACtYIdQglB|ppwzm>6%nz~FH(D0b
zdJ50Y4%?*jJ?ndSWALWt`+BUKKfA8HGYg~72>zd#-<8m|Iin@~TVVJ5s8=f-cIAF}
m?ryI|3ggzjVR`;3zyQND5_Oca92$oJ0000<MNUMnLSTX~u*Ww5

diff --git a/AppKit/Themes/Aristo/Resources/popup-bezel-disabled-right.png b/AppKit/Themes/Aristo/Resources/popup-bezel-disabled-right.png
index 49e583a190c9b6bcd97e843e407fcc8e4347ed0c..6b95b4b6c1640231383f3044dd91a8f6fd47f492 100644
GIT binary patch
literal 1406
zcmbVMeM}o=7(YkE!NM2`HG??0b+Rnk+WY7iy;8`v*MkyUurR>|6OQYZp5^Z9^;ipr
zDGZqiESVYV(1kFi83`i{CT1aiuqC>$3``ga7>#HQhRq3~N|=dw2NX3S`@>5v@AJI(
z{C>~(wUxLFQj#;10RTvG77`x$RLSq&or#LnHd-hj8Iq$yDiwTEm=YNP_X^bv=;Wvx
z#=}tF`d4o<xd4#hW6LU}3fJ=(EpS>&vC&4jpo|89-26z8q63TsRx>p$Z&m*`_JtZ`
zy;gO(!3Dd5cE-;ZHi%4VgS(7w2+(G)IzJE0jbJhX$4C?y;cEF17O|?=c`;d5t|2wJ
zZXyM&>W!c(TqU4g5E;;*g*7y6gh3;sMRa<T$#eunVFZR?6hcr9V#0JN2E*Xyqn5pi
zULWQm$W33eW>xzoDTqN(I2_i7by`8Jfe^FVtZ<;HMz+v|>UoKZX!y{9I0M0iXps#{
ztiXc`BULTbNmjKS=|&1%(B;}9=0lr>l1m0fs33%BVTj|Dyw<Hll85;xjBTw$W%WS@
z@-QKxPNe02_zuLua_t`PNHLV7!HPvzZVFXP2y`9C@RF0Ts^u?QFYCo%BnL(ilO8sq
zurUWg%m{2I2+~O6IH@xdXq;m^EJ2_s;=m0Koe4z{g3N)9sLe>CIPNew966>q*2#w?
zil>>lUsm?JiPb+Ai`hknk_53#5NhKSP~sOPA><c=puN-px+t3E6<ul1Mz#bavd0-O
zDGD68USEve#y@QMZ{E1hK;j6lGb4yipF_gxO|19-)C`h?ft2C+*RaH|<Ox*7t<jg2
zt>s~Od1FL*HFn%P)B^xd3_1zCEHXQA^qZm`c)E2Y>0nWIlsQ(LxIax5OV67wowUbN
z=K`sX<WyE{Pt1&$5WRh5cJhVi#w=qN_ej9=;@!-LZ!W{{S!yO8SVO0(RwAmuTCyk8
zFP^#ob@^b_N7i@;j;~c(Cia~_pZFosK77WhYHsQ7$Rcgy?ZEsqyUCR4zPCmV^qr#%
z3G*x9%YBQ!x`mzl?LqOv;zSDiezfg_Z!LRU=UzG-OY(%9nyLm)+UC;EdeYmAhq!~6
z!d=(wY=32I^!~$fsrO1{|BbHZ!*37#aOs$1WM<({`tIz_+oz#V&UP17J6vnG0#Bdh
zFE@22$1;B}_eX#I@%8bsBFnz4&Re~OUDFG7Q%{~CbDu4+RSgwqcY5Z1Y3=SmxO1o7
zSL>ZCKX<-Ty6fDkUi$70UrCGoryEB;UUX|_mOg8oHD(NFsCujR%=9^M|7(x*lVdLo
zTZ-|a%flV-@@>(E-APybK2L-TK5~sW_ITEo`g@kAd;?}x626qlT)%eZ!B_X}t787A
z?xfLW%ZZB}u9nsBr@QOl$v>2~)aA<R`K9&C+oym8AobBxyYlXk*Ofn_)8QrtZB@;G
E0|0mWh5!Hn

delta 588
zcmV-S0<-=83g!eMiBL{Q4GJ0x0000DNk~Le0000R0000O2nGNE01H5d`;j3he*y?e
zL_t(|+Ps#}N*hrW#=l8s;i4(Vi8auLNJ<t8U0A3}T4|~xw1VK)Cve#}=-M~vTd3GY
zz?!;9s;x*iZA8fEs2Ht|PHZ#DBy%U;JBj~5ymQ-551eF%%$;ApbH8(Dq}jRb2lyKX
z%`DB2vg0_I9vk$HWLmZM{LaCff6d*)fZS*_@I$wJgUJC2UC}7=S~1}&bDV~6uo}I0
zjeb*3s0DN2cQ8hPeGq}HS{4=-7Ev}$p>>QStSpsEp-|X{O>9g|yoDr5BFYE|aXjVf
z>Kasa8|?m?rXiEbdS1&ovU@@gc%iB)*1xScPg-Jfxg3;;f><oZUC%i3f2FefLf3Vq
zm(xwiP2<wzmCq{(g&smt6iyj0m2qHQ^xwaKH-o#jhqfv9OI295<53x>jAo5s>$v`x
z)_0Y$G7{hWj4@p6^UC<In%a{x!!VHkv;^C}eI47wU@(YRuSXCLhq=lEP3zyEok|!}
z<H;-6ODzzK$<bjvigfU&e+co|)a7a&ZS9>%4)kBsXuNp#6b~X%_jgZC-JFelgPfKt
z=!wU1c%oyopy5gPW5j#=aCBY~-7{|nDH<jcLj&$SObkB9{#jYvjUt2ipj5%j#1QsQ
ze+xYauckf`fUzPJewO~s`v2qMNo<=je);}dVAtz7IVv*P7x#tdBKyXgpTf>*ex*5o
aA;17>v?3gq58X%r0000<MNUMnLSTX_4i`KC

diff --git a/AppKit/Themes/Aristo/Resources/popup-bezel-left.png b/AppKit/Themes/Aristo/Resources/popup-bezel-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..8da12300f79ffbbf1e46bfa20ca72719f7e0d0f9
GIT binary patch
literal 1107
zcmbVLO-$2J9IuL?$cHDRgv6#CxUluTmVGr8EOdn-8)PhTo?O?yK{NVc`{o7*4-gYQ
zdNA=|f-&*nLA@@)=)q{hmBfR_3u@FG9!yYC@O5mc3E^Oq_I>pK`~Ci(H>Ogf?X6v{
z6h*Zs#^f|vkC6BDv1aleij96E%NZQc;%U2p%c_egNw@QePMGQpN+VUDzr2bD2&iCW
zvN)TZ5H#Bis=iIIVmbs(Q3FF2N7af5(|I&wSR%8r@{FMkU1TnVk|61fpjl&V!9~*x
zsf@Nz)M7d_G)NCr1VUgUtkM;8&hmtc$kccRviGl9hOU|5qR8wzl}%33Besj^P!I$(
z5C(J@1|i=ciA4Hn4nV*Hj)hzRMg*P{0HEs+L)2WoAf#obu0>8FGmEh!uxz<p4wm_#
z?ar_;7K`~D92X!K0dL;IY9(NKJq-pKd75iD*sv|yXH@fc35yKzbT<UkNhbG*Ew7#^
zk}|fUIxGwV)-?UNYStc3qd#u!Ywcy`9mJ-QXO~=!)T7YT0F&GuEaV#!Z-hzLAVpE<
zWLqnl$ifL(WXPYOZs-DlQ2=42A4E71jzSoNASTO7Sdk=!56fJGV?Qj<N97QNe4LMP
z5Xwpvgt_6c!bws*6pu$E4Q#^luxe?jp=%J`I+i;SD~z~E#kQNV?YTw=OwHQZ_GWE|
z9+?i&NmVl}|Lm7%H(D9F#ucP1u5Hq_{0hcC`XKag+!7yBBq;GQ2#5Ql3SjD3{eN=C
z5@%SyIsR&v#ue#6f4kTE<ghn9$RZQtlF?ZI9M6)mT1v=Lrt&7Q=W@BG{5*ZCCExsF
zsiiZuz5Q#e*xb?4vBF+@`lRLEPT$bgpSkZ_n~$ln<0nq?J3BkehhC~bHaE^b=q}vp
z&WPvECtf|DxaZxjR;$~G#cxMH^cH%1doSL-|8{L{jcc1+9=ug5mpebMudn8s#+Mey
eyRKiO4!2R&huJS*-@m@;k9i`Vk{=D{7Jmbcf@RVG

literal 0
HcmV?d00001

diff --git a/AppKit/Themes/Aristo/Resources/popup-bezel-right-pullsdown.png b/AppKit/Themes/Aristo/Resources/popup-bezel-right-pullsdown.png
index dde750ff5558e94133875116d062c16e77fc9e6a..63083a9790d5ddfdffa8f0077a213e8cc4b46378 100644
GIT binary patch
literal 1399
zcmbVMeM}o=7{7f42m!}}+sY#Db}Whs?R}Jf9TX_NR_a<-OEdb15stfq9?-jTcdUgh
z;6}oRGia76m_>m<n2FH|f2bRNbj!97{DMEGTU>+%qX`-nk%f<ToOeJ`6S6<N<nlhx
z`#!(l^YK2<+vBZ#HZ%QTIsgEft_s4ZtoxK-la``NJs(vlOOE6SNL75j6d?r$u+e-S
z1G++F1LI>zx~*k`DF%RD^{hW21w3w?;zK%8wb4aGVFe8U#ih|ONi{JNSjRN5oE7@x
zlNbcDv=yp0co0w6&IH+tc7dsCuk=&xO_YU(N=v}vD6SBM7>NX<p=M6RqgH607guC;
z8-~Dj6RF7xZ3GqYctJZaFrYz)Xeq>qfJRh@>I+RKQvrw}C;}rGjAB~UgzGUJLBP!q
zQoIRtJ?<l%o4ypy3I!!8jKgpw646EUI$mgiQH#Z*a$uNNvCxWboJ2;ooS2tnAQ+Jn
z*s#R%9H=sqb$qL2g_KA)QV4}To-JZd+$@w*GB`?xVN{2}p^%!_y0s|zn1909)>`zp
zg&Ek#h<vL+DfdyImjo-dd$c3fP>BXVCa}t-kj(^7wT2i@auHTYInmK9jU%WTK~Ym7
zV!{xk8AUB9Vj&2p(P^_e^+p0qa%_hs2n<6VHj6`V!cdfOnh_&bZggTco5SF6m`zEn
zixVZ1qnM;$R`I)uH9r!I+XaS{c)`!}&B+e%26>4WgM1jYR~bMLNwJ)&tJkxUEx`!v
z35IqGd<a~xFV1e`A2IwlZ=2rWw4pY=1x3pX%}xZ`#M1w#X0Q?rtTxBLnkBiVbf7A3
zwZ5Wk4G+U96C)_2v6o#s002AQaS=9u^!qwGjmxJ7A6wpev+vZhh8iEcA=}?7$T$5N
zpFCFd&9vEH!i(^ivMlFtG1)OXRN!`>+&|XX`=0xicwp^ee0+XS5E;IIXGYG5Y5K2p
z$}2Z+EgYirv#K%^^7!tSxthj<s{=hh!BbN)dCfO7+$sC+#XDszF<jrj79am==fdht
z?DpbX&1*+x(y;j3y^k}FzVQLQyz<x6-A@!171`aixoczuIo^kz%1G=g)a0J)Ig1=Q
zlUm#AZltpUPhKqX_G8ySeYH3CFmVfn4u5_B$L2G2gRzTwU4#8c)bqiitiJN|`=07p
zdXU<6^=eL6?^ycXvb<bRN_KX3_flEQ3+*pWkLO-O<`X|Obk75aQoeh?NOSsRvF7d1
z<3zq|?}7MaX$N&SZIQYn|6-jwy!(ru&d#B^3uUvZ6Ep3r-FI(JW=uSPTj#yDBhi=A
zHt?=vrnL5%2Lmrp%PYU$*>ht5&ja2*--`>fl2!c8bJdsU@?A9)J(5=QTxPW}GTQO&
w@$;XJj(u3G%^R83U-AXlQf4D%iO0cfz})Xu1q^cib@eH9IVy?E<+Z2(1`O;4r~m)}

delta 437
zcmV;m0ZRV&3eW=~iBL{Q4GJ0x0000DNk~Le0000R0000O2nGNE01H5d`;j3he*tny
zL_t(Y$L*F+O9DY0hF|y4sY9XZf<;9rq!b=Ph!U}c4jnplh|YbCx&)m%^bt($3-l?1
zE?%ObQx_|BwL;O{ad)Pf-6cBZSj={5;o&#Cu=DWl{Mpe?FRz$ls+<$fm_{kZ{$^Sk
zJL{=vd^&u{J;xej40kP48Py&Tf6;Yt&w-PSQl<=IQM?iGHl6Zh{@}=LANZ8{n9PQ4
zQ{@Pc=G+LOYV1Er<`ZtRAs9^q<x&a7LILL<MURVe2@Rt$v=1+t_>A8Z4o+fkI}dRM
z1Od0fc-h^`K@SBX(~rB(hQ#lg7REz5Hda?$31f~pn@(XO5=GY>NQ@bke@iBK?e-B*
zEF!Tm$9)0BW@nIGTE+{1F58DU_2sCy`^aY2kc`bEpUa@uewW`xelqoI9TT}M7j?+!
zQ{UYi<rgQhEIc&ZP95dFFJtD%I<xWri}@7;LPRyx9}7%^`qQJ36`cdmZRJ`S_cxVV
ftMPosJx3pISoHuvuDsm<3jhEBNkvXXu0mjfc|E`f

diff --git a/AppKit/Themes/Aristo/Resources/popup-bezel-right.png b/AppKit/Themes/Aristo/Resources/popup-bezel-right.png
index cd89b2fa206f3aa5e38ecb8354ec890114d81f1c..c55ae97571f44afd400a9df79f9d3b883505f5f0 100644
GIT binary patch
literal 1493
zcmbVMe@q*76z@a^Ls2&&n+oJSK!vUMtG^ElxpJ)(S0JTsILzj8J>V$qmFoco6=iO5
z7?XvKE&B<Z%*~BavrRVwBAJN_0TDKbjL1U7%w+s>P8kIpUV)+}WPf<c<@?^d_xZdZ
z-}kOMGyUbzkY__A5=p2rl{AZIxcF`eUhR{rFQ<yfGlD)_$l~&ZGKyy;gq6!>0HdAC
zXUq&`Eidk55+#y=Jl2veWSchQG-rn>pAY1=J4Lial9=pvQnZZ`fLtb@b!frK)^-qJ
zty*xa!i1QdDNF&ITER0}73mhb!bWSXU~&?W=*C3?J0nnl+g{{w;chLsz>ABr&kTdW
zf{S3&f{RIIn=*kEj%NS`gh**bi2zCzLS=H5O0@~V5EOwC3`Q|2s={R$jv&C&1B%gj
zYaVVU4NI{^O$!zXf)j_~va&L$Oa^g$K8$KK8XpISNktE-tK1<_ZmGi+?Pnkv7tOOy
zf#n>4kCDpdN(3z^X1Z8{-Dxr{6FXc>jS^c1yD2A(LI`ZP`|4Wob_r(YpEOqVc3H}u
z3~XjxTnSH$_mLOv2aCOXcp#snm<^u6v*M*tMI=X;*cpdlB(<RU1+ubM96{9ximK#@
z3PY4?6xE=Jh9nJ213?&MN)q#Ptb`>=3`6w<s+XxS6eSI6M2YE?28<x|3cX&f@?(t-
zmq0ma#vhjz<1S&5hhp&*o}mPew{TpMe*!WKIDvB&a84j4O97ZDnsxYe-}Nk3OENrL
z%2*9NX9pJgi?b`lM->09n~*6C1WL#>D5{gI4G6e|wf>);!D2G7Z#e!nEPj(Xfj)70
z^hITPc^HSdF}%1MEj9H663HWhMv}0&2hUqFQp1YF9^6(n=!u}fHK)3wbRAFB4Ay-h
ze<_9-(A_yS)Z)I@xc=%Zy|H_THp#<m2|`HP+PUjgT>lLy{2R~2n5VHdA>q<&WqYN}
zW^9(xV~Nucck8WtZTH*CL%@-S;1@#H?T9&epwp`_Zdd)JZlEUG=Z{Uxr@$G@)4JiD
zp29;GdhGS--@iU;+Uz}1+;cUyxPhv9H?Z`wxv8#imnnX2c5qK&T4#Ojo)hQptVs=|
zV~o}NU*x^o#5a?6f99F(A51&kRNE1Gnx$rLJbv+J#P*)<k1SZ?sO^;XovPN{2jAty
zWF@5Mx3ZCs^_A8Ac?~$Axp+1y34*BT3*PTL)*a1Bzcn5iyw4z-C%S`XJR^O><FxmW
zs#R^79<J7M?&hvn*Wb_b?t5>3``P62pyo4*kAJy1x3RG?J0~ak;N--_SD)8KU7312
zuVQrd`JY$i-i^NG5lYowt7rJ+4-J3WwR<~;5(a7-Yt!<3E58h_sj8f-E&p*?Xg(9w
z^~G^%?lkeJy-B*E(*0y|>AlLXPx1Mr@`$k6*G`|O#yaVuSlK7jhqt-vXIpm2gD*_R
z?b&~<qkU_9$MtUmT@!JEWZ||g-rCbg-cNh3eU7;<@27W+96veLyz{qS;i>oxl`0(G
u4aIEF_^>;UpWYg9Bu@`+ygPbD5+Hg0#_X1uUvEeFezZn?I_c59vGZ?GO)@tC

delta 564
zcmV-40?Yl?3(f=~iBL{Q4GJ0x0000DNk~Le0000R0000O2nGNE01H5d`;j3he*y4G
zL_t(YiM^K1D+FO2$G^J=IXHOPWsAI}%}YrXX%SJ5%FWq@a^S#)LhZ@H-{7=fa*$ls
z!OMY&v?a=}r7ae-J6>XE?W~#c%romPWuBq&)TiIf^XoU?`8D6?dB!@mw5^!T1;I^7
zv&yoJp7wgv=xVCTcNXN15}iq_f1)Tj<`brIApm&}2Z&BD?M#*x(-2=|+>0RBvOOjC
zKTt8r0MCg8mX}u$69hwb?_x&qdc8Oe21#6nBuPd)lSq-w#Lmtx&d$zZu>he^2wPj*
z%(beHmENd=Is{Gw*x%a+6ub|g&j)|N&s4AKFm=Xp5v;GR0~UN8M0j&!f0O3fJJTW0
zmV=3*ez=DR;2s&!V(NN)u#e_ho}+c9gCHj1k38ap`;I!V=JlSD>P*6ap{+AUNBsqA
zeU>-kc^-=k^O*B^zA!)Qq4Uvbl&v$(`afgO$wGH$8#SQijg&LHI$Drx%humTSgjv>
zP9i<ij<$x{4>dBH>Z*}pe{;}0ll8T|QQwibu{cVcPL!7x(e+hUm=9-V75Jw(Q~jrJ
z#`ck~?gh9S8&FYJjMios!gnzPCXtM9#NmfHnq7^!B+>LEMtqSF<Q`}={fPMuNl{c|
z#QfiagovB)r7AW<e|U}#c1`2t@Zg%~uBM63*ehuAz5u7Rgg*cP3IG5}MNUMnLSTZ%
CI1usx

diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j
index defde6714..f7556a5c7 100755
--- a/AppKit/Themes/Aristo/ThemeDescriptors.j
+++ b/AppKit/Themes/Aristo/ThemeDescriptors.j
@@ -517,17 +517,17 @@ var themedButtonValues = nil,
     var button = [[CPPopUpButton alloc] initWithFrame:CGRectMake(0.0, 0.0, 100.0, 24.0) pullsDown:NO],
         color = PatternColor(
             [
-                ["button-bezel-left.png", 4.0, 24.0],
-                ["button-bezel-center.png", 1.0, 24.0],
-                ["popup-bezel-right.png", 27.0, 24.0]
+                ["popup-bezel-left.png", 3.0, 24.0],
+                ["popup-bezel-center.png", 1.0, 24.0],
+                ["popup-bezel-right.png", 21.0, 24.0]
             ],
             PatternIsHorizontal),
 
         disabledColor = PatternColor(
             [
-                ["button-bezel-disabled-left.png", 4.0, 24.0],
-                ["button-bezel-disabled-center.png", 1.0, 24.0],
-                ["popup-bezel-disabled-right.png", 27.0, 24.0]
+                ["popup-bezel-disabled-left.png", 3.0, 24.0],
+                ["popup-bezel-disabled-center.png", 1.0, 24.0],
+                ["popup-bezel-disabled-right.png", 21.0, 24.0]
             ],
             PatternIsHorizontal),
 
@@ -536,7 +536,7 @@ var themedButtonValues = nil,
             [@"bezel-color",        color,          CPThemeStateBordered],
             [@"bezel-color",        disabledColor,  CPThemeStateBordered | CPThemeStateDisabled],
 
-            [@"content-inset",      CGInsetMake(0, 27.0 + 5.0, 0, 5.0), CPThemeStateBordered],
+            [@"content-inset",      CGInsetMake(0, 21.0 + 5.0, 0, 5.0), CPThemeStateBordered],
             [@"font",               [CPFont boldSystemFontOfSize:12.0]],
             [@"text-color",         [CPColor colorWithCalibratedWhite:79.0 / 255.0 alpha:1.0]],
             [@"text-shadow-color",  [CPColor colorWithCalibratedWhite:240.0 / 255.0 alpha:1.0]],
@@ -561,16 +561,16 @@ var themedButtonValues = nil,
     var button = [[CPPopUpButton alloc] initWithFrame:CGRectMake(0.0, 0.0, 100.0, 24.0) pullsDown:YES],
         color = PatternColor(
             [
-                ["button-bezel-left.png", 4.0, 24.0],
-                ["button-bezel-center.png", 1.0, 24.0],
+                ["popup-bezel-left.png", 4.0, 24.0],
+                ["popup-bezel-center.png", 1.0, 24.0],
                 ["popup-bezel-right-pullsdown.png", 27.0, 24.0]
             ],
             PatternIsHorizontal),
 
         disabledColor = PatternColor(
             [
-                ["button-bezel-disabled-left.png", 4.0, 24.0],
-                ["button-bezel-disabled-center.png", 1.0, 24.0],
+                ["popup-bezel-disabled-left.png", 4.0, 24.0],
+                ["popup-bezel-disabled-center.png", 1.0, 24.0],
                 ["popup-bezel-disabled-right-pullsdown.png", 27.0, 24.0]
             ],
             PatternIsHorizontal),