From 2a36488db7d09923a1c4dcc0f6d288e7e14faaf2 Mon Sep 17 00:00:00 2001
From: Thomas Ingham <tingham@Havok.local>
Date: Tue, 25 May 2010 23:29:43 -0400
Subject: [PATCH] Added new artwork and theme style for the button. Matching
 fonts to segctl.

---
 .../Resources/HUD/button-bezel-center.png     | Bin 141 -> 170 bytes
 .../HUD/button-bezel-disabled-center.png      | Bin 0 -> 170 bytes
 .../HUD/button-bezel-disabled-left.png        | Bin 0 -> 254 bytes
 .../HUD/button-bezel-disabled-right.png       | Bin 0 -> 257 bytes
 .../HUD/button-bezel-highlighted-center.png   | Bin 151 -> 173 bytes
 .../HUD/button-bezel-highlighted-left.png     | Bin 588 -> 256 bytes
 .../HUD/button-bezel-highlighted-right.png    | Bin 566 -> 261 bytes
 .../Resources/HUD/button-bezel-left.png       | Bin 600 -> 259 bytes
 .../Resources/HUD/button-bezel-right.png      | Bin 572 -> 260 bytes
 .../HUD/default-button-bezel-center.png       | Bin 0 -> 185 bytes
 .../default-button-bezel-disabled-center.png  | Bin 0 -> 182 bytes
 .../default-button-bezel-disabled-left.png    | Bin 0 -> 261 bytes
 .../default-button-bezel-disabled-right.png   | Bin 0 -> 271 bytes
 ...efault-button-bezel-highlighted-center.png | Bin 0 -> 157 bytes
 .../default-button-bezel-highlighted-left.png | Bin 0 -> 248 bytes
 ...default-button-bezel-highlighted-right.png | Bin 0 -> 242 bytes
 .../HUD/default-button-bezel-left.png         | Bin 0 -> 282 bytes
 .../HUD/default-button-bezel-right.png        | Bin 0 -> 278 bytes
 AppKit/Themes/Aristo/ThemeDescriptors.j       |  93 +++++++++++++++---
 19 files changed, 78 insertions(+), 15 deletions(-)
 create mode 100644 AppKit/Themes/Aristo/Resources/HUD/button-bezel-disabled-center.png
 create mode 100644 AppKit/Themes/Aristo/Resources/HUD/button-bezel-disabled-left.png
 create mode 100644 AppKit/Themes/Aristo/Resources/HUD/button-bezel-disabled-right.png
 create mode 100644 AppKit/Themes/Aristo/Resources/HUD/default-button-bezel-center.png
 create mode 100644 AppKit/Themes/Aristo/Resources/HUD/default-button-bezel-disabled-center.png
 create mode 100644 AppKit/Themes/Aristo/Resources/HUD/default-button-bezel-disabled-left.png
 create mode 100644 AppKit/Themes/Aristo/Resources/HUD/default-button-bezel-disabled-right.png
 create mode 100644 AppKit/Themes/Aristo/Resources/HUD/default-button-bezel-highlighted-center.png
 create mode 100644 AppKit/Themes/Aristo/Resources/HUD/default-button-bezel-highlighted-left.png
 create mode 100644 AppKit/Themes/Aristo/Resources/HUD/default-button-bezel-highlighted-right.png
 create mode 100644 AppKit/Themes/Aristo/Resources/HUD/default-button-bezel-left.png
 create mode 100644 AppKit/Themes/Aristo/Resources/HUD/default-button-bezel-right.png

diff --git a/AppKit/Themes/Aristo/Resources/HUD/button-bezel-center.png b/AppKit/Themes/Aristo/Resources/HUD/button-bezel-center.png
index 6b3e348c109e897f721c798056e62367d34dd77f..cc9401c7359a8308dbfa20cc26c5e9b397215ad2 100644
GIT binary patch
delta 155
zcmeBWT*Wv+yk3HXje&u|`pooOK#H@#BeIx*fm;}a85w5HkpK!RBzpw;GB9K(F));v
zF))02#lX;H4&-|?Fg#XeU@$adU=UvOO|DuWsMf&K#WAGfR+53S@$d6rUSHQ|Q)2^y
zW&i*GR~Ei;<b(FXY_8Ak{PGf#|Nj5iXO&<OIcjEJp}}dD0@Tdl>FVdQ&MBb@03&HF
AApigX

delta 125
zcmZ3**vmLUyiA0Hje&u|hcA2~kdiEMjVKAuPb(=;EJ|f?Ovz75Rq)JBOiv9;O-!jQ
zJeg_(RHX0e;uyjao&1BJg~vhQ#Fq5)a&>G9=leKM{N+{uw_wu-!FoZR35+}nVn+hf
b1UMOfI!dwseCF~UsFlIf)z4*}Q$iB}PGBfa

diff --git a/AppKit/Themes/Aristo/Resources/HUD/button-bezel-disabled-center.png b/AppKit/Themes/Aristo/Resources/HUD/button-bezel-disabled-center.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd4ce2152560ba6a15b8f899d68b5aa9efd824bb
GIT binary patch
literal 170
zcmeAS@N?(olHy`uVBq!ia0vp^j6f{G!3HF)&rH7sq&N#aB8wRqxP?KOkzv*x380`t
zvPY0F14DKa14D@!1H+eB3=B=?K)yEv!(&wj216qT2H`c|<f`?7Y7IPH978H@B^ekS
zXD9sn`dXY>m>CEz|NsAgB4<w0kEst#TYnyI=jY)8iaclKVd$Q2_S$#*jr~Bq44$rj
JF6*2UngECMFtY#v

literal 0
HcmV?d00001

diff --git a/AppKit/Themes/Aristo/Resources/HUD/button-bezel-disabled-left.png b/AppKit/Themes/Aristo/Resources/HUD/button-bezel-disabled-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..a615b9382c4fce5ec81cef55700e6fce2f31f103
GIT binary patch
literal 254
zcmeAS@N?(olHy`uVBq!ia0vp^EI=&5!3HGnK8=|Nq&N#aB8wRqxP?KOkzv*x380`t
zvPY0F14DKa14D@!1H+eB3=B=?K)yEv!(&wj216qT2H`c|<f`?7YFj*A978H@t?Ap%
z#bhYpdj5=`h<r<~u9#wqw7sMB|NUpyFEN?D@s=Bl<F_f#i*|-LOex;i|JY*Xt9v0|
zg_8H^ofeA9&UkOTqq?A+foH+@b6t#UUWPBM`LKIa>yPBJ?&Vo&XYa<ZmI(4X9`*X<
xnR7};0bZ78KGzs;X8#~kE}p>7;&6|d!LQtNljNb*bwKwpc)I$ztaD0e0svM|SiJxM

literal 0
HcmV?d00001

diff --git a/AppKit/Themes/Aristo/Resources/HUD/button-bezel-disabled-right.png b/AppKit/Themes/Aristo/Resources/HUD/button-bezel-disabled-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f14f35d8afb7ef9648ef4887b4e4dfc4c9f816e
GIT binary patch
literal 257
zcmeAS@N?(olHy`uVBq!ia0vp^EI=&5!3HGnK8=|Nq&N#aB8wRqxP?KOkzv*x380`t
zvPY0F14DKa14D@!1H+eB3=B=?K)yEv!(&wj216qT2H`c|<f`?7YTG?s978H@t?AR{
zJLDkJvOh1*S>Vdzu&V_PQatXDOJovCMI&6Us^z?t=2^?&=wy|*FQsnPy4UC4{gY^W
zc<uXN)hR(UmStWx@#Rr`!|NdA@b=x-y=QqM53JD__;KO=38@GDH%;g1$xd=JuAZfG
zXYZ3a>kW@tA2@lYFZZ@wkk@UmOMC(bOixW2v;`B49#}5<40IBMr>mdKI;Vst04Nw)
A;s5{u

literal 0
HcmV?d00001

diff --git a/AppKit/Themes/Aristo/Resources/HUD/button-bezel-highlighted-center.png b/AppKit/Themes/Aristo/Resources/HUD/button-bezel-highlighted-center.png
index 0f35e8c4b0a81e3e34eb23cd0f692519f9eca7c8..be25a32af4d65578f2c8f661829519652488ef79 100644
GIT binary patch
delta 158
zcmbQvxR!B(c)bJ%8v_G_^_l6nfD~teM`SSr1Gg{;GcwGYBLNgtNcITwWnjooVqhpS
zV_^95ih-fY9LV=(V0f&`z+h;^z#zQln_RU%P_412i(^Q|t)zh9;NR!J{QjQLrsn46
z#-_%`#-_pTxS%sJxGA1JrswC;Zt)(T|Ns9_7iZ#O(2U^fJ-SqHF;G8)r>mdKI;Vst
E0CmbOssI20

delta 136
zcmZ3>IGu5Vc)bV*8v_G_4`28~ASGGi8c`CQpH@<ySd_}(n3A8As^FQMn4TJxnwU~q
zcrw)nsL0aO#W92<I{61b3y*`qi7&6Nt`1NO47@nq$Kjp7z(-k^KMtvlJMTY8ihtO3
mFv(uR;aFpYfb&d86^71b68$b8CxdKa@O1TaS?83%*aQIm_b_t+

diff --git a/AppKit/Themes/Aristo/Resources/HUD/button-bezel-highlighted-left.png b/AppKit/Themes/Aristo/Resources/HUD/button-bezel-highlighted-left.png
index fe9f27411a8566b09e224c037445886c4d9e2c4b..a4b766ac2506b16912d8f23b824611debd0b683a 100644
GIT binary patch
literal 256
zcmeAS@N?(olHy`uVBq!ia0vp^EI=&5!3HGnK8=|Nq&N#aB8wRqxP?KOkzv*x380`t
zvPY0F14DKa14D@!1H+eB3=B=?K)yEv!(&wj216qT2H`c|<f`?7YTG<r978H@ZJA)m
zbtpi<<^Gy(PEJi0)`#Vd^^DO6Pf1sZ9K2=xOfP=+1m9#SZNb{7(rj&l1%8^bx3}3c
z&7FO7;kwtCE&6<25-yvVIxs76GIwx@)p**8ACs<M`Nyed^Od{v1wT$`Q3<QPpYN@?
yd)2CMldka`-f+?~{?1>vJEDS2yRKg}<7bF>ldGOSCvG9oMGT&<elF{r5}E*;{ZqdH

literal 588
zcmV-S0<-;zP)<h;3K|Lk000e1NJLTq000dD000yS1^@s6Rx-CQ0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz?ny*JR5(wClgmp2Q51(WR}w+HXi*qZ
z6G25$M625Mq8AidL2V+6sAyA&i(E}5VFMwB5Qw6SRxR=$2r<Y^l*|xR2tj<Hh;L2p
zccl>vYYu$Oo#A}kbI!d}Q&T<ofk0q79*?WD*{rQtEPjG={8o5&yS+P|PCrJY(MQC&
zOeWhE2n2ITB+P$P_V_NBYdn=oy{gsfeTHGSO(v7f?RH;dS6wBn!7~^P{SfRlO|Lr~
z4ki=|-JrayOeS+#C=?jfcEQ3*bx3&9Xf%6Hr;|=35*PV={tQW{)gThzY&I{2!{HaX
zT)q&C#ZDkdk$n6YM5^=oe79(tv0AMgxm-?+<fH!}QX_itN~O|8^s$TNJuZmUibiu3
zMGZjSg0RU2kvdRPLL?Fm;UHHatZ_l4b~OK?R4QjN-bn}xTo6f!L%p}zY_!+w9fUB&
zMQIRPt@a=ii99P5iZ%$NT$Dx*`XE`2M&nX4ne2fy{2!&m1<hiycoo9CUazOnTRWuQ
zzbIcLEV@)G)egC^9*<|tVzJaiY63z)RZ_mNSTulciA1uDX<D%BLogUT@caG4_+HB<
zLS~nxCn=MNU0_tF(;Z@(caYzZ_#=K;c;S5yriBa#jDQI+1K1ysJgWxTl}xn}2mu8;
aS-t?QUtABcWmY%<0000<MNUMnLSTZF((>g1

diff --git a/AppKit/Themes/Aristo/Resources/HUD/button-bezel-highlighted-right.png b/AppKit/Themes/Aristo/Resources/HUD/button-bezel-highlighted-right.png
index 809339ae4912c4d3751e73c64d43ce2db2ca7c64..cd709f3192791fd223ad6a42fa54f17d4c9f63b8 100644
GIT binary patch
literal 261
zcmeAS@N?(olHy`uVBq!ia0vp^EI=&5!3HGnK8=|Nq&N#aB8wRqxP?KOkzv*x380`t
zvPY0F14DKa14D@!1H+eB3=B=?K)yEv!(&wj216qT2H`c|<f`?7YP&sM978H@ZRs=Q
zI^-bWdY>m)hfzOa^OBp)6%6N}vD$d8OIX^zVS~?p0paczNom%NLKm<9J^ug0(kVg*
z4Ei3geE)mzxzA@d>8ze|DJ;}nOUWkV&fbgZT^tN=mVR6qaPP<IC*qH0FIQ^n5D=U^
z^DfVUyX&`JOFs8g=fJr$%eLj}$6l9JQM%T^ENpOxok819zb4M`-dmuv7(8A5T-G@y
GGywpe*<TL;

literal 566
zcmV-60?GY}P)<h;3K|Lk000e1NJLTq000dD000yS1^@s6Rx-CQ0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz*hxe|R5;6plf6qqQ5eRrHAdhT4TS}1
zgc*g4Q*IS~KwwA|wM5iV;ZlZ!Em=u$6^C+YQE+H#$bTTz3n7M?l7qO2_<;(3Yid2$
zymFQ79{6!D=e*B3&-<SD5Z_&+TCKk4^La}mkys@NqMzt7)>*9S_4*@<qHeR<ELAR-
zDZk%8jd@;&0z2B+gu~%`x7)2Z8jXh*i{%8uk5DMI*l{Wxkqq^E-2i(g*t<)mQV)SZ
zz@XFVc1xv_-{Ek~wNFIw^<Q9vn?j*L27^JJ)oMM)|0}`=7?HLY5MJbRxhs++73p-^
z1KY}`O)Q@MN3B*n_j<j1E|<#?jYc1vr(xlk3*>jC)oM48TLhvZTC~pvf)9j3p|sIx
zd_goui*~p`Zrft9cm`iuB&0<OE|AxX$z)nY1*42;nTuE~CiVGzm$>9-#-5xDv)MeJ
z$z<F%n@z<OLiQiUVo~CBI+eI5F9fqp$!B^|sZ=KHcDo3<e5%#zEeJ-K%N2DY0K*=S
zXAsT1fO3D(ZG_+{b{n<9=!?hWvSc!;f~^;{(3?i1*~GjA@YxO9F<>PSiA0`|^eL9*
ztrPg&53=JCf+aBDN_w<qiP!ydCs~Mqpjp=6;6I=H4*`;4l^zxnMF0Q*07*qoM6N<$
Ef?TQp3IG5A

diff --git a/AppKit/Themes/Aristo/Resources/HUD/button-bezel-left.png b/AppKit/Themes/Aristo/Resources/HUD/button-bezel-left.png
index 6c10bf51e87bb4c6b9699b1031f2d9f059121317..674aacd374ca3cdb09667795e2b7e98e51464631 100644
GIT binary patch
literal 259
zcmeAS@N?(olHy`uVBq!ia0vp^EI=&5!3HGnK8=|Nq&N#aB8wRqxP?KOkzv*x380`t
zvPY0F14DKa14D@!1H+eB3=B=?K)yEv!(&wj216qT2H`c|<f`?7YCAn$978H@t?4u5
zVlotQiQgyReLzo8WQ}tXWAwpO(iI{HZyCP}WxAE~X}gzllfv&)<~+uHJC;p(r`WQ&
zgGWngd7+H{)-e0?#+RZ#r#(B%!@!!c_F`beygJcC?EAH|JM7c0S7@#JWwtq7e73~n
zeN&18t}ZUlJ8j~-d(LOyQ27IwXU=41JHWh&hhd_!w^y5o$0?wr7(8A5T-G@yGywnt
C>Q#*Z

literal 600
zcmV-e0;m0nP)<h;3K|Lk000e1NJLTq000dD000yS1^@s6Rx-CQ0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz`bk7VR5*=eV89NTU%h(e`{m1*MZbRi
zy7d45|3Ckc0J>tvt5>h;{`m3Z_{WbQj~_dBtf#ZHGnb2tD*z}5!hukXF#Yb`yB^=a
zf4{P5(V~1WFE9W0_V$P+OP0j!*|R5c@7}!$Fbuch=+UD_Kn+(@Qc{9u&YT%}<j9e*
zn>TOzynXxD<>$|z4nSAg!7xk{H_-j37B60$H-G+ozuUKOy8@kP4OC!>4TGI^=FFM!
zckkYv^Y-?(yK&=&!|&g}O@WdoxG>n3=g*(70(yGFlqpjzflf36N*Lh7AWh;xg-`11
z>qCJWK_+Pv!XQnGfB*jdt*)+a^5n@AU7(;kAq>)_2K2+%h=>Stpubdrg35$2NR#U4
z&z~OwgV`UL3S@zT@`Nx*lL9bOw_Lh(scqlBed0htX+jtr5KEUXE&TA|!<oRqKnb9r
zI3WxUav(MY`sX4rRfGd=6#`0#;KSg^1!CEXii+s3U%%d1zI?gT`}gm8fsz8aFgzIn
zvDU(c3$sB9_Wu3*?vo}>VgoAR0Ag++=0(Qv1PjC<6LhPpsv?1*dH&nCZ--vLeq9I*
zQBYcA0%ao@M#&mbjaoqLux#0~GGJtH0BXMW9}Qq+La0;aK!F3q_CV|j#C}K_Fc4i6
mvaKM^px{*iVo=i2fMEdm898>)oF9Jx0000<MNUMnLSTYP*&GxA

diff --git a/AppKit/Themes/Aristo/Resources/HUD/button-bezel-right.png b/AppKit/Themes/Aristo/Resources/HUD/button-bezel-right.png
index 91439ae90b0fdb08cfaa11c120060d533d8fa06f..88a8540cc69e573668e8160da3485234dc5635df 100644
GIT binary patch
literal 260
zcmeAS@N?(olHy`uVBq!ia0vp^EI=&5!3HGnK8=|Nq&N#aB8wRqxP?KOkzv*x380`t
zvPY0F14DKa14D@!1H+eB3=B=?K)yEv!(&wj216qT2H`c|<f`?7YP&pL978H@t?9Gn
zVlotIQGXc9{fxoPdtJiBOPebh`zL8fyi{zdXg_dDn5lAe@9tKyrZ**@5B}LPMd)nK
zs;&3DG}G@#Ilr$Jce1E@&(Fl5!kA#N+3{XlW5mHl`VT%XygyO*fc)lYn^<d)RULa;
zRL;Cvx$1hM%zM5Ao-QWGew?t3mpN(6z`THAStY|qr6d={qlb0_UB%$(>gTe~DWM4f
D!f08(

literal 572
zcmV-C0>k}@P)<h;3K|Lk000e1NJLTq000dD000yS1^@s6Rx-CQ0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz-bqA3R5;6H_>TsD{``6A%a<>UUcY|r
z%fP_E%zy&~B4NL-uCCnU$B*}X{P^+s_wV12U%Pfq7bwn%qGQjVJqdgF?ge8YJ8{X9
zB{A*o?GfJI-u{agEz1A#<Hwb|ckg<j*a~!!9Sj2%IJ|rJ&gJIKn?6U69u1p0b7o{p
zN=neTZ{My0`9^RXfr>4$VW0ulckbMAoj-rR-{QrK^ML+51ys%r(`14R|Ni~k^u~=F
z4qjefc0d=LJ9FktIM|s$NdtTs7#K!VrcAK}2F`?M&z`LU+Xj@-CWL_+Od1**LV*T6
z0csKlX;LSIA3uJqtFEqY^6%fj-#|@@AWh1IFfb5QbaZs||Ni|8(xe8`Bu@wfBU*OS
zq)8sYpnnF_BuxnK+qX~r^5x5|z)0Q#bDlUM91;>D{{H>@Gs~7OD})7v2tEunT?m*O
z!h!L05vais7UTlBFwk_~<;#~Vef|3NMrCDXG*E*qEOL3#FgFl$OrAWM?f(7y?!dUY
z0!l_e#ai%Wga(*izI<s3%u9v9kUI4F^XKzbRaKEdaXlawKu)kI0O*u!PoF;B0Q7Vj
zP}%`%g8+JlM9G9e><Ps7P*2N2oy3UlBn>324#W!JV1+2gn%x1jHZUVs;vZB10000<
KMNUMnLSTYjX#|D<

diff --git a/AppKit/Themes/Aristo/Resources/HUD/default-button-bezel-center.png b/AppKit/Themes/Aristo/Resources/HUD/default-button-bezel-center.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc5b3a93be301301e607f293a680e875df0f5df8
GIT binary patch
literal 185
zcmeAS@N?(olHy`uVBq!ia0vp^j6f{G!3HF)&rH7sq&N#aB8wRqxP?KOkzv*x380`t
zvPY0F14DKa14D@!1H+eB3=B=?K)yEv!(&wj216qT2H`c|<f`?7YVAE;978H@rF0+U
zY;X`b(x&-ki|Fkgb$)9y<%R9JxxRC@2=qTb5~|9c;-Hr4tK|G7g<pPKbG<`W?YmOR
b8SfdAja@xHc73`AG>XB~)z4*}Q$iB}Bq}rU

literal 0
HcmV?d00001

diff --git a/AppKit/Themes/Aristo/Resources/HUD/default-button-bezel-disabled-center.png b/AppKit/Themes/Aristo/Resources/HUD/default-button-bezel-disabled-center.png
new file mode 100644
index 0000000000000000000000000000000000000000..8289aed507394b9b1e004d760f64ad9efffcc098
GIT binary patch
literal 182
zcmeAS@N?(olHy`uVBq!ia0vp^j6f{G!3HF)&rH7sq&N#aB8wRqxP?KOkzv*x380`t
zvPY0F14DKa14D@!1H+eB3=B=?K)yEv!(&wj216qT2H`c|<f`?7YHd7S978H@rF3uP
zY;a&Wa_H;3Cn~Qr?7xePbF;SQGby$_-sARc&JwSXq~BT5i&WoA+3B?ZSFqvQusH8K
ZgYav|MJ~IwrvS}i@O1TaS?83{1OWT)G>!lO

literal 0
HcmV?d00001

diff --git a/AppKit/Themes/Aristo/Resources/HUD/default-button-bezel-disabled-left.png b/AppKit/Themes/Aristo/Resources/HUD/default-button-bezel-disabled-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0e2c0ac5361485f53c9b1cdbf1c4f8fe810cb15
GIT binary patch
literal 261
zcmeAS@N?(olHy`uVBq!ia0vp^EI=&5!3HGnK8=|Nq&N#aB8wRqxP?KOkzv*x380`t
zvPY0F14DKa14D@!1H+eB3=B=?K)yEv!(&wj216qT2H`c|<f`?7YP&sM978H@E$Q>-
zYjO}^UEMDCv7Avk!H843f5D83|ElE^S&i=I^>D{Xl>XFOc}iHJ^zPFTb6?qH9n+Q#
zx5KY8c09INlqM$Fd6S2Mb;I)t#`(;}^Bc{NKJWT@|Kj-v%a{LiHCge><Y`U$fkvgJ
zTjbhqFVmSGEvWh8ciq)(Zv#Wm9|*k@+rTQoSjoe{SK{xazx{Fy&{+(gu6{1-oD!M<
DKE+uB

literal 0
HcmV?d00001

diff --git a/AppKit/Themes/Aristo/Resources/HUD/default-button-bezel-disabled-right.png b/AppKit/Themes/Aristo/Resources/HUD/default-button-bezel-disabled-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..25dac55c3eccb48e7fbf5c95ca0b44105374e67d
GIT binary patch
literal 271
zcmeAS@N?(olHy`uVBq!ia0vp^EI=&5!3HGnK8=|Nq&N#aB8wRqxP?KOkzv*x380`t
zvPY0F14DKa14D@!1H+eB3=B=?K)yEv!(&wj216qT2H`c|<f`?7YNvX-IEGZ*n$u^<
zcgR4*dF}`8BMmRQR)|c~dCMult<KnYNV2%)OzX;EuYHmMswbLOh<i_)|Mck3qP<&V
z%U76xwL4~UV~P-iPPy;nHCv+tg%lEdR)%a9n#9m>vUSyuE7Cu?PO(KQMJX7&)w6G&
z_v!vc&J&jXN}ohRUC&wCzN;-c_m!bQXyW4U`*;=C@SHSdV3J^5a-BgwIN9p&3(Xlo
P2QqlN`njxgN@xNAn#Wwi

literal 0
HcmV?d00001

diff --git a/AppKit/Themes/Aristo/Resources/HUD/default-button-bezel-highlighted-center.png b/AppKit/Themes/Aristo/Resources/HUD/default-button-bezel-highlighted-center.png
new file mode 100644
index 0000000000000000000000000000000000000000..79e37a1a4e450f5f70aa36fe64791e4407800f32
GIT binary patch
literal 157
zcmeAS@N?(olHy`uVBq!ia0vp^j6f{G!3HF)&rH7sq$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~-c71?{bIEGZ*O6fVs$)Lc)Jh|tg&Z5<p6$`g%L>TlJJXCm*
zyz2~4mjlb9N#|7bHD7iHxvG2=f8P3&S7%4{Z6+QD7k!R1?muLo1C3(vboFyt=akR{
E0L^<dbpQYW

literal 0
HcmV?d00001

diff --git a/AppKit/Themes/Aristo/Resources/HUD/default-button-bezel-highlighted-left.png b/AppKit/Themes/Aristo/Resources/HUD/default-button-bezel-highlighted-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..19b884419bf390dec6245b68a37f404cbc945f7d
GIT binary patch
literal 248
zcmeAS@N?(olHy`uVBq!ia0vp^EI=&5!3HGnK8=|Nq$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~-c70vQ=aSW-rwPeCxE+<1Cx5-;9M6~Y2u|9Wll#OLozkk48
za8B(pyB@y3yF2wRIqFMzENItfmttx7T(*7xu0k83iC1m-nv0iTn|0E%dEHj2wl+ou
zrHl!a*!R3<oxt%xIDkLpdv(*VBl$0R44iMNf6&*=Tswd1l=eRnQI+q*HJ5(9bgMTg
wi_!3yVoSlpC%xwHP8=6q{M2mG3>FCnacxDLb1JNMKvyz&y85}Sb4q9e0J+CqP5=M^

literal 0
HcmV?d00001

diff --git a/AppKit/Themes/Aristo/Resources/HUD/default-button-bezel-highlighted-right.png b/AppKit/Themes/Aristo/Resources/HUD/default-button-bezel-highlighted-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..da0cb9a8ad2295c8793c217f654f79d97b3ddae8
GIT binary patch
literal 242
zcmeAS@N?(olHy`uVBq!ia0vp^EI=&5!3HGnK8=|Nq$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~-c6;1JUaSW-rm9%B!=KufS-`{`!{k?s*RgZsdjaz14|Igsh
z|NryD13XUjb#|WYVD&I)U{F?877tJr=T>GG`SYKDS%kzwtptX3ta=Pryd7ADcX1tR
z6H;_&S@=RrLepI2S#&}`U2<aLPrhrPo_~L@?=NR>rKGQ4FRXHtVTxvOXejT#l9!Vd
plnst7ZD{)6@IzXlo{htR;ii*8UcfQd2SE2Rc)I$ztaD0e0sx{1S{eWV

literal 0
HcmV?d00001

diff --git a/AppKit/Themes/Aristo/Resources/HUD/default-button-bezel-left.png b/AppKit/Themes/Aristo/Resources/HUD/default-button-bezel-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd02f1725b7e861675d7a7d1b16703075d61755d
GIT binary patch
literal 282
zcmeAS@N?(olHy`uVBq!ia0vp^EI=&5!3HGnK8=|Nq&N#aB8wRqxP?KOkzv*x380`t
zvPY0F14DKa14D@!1H+eB3=B=?K)yEv!(&wj216qT2H`c|<f`?7Y8QCAIEGZ*TGD68
zb;v=4RsH7tw2N+UdlbbzlC!sbVzcb}eu`D6rD1N8wq;XPgl5axc<GHDtt*~N&v?kW
z;mqfsS(8*YYjph*YI|5BbDaBtnQ!xoRjM30tGOB&UKH<Xc+d28AM-tt`=M9<%l_r5
zt9rG+v+Km&t#8jtBr~e`UVi+vW)<7vz`UN9o{`f+14W8%yf-^%sU0~j_Vunf=4gc)
a9)^9|5o@!r*B=AAmBG{1&t;ucLK6TXt!EGb

literal 0
HcmV?d00001

diff --git a/AppKit/Themes/Aristo/Resources/HUD/default-button-bezel-right.png b/AppKit/Themes/Aristo/Resources/HUD/default-button-bezel-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..e32647f97513ae8807aacf99e586fef24905891c
GIT binary patch
literal 278
zcmeAS@N?(olHy`uVBq!ia0vp^EI=&5!3HGnK8=|Nq&N#aB8wRqxP?KOkzv*x380`t
zvPY0F14DKa14D@!1H+eB3=B=?K)yEv!(&wj216qT2H`c|<f`?7YUg;mIEGZ*n$u^<
zb;v=)CH;Cl>yax`9GSk)8H+@|^2HtCek;0WPfP3BvZjrJVH|(##e^=HBrTJac*biS
znZGUO+E=~#PknnnKH9yGx#8s^4XO8ky?R(YES?(~pKeiMSWv!D((bF<zNW-x86`6Z
zx1N7|ZnjVNFScE<%F|_DQd+>(<7@ZIo!(?)$xtom85%m*nS<TEi0=S{3d8s73~x54
VevADtHw)-a22WQ%mvv4FO#rrHUmXAd

literal 0
HcmV?d00001

diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j
index 96c2aada0..d1d77ee49 100755
--- a/AppKit/Themes/Aristo/ThemeDescriptors.j
+++ b/AppKit/Themes/Aristo/ThemeDescriptors.j
@@ -873,38 +873,101 @@
 
     return segmentedControl;
 }
-+ (CPButton)themedButton
+
++ (CPButton)button
 {
-    var button = [[CPButton alloc] initWithFrame:CGRectMake(0.0, 0.0, 60.0, 20.0)],
+    var button = [[CPButton alloc] initWithFrame:CGRectMake(0.0, 0.0, 60.0, 24.0)],
 
         bezelColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
             [
-                [_CPCibCustomResource imageResourceWithName:"HUD/button-bezel-left.png" size:CGSizeMake(13.0, 20.0)],
-                [_CPCibCustomResource imageResourceWithName:"HUD/button-bezel-center.png" size:CGSizeMake(1.0, 20.0)],
-                [_CPCibCustomResource imageResourceWithName:"HUD/button-bezel-right.png" size:CGSizeMake(13.0, 20.0)]
+                [_CPCibCustomResource imageResourceWithName:"HUD/button-bezel-left.png" size:CGSizeMake(4.0, 24.0)],
+                [_CPCibCustomResource imageResourceWithName:"HUD/button-bezel-center.png" size:CGSizeMake(1.0, 24.0)],
+                [_CPCibCustomResource imageResourceWithName:"HUD/button-bezel-right.png" size:CGSizeMake(4.0, 24.0)]
             ]
         isVertical:NO]],
 
         highlightedBezelColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
             [
-                [_CPCibCustomResource imageResourceWithName:"HUD/button-bezel-highlighted-left.png" size:CGSizeMake(13.0, 20.0)],
-                [_CPCibCustomResource imageResourceWithName:"HUD/button-bezel-highlighted-center.png" size:CGSizeMake(1.0, 20.0)],
-                [_CPCibCustomResource imageResourceWithName:"HUD/button-bezel-highlighted-right.png" size:CGSizeMake(13.0, 20.0)]
+                [_CPCibCustomResource imageResourceWithName:"HUD/button-bezel-highlighted-left.png" size:CGSizeMake(4.0, 24.0)],
+                [_CPCibCustomResource imageResourceWithName:"HUD/button-bezel-highlighted-center.png" size:CGSizeMake(1.0, 24.0)],
+                [_CPCibCustomResource imageResourceWithName:"HUD/button-bezel-highlighted-right.png" size:CGSizeMake(4.0, 24.0)]
+            ]
+        isVertical:NO]],
+
+        defaultBezelColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
+            [
+                [_CPCibCustomResource imageResourceWithName:"HUD/default-button-bezel-left.png" size:CGSizeMake(4.0, 24.0)],
+                [_CPCibCustomResource imageResourceWithName:"HUD/default-button-bezel-center.png" size:CGSizeMake(1.0, 24.0)],
+                [_CPCibCustomResource imageResourceWithName:"HUD/default-button-bezel-right.png" size:CGSizeMake(4.0, 24.0)]
+            ]
+        isVertical:NO]],
+
+        defaultHighlightedBezelColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
+            [
+                [_CPCibCustomResource imageResourceWithName:"HUD/default-button-bezel-highlighted-left.png" size:CGSizeMake(4.0, 24.0)],
+                [_CPCibCustomResource imageResourceWithName:"HUD/default-button-bezel-highlighted-center.png" size:CGSizeMake(1.0, 24.0)],
+                [_CPCibCustomResource imageResourceWithName:"HUD/default-button-bezel-highlighted-right.png" size:CGSizeMake(4.0, 24.0)]
+            ]
+        isVertical:NO]],
+
+        defaultDisabledBezelColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
+            [
+                [_CPCibCustomResource imageResourceWithName:"HUD/default-button-bezel-disabled-left.png" size:CGSizeMake(4.0, 24.0)],
+                [_CPCibCustomResource imageResourceWithName:"HUD/default-button-bezel-disabled-center.png" size:CGSizeMake(1.0, 24.0)],
+                [_CPCibCustomResource imageResourceWithName:"HUD/default-button-bezel-disabled-right.png" size:CGSizeMake(4.0, 24.0)]
+            ]
+        isVertical:NO]],
+        
+        disabledBezelColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
+            [
+                [_CPCibCustomResource imageResourceWithName:"HUD/button-bezel-disabled-left.png" size:CGSizeMake(4.0, 24.0)],
+                [_CPCibCustomResource imageResourceWithName:"HUD/button-bezel-disabled-center.png" size:CGSizeMake(1.0, 24.0)],
+                [_CPCibCustomResource imageResourceWithName:"HUD/button-bezel-disabled-right.png" size:CGSizeMake(4.0, 24.0)]
             ]
         isVertical:NO]];
 
-    [button setTitle:@"Cancel"];
+    [button setValue:[CPFont boldSystemFontOfSize:12.0] forThemeAttribute:@"font" inState:CPThemeStateBordered];
 
-    [button setValue:[CPFont systemFontOfSize:11.0] forThemeAttribute:@"font" inState:CPThemeStateBordered];
-    [button setValue:[CPColor whiteColor] forThemeAttribute:@"text-color"];
+    [button setValue:[CPColor colorWithCalibratedWhite:255.0 / 255.0 alpha:1.0] forThemeAttribute:@"text-color"];
+    [button setValue:[CPColor colorWithCalibratedWhite:0.0 / 255.0 alpha:1.0] forThemeAttribute:@"text-shadow-color" inState:CPThemeStateBordered];
+    [button setValue:[CPColor colorWithCalibratedWhite:0.0 / 255.0 alpha:0.6] forThemeAttribute:@"text-shadow-color" inState:CPThemeStateBordered|CPThemeStateDisabled];
+    [button setValue:CGSizeMake(-1.0,-1.0) forThemeAttribute:@"text-shadow-offset" inState:CPThemeStateBordered];
     [button setValue:CPLineBreakByTruncatingTail forThemeAttribute:@"line-break-mode"];
-
+    
     [button setValue:bezelColor forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered];
     [button setValue:highlightedBezelColor forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered|CPThemeStateHighlighted];
-    [button setValue:CGInsetMake(2.0, 5.0, 4.0, 5.0) forThemeAttribute:@"content-inset" inState:CPThemeStateBordered];
+    [button setValue:CGInsetMake(0.0, 5.0, 0.0, 5.0) forThemeAttribute:@"content-inset" inState:CPThemeStateBordered];
 
-    [button setValue:CGSizeMake(0.0, 20.0) forThemeAttribute:@"min-size"];
-    [button setValue:CGSizeMake(-1.0, 20.0) forThemeAttribute:@"max-size"];
+    [button setValue:[CPColor colorWithCalibratedWhite:0.97 alpha:1.0] forThemeAttribute:@"text-color" inState:CPThemeStateDisabled];
+    [button setValue:disabledBezelColor forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered|CPThemeStateDisabled];
+    [button setValue:defaultDisabledBezelColor forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered|CPThemeStateDefault|CPThemeStateDisabled];
+    
+    [button setValue:defaultBezelColor forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered|CPThemeStateDefault];
+    [button setValue:defaultHighlightedBezelColor forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered|CPThemeStateHighlighted|CPThemeStateDefault];
+    [button setValue:[CPColor colorWithCalibratedRed:250.0/255.0 green:250.0/255.0 blue:250.0/255.0 alpha:1.0] forThemeAttribute:@"text-color" inState:CPThemeStateDefault];
+    [button setValue:[CPColor colorWithCalibratedRed:250.0/255.0 green:250.0/255.0 blue:250.0/255.0 alpha:0.6] forThemeAttribute:@"text-color" inState:CPThemeStateDisabled|CPThemeStateDefault];
+
+    [button setValue:CGSizeMake(0.0, 24.0) forThemeAttribute:@"min-size"];
+    [button setValue:CGSizeMake(-1.0, 24.0) forThemeAttribute:@"max-size"];
+
+    return button;
+}
+
++ (CPButton)themedStandardButton
+{
+    var button = [self button];
+
+    [button setTitle:@"Cancel"];
+
+    return button;
+}
+
++ (CPButton)themedDefaultButton
+{
+    var button = [self button];
+
+    [button setTitle:@"OK"];
+    [button setDefaultButton:YES];
 
     return button;
 }