From a96d3221a213f2286bb955220d9aaa798af29325 Mon Sep 17 00:00:00 2001 From: Basile Burg Date: Fri, 19 Jan 2018 06:08:20 +0100 Subject: [PATCH] more scaled icons --- icons/bullet/bullet_purple.png | Bin 294 -> 324 bytes icons/file/document.png | Bin 0 -> 294 bytes icons/file/document24.png | Bin 0 -> 797 bytes icons/file/document32.png | Bin 0 -> 621 bytes icons/other/cancel.png | Bin 713 -> 727 bytes icons/other/cancel24.png | Bin 0 -> 1603 bytes icons/other/cancel32.png | Bin 0 -> 1713 bytes icons/other/clean24.png | Bin 0 -> 1493 bytes icons/other/clean32.png | Bin 0 -> 2876 bytes icons/other/stop.png | Bin 302 -> 711 bytes icons/other/stop24.png | Bin 0 -> 1554 bytes icons/other/stop32.png | Bin 0 -> 1930 bytes icons/other/warn_red.png | Bin 0 -> 954 bytes icons/other/warn_red24.png | Bin 0 -> 1256 bytes icons/other/warn_red32.png | Bin 0 -> 1391 bytes icons/other/warning24.png | Bin 1804 -> 1357 bytes lazproj/coedit.lpi | 14 +- src/ce_editor.pas | 85 ++++++-- src/ce_messages.lfm | 52 +++-- src/ce_messages.pas | 9 +- src/ce_miniexplorer.lfm | 1 + src/ce_miniexplorer.pas | 1 + src/ce_procinput.pas | 25 ++- src/ce_projinspect.pas | 11 +- src/ce_symlist.lfm | 374 +-------------------------------- src/ce_symlist.pas | 79 +++++-- 26 files changed, 205 insertions(+), 446 deletions(-) create mode 100644 icons/file/document.png create mode 100644 icons/file/document24.png create mode 100644 icons/file/document32.png create mode 100644 icons/other/cancel24.png create mode 100644 icons/other/cancel32.png create mode 100644 icons/other/clean24.png create mode 100644 icons/other/clean32.png create mode 100644 icons/other/stop24.png create mode 100644 icons/other/stop32.png create mode 100644 icons/other/warn_red.png create mode 100644 icons/other/warn_red24.png create mode 100644 icons/other/warn_red32.png diff --git a/icons/bullet/bullet_purple.png b/icons/bullet/bullet_purple.png index 52ba5036b95383f6c14176ae33300b859e4d27d8..5d75adf0e94d2aae591b7c26558ed9d9bffd0a62 100644 GIT binary patch delta 262 zcmV+h0r~!>0>lE4B#|^Ff96R^gXY37sU%+L>0VPIinX87~#FT=%EcQSzDAn8nkUikO- ze}+Mb2E&J&pBP@8djqCHe2_R%Uic4$zh3-e`1c9u9R_BGf8QCve0-2Nabdv3$nf_A z0|PfV4+AU=KzxumQL*s;=bN=R&pl$`VCQDw<>3d@AU;SO!!m3s5on`ar{lCf0e0bF z29P|^1s{ICU0c3Cs|cw65itgUC^;Y&MG}4u#E;O`Gmhp327mwq0CCr8eh##lQUCw| M07*qoM6N<$f_RH{r2qf` delta 230 zcmV-K}|sb0I$e51&ZmBAt-;iNklKz1${5DMfg(;~mo9XgnltmtUjE1kI>9gGur*RxNgOj3MPG%{ gmJm$iU*eB|7v(JKeR%JSNB{r;07*qoM6N<$f})LR@c;k- diff --git a/icons/file/document.png b/icons/file/document.png new file mode 100644 index 0000000000000000000000000000000000000000..8b8b1ca0000bc8fa8d0379926736029f8fabe364 GIT binary patch literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^zbpD<_bdI{u9mbgZg z1m~xflqVLYGB~E>C#5QQ<|d}62BjvZR2H60wE-&H;pyTSqH(@-Vl>|&1p(LP>kg~E zYiz5X^`c$+%8#zC{u)yfe-5 zmgid={Z3k(ERKCKrE7DF;=x4^O+ pzO8rLO8p|Ip=x)jHOtWj`bJBmKdh_V<`47(gQu&X%Q~loCIFbEay|e6 literal 0 HcmV?d00001 diff --git a/icons/file/document24.png b/icons/file/document24.png new file mode 100644 index 0000000000000000000000000000000000000000..1b3f1ce13bb73fa6ceaf773150d0059586b504bd GIT binary patch literal 797 zcmV+&1LFLNP)v18IE5NpcYBTm z(cZpEak|r;c2BU+?elf1cb+&N0U^Gb@W;`EqOP&&`dE zYFq={W>3j%>EJk+s_FCWFySD=H`pp~NSz7W*S)aYy z+H!aI_wPRxolaiwdADe{J4IQR$A52c_wqdVr|avhgCdVxt+A8YD4XQ&het;owA-vMeLUNC;JrF_OiI z1T!~2QBfRoV`heLmzSIC&!6`}R#yDCCr>H>IAA8s3^Nfz)y;$jArnQfhndLpt|R%K zrKRS^ix|;%%+1aH z0Q?N(RRA0Y0A{E4b&4fHFwyP)%dK0BEG{krkjkX#=_$6~z6Hnz6=S77!X$z;KEz|O za8I-k4)Bwuq9~Z3pU2F6lzOa_pwB>c3Z3pVVd1oeW=04Bd_1WNV4#y`I+rscQb@?E zYw_$93BweS0^;&!3J9wls#c;P!*rGMed?;osZ5d7mq=zqPNV!L#X8A7+qlXU4I60U zoH44zK6vIANCaG4qB^SukOC$f3Q_aERpSWBf; literal 0 HcmV?d00001 diff --git a/icons/file/document32.png b/icons/file/document32.png new file mode 100644 index 0000000000000000000000000000000000000000..7f1997a76c0786a18c77874955f048be9fa203ef GIT binary patch literal 621 zcmV-z0+RiSP)>TG43Qo5yuLQUM{pY3CI_qQ|qMBBC@ z&7^u?5K+CnzBcG#&+hdg9vZhsP!Pegtec~Hy-pv#rPiY3{6UD)A_3TwrcS40w{`uB z>SJL5T&nN8Cdh8@?zu;z_n*pbtgpez=_$0DO{i5W2Pe9I(P}gf>9-{-r}*AcxLr{c zM~tzN61GkSls~_`LZMKATDj~%gn2@d{ouXlmGXR)gq>54yD^)EhsP%<7K6h%*YoH~@TqPs{;h05HCWC)R$-A&3Xi zH|7V;q;5?vKmf=PfH+=HV=eI3Ed`(^%`3xLaE?z&-5U|b0mmHr<#jU|EK#;WT25>) z9=trh@JkozRkZ5|n4>ID%1mkD`y_QqUowE1UCTwgKLQK@(+%mSW`E-|00000NkvXX Hu0mjforo7v literal 0 HcmV?d00001 diff --git a/icons/other/cancel.png b/icons/other/cancel.png index 7640cd5f78e4ac283c79ac9be28640ea93efddf9..33c876b23a8a3940476e354ffe81f9fe93ac9170 100644 GIT binary patch delta 666 zcmV;L0%iTl1=j_TNq>1sL_t(|+H{joNK{c2#=m>-n?LV0S_(yGP!>T0GoWTtk=7i$T_goYI}104R0J`iP@8DkDv1_m8P0%4*2pZ=WN`~BuVjtx9FDO2rga`ykDJjZ%3=*b&=E>RG(vQQP{LzFBuM9>Rsz>% delta 652 zcmV;70(1S>1<3`FNq=ieL_t(|+Kf|6XcJ)&{&th7G>?*pHl?(sT95|x;Oml$C@uAM z5JfO2L9nC*El5g1ya_@J5+9hWCvT#HkC>A`_-XPNot+nHsC(=-iwi@L22;!Y9lBG^t~AedP}cql2Q^?!U$FA#BCFPbcE6PiG=I@m42z zn+sUqhxr?~ke;3m?@vmjG-srbdmXk5u5DWa9^VjZukIjv^CJe2_5bNp$|DwvVet3> zHXqqdCHaw+C6Rs=?p2*Nf`hODI(t!w+NZqtwrSu`%dlN=-%O{R?z@cYxOND!2m{3m_MY zL_k3*bf(!kEoc-|qdCfvi)C2tMv&UWyrRLwl`=$GVSmWKeuBhQ0RI||(OiRvTmq!F zpLS3yr_zwA@(SKP{nR2rV|q?S6ln(_0$3>Kt57O3!&15XueSB$&|HI8&Q*y3zR?lx zXC*XS(-(g|f098j(%@w!jgAnZBZQNQB5GxY{h-eiCm5M};aP-1A7ekUqTu_FA{`;j zHZkn9Pk-8N#$fLT1OCUB(<+3Va@j9r$C|5r&1t`GH*@}OrvYUBSG78!#>F~>LOmQ1 zvZF1>bj9hIG#R*{%dDY&9kAB;J5F{7xiXL`ai}TUrPG3VcGYX77IHXxi1QO1C1@PP mBEfBX&SRpupy&S*U;uw8VEPIem~H?7002ovP6b4+LSTZgnKy3$ diff --git a/icons/other/cancel24.png b/icons/other/cancel24.png new file mode 100644 index 0000000000000000000000000000000000000000..e964fc64c75e78515a417e7b0513381d769f73d3 GIT binary patch literal 1603 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 Eg2EjAd;kCd literal 0 HcmV?d00001 diff --git a/icons/other/stop32.png b/icons/other/stop32.png new file mode 100644 index 0000000000000000000000000000000000000000..f15bf69219729772bdbdfad3c7c7b1ee7c157674 GIT binary patch literal 1930 zcmV;52X**~P)lpr!KK`L)ri>}onyH!Ulp=zTL0b`zNQcu$;r|Iuj~H4YkNNK7>Hi>qUX~#e3!$;CLJ{yjbj#0%7n=|$uMP9 z5*T^Cs3<9L^sVpn~2)Crc01!&HRNS93 zDkZJ#ok<9v!S#n;Xl(bZu4YjLl_24toCE>Jr8ECWF(#gn2=_MQ3*Wk|E&S`pQ~@VRJL$r zBnZRvCqL1&X3pr;WoW#rS%fCH4=CIM|KfxR9w`W`9_m5bg`(m8gb>EhOf zBf>%O;W01y`SX2bn4iO%7`oVzKc|1DDDANZ<#LIC3>gbW-nW(`0aVc=~ z{?k}v(fsu03qMr^6Eg^ajayNcAD^E6?ao!xG09|%w+{^HMqYC}r+yD9?vohn4HJco zh(MSyCUc5X;b_f+iSe2FKR&v7-W47KAttN%@S4|0qa+9Qu5L8WRAE}A*nkRnLO}-l z$pP}cB+KB(q>(8Z2n_zKbBQo*xCK_emIwPp@i20Zr|MM!WKJzjvRKT8^RdorANy1T zg611?serEd`P|=dtWq zEd+qiC|SB{_Sg*Q!Af;`{Jm}m&5Z({z8a11SUsb6FIpkWTDw`luM(Ec9jBI|99C{l z)Sa6oKuKXLc->1^A%HIkfRQ)bmQTz{LE~~D&SARA{p5Obyw|V5=Hs_jK+*bu4-J-; z7OK1?L$curC=_I4LUuCze#5pLcefJ&vtlq7j>}F0M~9>)n;t-*rpY57p8__kS#86S zk)X1pc1%3Y#Y>lt$Q&R>UJRj+8#1_F-J@$qgo-+LcqxZ9^wtkg)^!) zF%Gs^Avm3wAzTA(^1NPopacW$ty^MX5{!Y6L;=9d0Ur7hY+x*sM`60zXb693z@tk{ z(F0(ioDgLMfFa;mbO7W<;?c=5JrBdpHn-TjZ3xzSR}Z>Z;M6?O0|-?`53;KO`e*^N z#uEa-o&#V;8(lp;y?JF&_kGZA)(Du5ra;m}?SxF_p>KUv zfkj|Yc^kVh+9XB-;P*P4%CFY7Y%Iu(2X{nz2P>Z3>*q{hvGV;kLO*BdZAhwYxH{Aw zBLGy_w?en`emSud0I&Vmy$7ob#&2BxW+7Oy9KAjzOh!@felvpVo_12u}MQLhB3)GAjTP&@$ zizdRlwe{>G$iwa)!= zprZv02Ku~&osRbXQvW0&4>g*gJW;HP$BU{A+m2j=#*@3=d)8{VQ*R3fRK^XDEw3c| zsn1w2YwR%aW4+1|N(OW#3gcIaqr~H2Xbgi*-&et-X8W=EY=M#z;A67w9%heOt z{kikrPD>nO&C9T1JUP{+Y!J609ib=91|H(A40fNm1vPgZuFKoreIISLQv4&YWOQwo z9TyIrYEGEGI3sz8wII``9!a}b=uh?nqAqB`t9qOjU{`r9oVnWItonS(B2?2%Gf6wN z4glqXNb}-B<)PD#gy~D#I{cQG^M~On!tQ$sBlwK>4+Nu1aT}ngE41qW*4^?=Qiqk3^I`f9aS)gcmEGh@RQSBbcYx9DDT1<^KiwV+Dq|}r#GsomCSoc{di>zsRb2)QtwyfyeF?mGkd3Lv}wf>C#jBky8xq}qJ%fEU3x6(XKw^;M zkm9MOtDW}w@O2}(wIu7(4Ez4?%V{)^7-^tsLoC`v_G{%O_I2XO^`8I(0B7{%1Lh;d Qvj6}907*qoM6N<$f(mk(X8-^I literal 0 HcmV?d00001 diff --git a/icons/other/warn_red.png b/icons/other/warn_red.png new file mode 100644 index 0000000000000000000000000000000000000000..45b64a798ef3424ee3ed6af3e3abbcf9fbaeee07 GIT binary patch literal 954 zcmV;r14aCaP)uiL$5uuQc zi$WH))CSxL{R_J8s!$0u-4vuCbuod^p&AR)v?yq(24ZUxGdh{;VkV)9on&ec9Ny*L zcRu%f4~H*WYdXo(V08Mg)*3|z;fstPgXL+%xaW)XcT!_^0CnGhAKxAw4Xo5^;l|CI zH-Mh~>h@J^z*M-euhH)~j3$%Hw(V|T zf8B!kRjoH)NwEc=AIM~M@bP2J`J+@UT6VRHH!}ma z&FYymJV~ed;rjKbx0|Y;{wKw6!S}DlVk)@2OrTuGNG37jaqLowxCn<_*EHahwvyY- zZ1yvyp3R*+spnHE{adxFJS5PD6LcbNnWJ*EcYrtfeJ_ z=g*_UVO-b6^E^~n7r}`My4Kb>5{)VgraNkdFOuIhjQ;%L!-n42z?ql;z;#_**F{7K zo;}O+l@-Ru$IU^JkA0CN`-1Z@lN}l|jQjTqUbui*79xV@d4$7ZLveUbN- zWgQqicn~9#*#WKB>lBMc%H{GlR4GO1)F}vu$@TUsWmzd-nWUqo{7^|7NzE$-gM zotoMKFin%5o*oj3#P;6SdFUZuiGBRT4;G5m0K_@);6X2UZ<6TR!R%{YzwTl cuK!#83wh2#=*+j5WB>pF07*qoM6N<$f-^77nE(I) literal 0 HcmV?d00001 diff --git a/icons/other/warn_red24.png b/icons/other/warn_red24.png new file mode 100644 index 0000000000000000000000000000000000000000..47512a0d1896efee792036f2856e7a072fe63cb1 GIT binary patch literal 1256 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 P00000NkvXXu0mjfCPRcG literal 1804 zcmV+n2lM!eP)XcnKW)4JC5ya?AFBD*xC2qJDfXS8wZtm6Jf?a zJ9FpGJ>NIqoH;X02!Wd^sYlpep=$dSu0!OKhpq34y*J}Wxhe36*}bgx_I>8ABc}ev zS4`fyqc{Bs`{e(JKo3)esy?mXz29`kkHR_kXQ&%@nPN@d58ZdGPGG(PpXc45jlwBF zBqkuPOal1~_-#AGsV3}PT>^bfS9Ie^{{Al*PJ96126@ooOr8L5-m0^T_9tnKc_S{> zg9i_mJUD%%Z#TdF!Fv>cOm+S_458}O%iv_^!F*9Dp+=s0`_+`bW&g2KeU_}iOds<( zhW|0O^V7P0;UwI>BbWlAFlsa8$B#p)y;EbA>-JxMn3a|4w`2vxk-oj!9lP&>s?+Sx zN>E3o?jQmMAwtVN0rT8sLf%!*S*w#YdQk%DFh4FqkcAmae z!OLsGE9z+)8XOAB{Ma!lk#!ugu7{F)S+o@2yp%!tEcTlpykE1YPs2$kNOlgRq0L=> zxIetQ1BJIkx&
%`%Now;Tx<)DXYDYN7~fv z0MIGxj=7 zI0J=q_!?V*+!ZOi8+`8UX}R%>-w(miRCG6oiVlh-h+t^#M$Dcar0~chdH!#(Too=3 zA3D>+UU=WHMD9Ha^bcc)Roz(0NYdQp3(}XrbrYp}z96v+?#^B)=s!J;Z~tgvcdTm+ zqO&n1@fY3;Ivq`QsgUV0#BV zy1GpMg<6mjjFyVgt@%oPlK2#4FvAlP+4Lo~{=NgRE-k^Ydm_H5Zax;Oskd@;;z6?{ zjuopT<(&m&#-vlXc4NW)Q;KA4XOUNtp$v2(|9#bUfIcAG*~B!gnl5who%o(tc1E80 z=uh9B=ERb{)T8gVVojC;8;-dK3YlBtCkL=}R0%A#MX@cG^)I&Z9{pON>fd8%tNLP% zT4wC6eFVMR)sBCrU3nr}ThpMq!A6%0XdW;!@P&G@{h$4c`@C$7e5YOee2sBaCNavY zYGV3g;DsUkIhTO`p<1@ptK{2#;fSJm0<`t61!fw3NFTfPqCva%S#j&-WB9WEr7@ON zVRmxVo_J?|;H6RLMR!4srU34G^iK81(SSxb3C&#E^TL1IeVHO&y!s$_RHPi?#&9a2w8NMEKc1Mi>0000 - + @@ -296,6 +296,18 @@ + + + + + + + + + + + + diff --git a/src/ce_editor.pas b/src/ce_editor.pas index 5de3b669..254b5396 100644 --- a/src/ce_editor.pas +++ b/src/ce_editor.pas @@ -328,6 +328,26 @@ begin AssignPng(pageControl.addButton, 'DOCUMENT_ADD'); AssignPng(pageControl.closeButton, 'DOCUMENT_DELETE'); AssignPng(pageControl.splitButton, 'SPLITTER'); + + AssignPng(mnuedCopy.Bitmap, 'COPY'); + AssignPng(mnuedCut.Bitmap, 'CUT'); + AssignPng(mnuedPaste.Bitmap, 'PASTE'); + AssignPng(mnuedUndo.Bitmap, 'ARROW_UNDO'); + AssignPng(mnuedRedo.Bitmap, 'ARROW_REDO'); + AssignPng(mnuedJum2Decl.Bitmap, 'ARROW_SHOE'); + AssignPng(mnuedCopy.Bitmap, 'COPY'); + AssignPng(mnuedNext.Bitmap, 'GO_NEXT'); + AssignPng(mnuedPrev.Bitmap, 'GO_PREVIOUS'); + AssignPng(mnuedRename.Bitmap, 'PENCIL'); + AssignPng(mnuedUpcase.Bitmap, 'CASE'); + AssignPng(mnuedLowcase.Bitmap, 'CASE'); + AssignPng(mnuedNextCarea.Bitmap, 'GO_NEXT'); + AssignPng(mnuedPrevCarea.Bitmap, 'GO_PREVIOUS'); + AssignPng(mnuedSortLines.Bitmap, 'SORT_AZ'); + AssignPng(mnuedNextProtGrp.Bitmap, 'GO_NEXT'); + AssignPng(mnuedPrevProtGrp.Bitmap, 'GO_PREVIOUS'); + AssignPng(mnuedNextWarn.Bitmap, 'GO_NEXT'); + AssignPng(mnuedPrevWarn.Bitmap, 'GO_PREVIOUS'); end; iss24: begin @@ -336,6 +356,26 @@ begin AssignPng(pageControl.addButton, 'DOCUMENT_ADD24'); AssignPng(pageControl.closeButton, 'DOCUMENT_DELETE24'); AssignPng(pageControl.splitButton, 'SPLITTER24'); + + AssignPng(mnuedCopy.Bitmap, 'COPY24'); + AssignPng(mnuedCut.Bitmap, 'CUT24'); + AssignPng(mnuedPaste.Bitmap, 'PASTE24'); + AssignPng(mnuedUndo.Bitmap, 'ARROW_UNDO24'); + AssignPng(mnuedRedo.Bitmap, 'ARROW_REDO24'); + //AssignPng(mnuedJum2Decl.Bitmap, 'ARROW_SHOE24'); + AssignPng(mnuedCopy.Bitmap, 'COPY24'); + AssignPng(mnuedNext.Bitmap, 'GO_NEXT24'); + AssignPng(mnuedPrev.Bitmap, 'GO_PREVIOUS24'); + AssignPng(mnuedRename.Bitmap, 'PENCIL24'); + AssignPng(mnuedUpcase.Bitmap, 'CASE24'); + AssignPng(mnuedLowcase.Bitmap, 'CASE24'); + AssignPng(mnuedNextCarea.Bitmap, 'GO_NEXT24'); + AssignPng(mnuedPrevCarea.Bitmap, 'GO_PREVIOUS24'); + AssignPng(mnuedSortLines.Bitmap, 'SORT_AZ24'); + AssignPng(mnuedNextProtGrp.Bitmap, 'GO_NEXT24'); + AssignPng(mnuedPrevProtGrp.Bitmap, 'GO_PREVIOUS24'); + AssignPng(mnuedNextWarn.Bitmap, 'GO_NEXT24'); + AssignPng(mnuedPrevWarn.Bitmap, 'GO_PREVIOUS24'); end; iss32: begin @@ -344,35 +384,34 @@ begin AssignPng(pageControl.addButton, 'DOCUMENT_ADD32'); AssignPng(pageControl.closeButton, 'DOCUMENT_DELETE32'); AssignPng(pageControl.splitButton, 'SPLITTER32'); + + AssignPng(mnuedCopy.Bitmap, 'COPY32'); + AssignPng(mnuedCut.Bitmap, 'CUT32'); + AssignPng(mnuedPaste.Bitmap, 'PASTE32'); + AssignPng(mnuedUndo.Bitmap, 'ARROW_UNDO32'); + AssignPng(mnuedRedo.Bitmap, 'ARROW_REDO32'); + //AssignPng(mnuedJum2Decl.Bitmap, 'ARROW_SHOE32'); + AssignPng(mnuedCopy.Bitmap, 'COPY32'); + AssignPng(mnuedNext.Bitmap, 'GO_NEXT32'); + AssignPng(mnuedPrev.Bitmap, 'GO_PREVIOUS32'); + AssignPng(mnuedRename.Bitmap, 'PENCIL32'); + AssignPng(mnuedUpcase.Bitmap, 'CASE32'); + AssignPng(mnuedLowcase.Bitmap, 'CASE32'); + AssignPng(mnuedNextCarea.Bitmap, 'GO_NEXT32'); + AssignPng(mnuedPrevCarea.Bitmap, 'GO_PREVIOUS32'); + AssignPng(mnuedSortLines.Bitmap, 'SORT_AZ32'); + AssignPng(mnuedNextProtGrp.Bitmap, 'GO_NEXT32'); + AssignPng(mnuedPrevProtGrp.Bitmap, 'GO_PREVIOUS32'); + AssignPng(mnuedNextWarn.Bitmap, 'GO_NEXT32'); + AssignPng(mnuedPrevWarn.Bitmap, 'GO_PREVIOUS32'); end; end; - fTokList := TLexTokenList.Create; - // - AssignPng(mnuedCopy.Bitmap, 'COPY'); - AssignPng(mnuedCut.Bitmap, 'CUT'); - AssignPng(mnuedPaste.Bitmap, 'PASTE'); - AssignPng(mnuedUndo.Bitmap, 'ARROW_UNDO'); - AssignPng(mnuedRedo.Bitmap, 'ARROW_REDO'); - AssignPng(mnuedJum2Decl.Bitmap, 'ARROW_SHOE'); - AssignPng(mnuedCopy.Bitmap, 'COPY'); - AssignPng(mnuedNext.Bitmap, 'GO_NEXT'); - AssignPng(mnuedPrev.Bitmap, 'GO_PREVIOUS'); - AssignPng(mnuedRename.Bitmap, 'PENCIL'); - AssignPng(mnuedUpcase.Bitmap, 'CASE'); - AssignPng(mnuedLowcase.Bitmap, 'CASE'); - AssignPng(mnuedNextCarea.Bitmap, 'GO_NEXT'); - AssignPng(mnuedPrevCarea.Bitmap, 'GO_PREVIOUS'); - AssignPng(mnuedSortLines.Bitmap, 'SORT_AZ'); - AssignPng(mnuedNextProtGrp.Bitmap, 'GO_NEXT'); - AssignPng(mnuedPrevProtGrp.Bitmap, 'GO_PREVIOUS'); - AssignPng(mnuedNextWarn.Bitmap, 'GO_NEXT'); - AssignPng(mnuedPrevWarn.Bitmap, 'GO_PREVIOUS'); - // + EntitiesConnector.addObserver(self); EntitiesConnector.addSingleService(self); - // + fOptions:= TCEPagesOptions.construct(self); end; diff --git a/src/ce_messages.lfm b/src/ce_messages.lfm index 393e5126..d36b9823 100644 --- a/src/ce_messages.lfm +++ b/src/ce_messages.lfm @@ -49,17 +49,17 @@ inherited CEMessagesWidget: TCEMessagesWidget ButtonWidth = 100 ShowCaptions = True Wrapable = False - object button0: TCEToolButton[0] - Left = 530 + object sep: TCEToolButton[0] + Left = 935 Height = 28 + Hint = 'Clean filtered messages' Top = 0 AutoSize = True - Caption = 'button0' Style = tbsDivider scaledSeparator = False end object btnSelMisc: TCEToolButton[1] - Left = 430 + Left = 835 Hint = 'filter the other messages' Top = 0 AutoSize = True @@ -67,7 +67,7 @@ inherited CEMessagesWidget: TCEMessagesWidget scaledSeparator = False end object button2: TCEToolButton[2] - Left = 425 + Left = 521 Height = 28 Top = 0 AutoSize = True @@ -76,7 +76,7 @@ inherited CEMessagesWidget: TCEMessagesWidget scaledSeparator = False end object btnSelApp: TCEToolButton[3] - Left = 325 + Left = 421 Hint = 'filter the messages related to Coedit' Top = 0 AutoSize = True @@ -84,7 +84,7 @@ inherited CEMessagesWidget: TCEMessagesWidget scaledSeparator = False end object button4: TCEToolButton[4] - Left = 320 + Left = 416 Height = 28 Top = 0 AutoSize = True @@ -93,7 +93,7 @@ inherited CEMessagesWidget: TCEMessagesWidget scaledSeparator = False end object btnSelProj: TCEToolButton[5] - Left = 220 + Left = 316 Hint = 'filter the messages related to the active project' Top = 0 AutoSize = True @@ -101,7 +101,7 @@ inherited CEMessagesWidget: TCEMessagesWidget scaledSeparator = False end object button6: TCEToolButton[6] - Left = 215 + Left = 311 Height = 28 Top = 0 AutoSize = True @@ -110,7 +110,7 @@ inherited CEMessagesWidget: TCEMessagesWidget scaledSeparator = False end object btnSelEdit: TCEToolButton[7] - Left = 115 + Left = 211 Hint = 'filter the messages related to the active editor' Top = 0 AutoSize = True @@ -118,7 +118,7 @@ inherited CEMessagesWidget: TCEMessagesWidget scaledSeparator = False end object button8: TCEToolButton[8] - Left = 110 + Left = 206 Height = 28 Top = 0 AutoSize = True @@ -127,7 +127,7 @@ inherited CEMessagesWidget: TCEMessagesWidget scaledSeparator = False end object btnSelAll: TCEToolButton[9] - Left = 10 + Left = 106 Hint = 'don''t filter the messages' Top = 0 AutoSize = True @@ -135,16 +135,7 @@ inherited CEMessagesWidget: TCEMessagesWidget Down = True scaledSeparator = False end - object button10: TCEToolButton[10] - Left = 5 - Height = 28 - Top = 0 - AutoSize = True - Caption = 'button10' - Style = tbsDivider - scaledSeparator = False - end - object TreeFilterEdit1: TTreeFilterEdit[11] + object TreeFilterEdit1: TTreeFilterEdit[10] Left = 536 Height = 26 Hint = 'in the selected category, filter the messages that contain the text typed here' @@ -160,14 +151,19 @@ inherited CEMessagesWidget: TCEMessagesWidget TabOrder = 0 OnButtonClick = TreeFilterEdit1ButtonClick end - object btnClearCat: TSpeedButton[12] + object btnClearCat: TCEToolButton[11] Left = 1 - Height = 28 - Hint = 'clear the messages that match to the selected category' Top = 0 - Width = 4 - Align = alLeft - AutoSize = True + resourceName = 'CLEAN' + scaledSeparator = False + end + object button0: TCEToolButton[12] + Left = 101 + Height = 28 + Top = 0 + Caption = 'button0' + Style = tbsDivider + scaledSeparator = False end end end diff --git a/src/ce_messages.pas b/src/ce_messages.pas index 7c1c5c89..968f039d 100644 --- a/src/ce_messages.pas +++ b/src/ce_messages.pas @@ -63,20 +63,19 @@ type { TCEMessagesWidget } TCEMessagesWidget = class(TCEWidget, ICEEditableOptions, ICEDocumentObserver, ICEProjectObserver, ICEMessagesDisplay) + btnClearCat: TCEToolButton; btnSelAll: TCEToolButton; btnSelApp: TCEToolButton; btnSelEdit: TCEToolButton; btnSelMisc: TCEToolButton; btnSelProj: TCEToolButton; - button0: TCEToolButton; - button10: TCEToolButton; + sep: TCEToolButton; button2: TCEToolButton; button4: TCEToolButton; button6: TCEToolButton; button8: TCEToolButton; imgList: TImageList; List: TTreeView; - btnClearCat: TSpeedButton; TreeFilterEdit1: TTreeFilterEdit; procedure ListCustomDrawItem(Sender: TCustomTreeView; Node: TTreeNode; State: TCustomDrawState; var DefaultDraw: Boolean); @@ -399,10 +398,7 @@ begin fBtns[amcMisc]:= btnSelMisc; fBtns[amcProj]:= btnSelProj; // - // reminder: a toolbar button can be used here because it would have the - // same size as the buttons used to select the categories. btnClearCat.OnClick := @actClearCurCatExecute; - AssignPng(btnClearCat, 'CLEAN'); // fEditorMessagePos := TCEEditorMessagePos.Create; // @@ -428,7 +424,6 @@ end; procedure TCEMessagesWidget.setToolBarFlat(value: boolean); begin inherited setToolBarFlat(value); - btnClearCat.Flat := value; TreeFilterEdit1.Flat:=value; end; diff --git a/src/ce_miniexplorer.lfm b/src/ce_miniexplorer.lfm index 9493de8f..56e00e20 100644 --- a/src/ce_miniexplorer.lfm +++ b/src/ce_miniexplorer.lfm @@ -16,6 +16,7 @@ inherited CEMiniExplorerWidget: TCEMiniExplorerWidget inherited Content: TPanel Left = 4 Height = 558 + Top = 36 Width = 335 BorderSpacing.Around = 4 ClientHeight = 558 diff --git a/src/ce_miniexplorer.pas b/src/ce_miniexplorer.pas index 41732874..9f149d0d 100644 --- a/src/ce_miniexplorer.pas +++ b/src/ce_miniexplorer.pas @@ -266,6 +266,7 @@ begin // lstFilter.FilteredListbox := nil; lstFilter.onChange := @lstFilterChange; + lstFilter.BorderSpacing.Left := ScaleX(116, 96); // treeSetRoots; // diff --git a/src/ce_procinput.pas b/src/ce_procinput.pas index f1169d8a..3754c066 100644 --- a/src/ce_procinput.pas +++ b/src/ce_procinput.pas @@ -66,9 +66,28 @@ begin fMru.LoadFromFile(fname); if fMru.Count = 0 then fMru.Insert(0, '(your input here)'); - AssignPng(btnClose, 'PENCIL_DELETE'); - AssignPng(btnSend, 'PENCIL_GO'); - AssignPng(btnKill, 'CANCEL'); + + case GetIconScaledSize of + iss16: + begin + AssignPng(btnClose, 'PENCIL_DELETE'); + AssignPng(btnSend, 'PENCIL_GO'); + AssignPng(btnKill, 'CANCEL'); + end; + iss24: + begin + AssignPng(btnClose, 'PENCIL_DELETE24'); + AssignPng(btnSend, 'PENCIL_GO24'); + AssignPng(btnKill, 'CANCEL24'); + end; + iss32: + begin + AssignPng(btnClose, 'PENCIL_DELETE32'); + AssignPng(btnSend, 'PENCIL_GO32'); + AssignPng(btnKill, 'CANCEL32'); + end; + end; + toolbarVisible:=false; end; diff --git a/src/ce_projinspect.pas b/src/ce_projinspect.pas index 3709fc87..07d9d2a1 100644 --- a/src/ce_projinspect.pas +++ b/src/ce_projinspect.pas @@ -78,7 +78,7 @@ implementation constructor TCEProjectInspectWidget.create(aOwner: TComponent); begin fSymStringExpander:= getSymStringExpander; - // + fActOpenFile := TAction.Create(self); fActOpenFile.Caption := 'Open file in editor'; fActOpenFile.OnExecute := @actOpenFileExecute; @@ -90,15 +90,16 @@ begin fActBuildConf.Caption := 'Build configuration'; fActBuildConf.OnExecute := @actBuildExecute; fActBuildConf.OnUpdate := @actUpdate; - // + inherited; - // + Tree.OnDblClick := @TreeDblClick; fFileNode := Tree.Items[0]; fConfNode := Tree.Items[1]; - // + Tree.PopupMenu := contextMenu; - // + TreeFilterEdit1.BorderSpacing.Left := ScaleX(114, 96); + EntitiesConnector.addObserver(self); end; diff --git a/src/ce_symlist.lfm b/src/ce_symlist.lfm index 0faf39a6..016e2398 100644 --- a/src/ce_symlist.lfm +++ b/src/ce_symlist.lfm @@ -27,7 +27,6 @@ inherited CESymbolListWidget: TCESymbolListWidget Align = alClient BorderSpacing.Around = 4 HideSelection = False - Images = imgList ReadOnly = True RightClickSelect = True ScrollBars = ssAutoBoth @@ -46,13 +45,13 @@ inherited CESymbolListWidget: TCESymbolListWidget 000000FFFFFFFF00000000000000000009000000496E74657266616365060000 000600000006000000FFFFFFFF000000000000000000050000004D6978696E07 0000000700000007000000FFFFFFFF0000000000000000000600000053747275 - 6374080000000800000008000000FFFFFFFF0000000000000000000800000054 - 656D706C617465000000000000000000000000FFFFFFFF000000000000000000 - 05000000556E696F6E010000000100000001000000FFFFFFFF00000000000000 - 000008000000556E697474657374020000000200000002000000FFFFFFFF0000 - 00000000000000080000005661726961626C65090000000900000009000000FF - FFFFFF000000000000000000080000005761726E696E67730A0000000A000000 - 0A000000FFFFFFFF000000000000000000060000004572726F7273 + 6374000000000000000000000000FFFFFFFF0000000000000000000800000054 + 656D706C617465010000000100000001000000FFFFFFFF000000000000000000 + 05000000556E696F6E020000000200000002000000FFFFFFFF00000000000000 + 000008000000556E697474657374030000000300000003000000FFFFFFFF0000 + 00000000000000080000005661726961626C65080000000800000008000000FF + FFFFFF000000000000000000080000005761726E696E67730900000009000000 + 09000000FFFFFFFF000000000000000000060000004572726F7273 } TreeLineColor = clDefault end @@ -92,363 +91,4 @@ inherited CESymbolListWidget: TCESymbolListWidget left = 112 top = 48 end - object imgList: TImageList[2] - left = 152 - top = 48 - Bitmap = { - 4C690B0000001000000010000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF000000000064646497626262FF616161FF626262FF6464649700000000FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00646464976F6E6EFFA6A5A4FFA9A8A9FFA6A5A4FF6D6E6EFF64646497FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00626363FFA7A5A5FF7D7B7AFF787675FF7D7B7AFFA7A5A5FF626363FFFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00626363FF8E8C8BFF767371FF767371FF767371FF8E8C8BFF626363FFFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00636464FF858381FF878481FF868381FF878481FF858381FF636464FFFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00585858AC6F6E6EFF95918FFF989492FF95918FFF6F6E6EFF585858ACFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF000000001E585858AC636363FF626263FF636363FF585858AC0000001EFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00000000000000001E0000003300000033000000330000001E00000000FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF0000000000B9851C97B78319FFB68217FFB78319FFB9851C9700000000FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00B9851C97C6922EFFECC482FFEFC886FFECC482FFC6912CFFB9851C97FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00B78319FFEEC684FFE5AA49FFE2A641FFE5AA49FFEEC684FFB78319FFFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00B78219FFEBB964FFE3A641FFE3A641FFE3A641FFEBB964FFB78219FFFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00B7841AFFEAB45CFFE9B45CFFE8B35BFFE9B45CFFEAB45CFFB7841AFFFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00A37519ACC5922FFFEDC074FFF1C47AFFEDC074FFC5922FFFA37519ACFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF000000001EA37519ACB78319FFB68218FFB78319FFA37519AC0000001EFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00000000000000001E0000003300000033000000330000001E00000000FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF0000000000008C4B97008A48FF008946FF008A48FF008C4B9700000000FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00008C4B97109F63FF74DAB7FF7ADEBDFF74DAB7FF109F63FF008C4B97FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00008A49FF66DAB4FF1EC68EFF16C388FF1EC68EFF66DAB4FF008A49FFFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00008948FF25CF99FF00C07FFF00BE7EFF00C07FFF25CF99FF008948FFFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00008A4AFF00C789FF00C88AFF00C689FF00C88AFF00C789FF008A4AFFFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00007B43AC009B5CFF00CE90FF00D194FF00CE90FF009B5CFF007B43ACFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF000000001E007B43AC008A4AFF008949FF008A4AFF007B43AC0000001EFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00000000000000001E0000003300000033000000330000001E00000000FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00000000002C70DC97296DDBFF286CDBFF296DDBFF2C70DC9700000000FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF002D70DC974083E7FF95C2FFFF9BC7FFFF95C2FFFF4081E7FF2D70DC97FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF002B6EDBFF8FC3FFFF5AA4FFFF53A1FFFF5AA4FFFF8FC3FFFF2B6EDBFFFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF002B6DDBFF65B2FFFF449EFFFF449DFFFF449EFFFF65B2FFFF2B6DDBFFFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF002D6FDBFF4FA9FFFF4FA9FFFF4EA7FFFF4FA9FFFF4FA9FFFF2D6FDBFFFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF002863C1AC387FE4FF56B2FFFF58B6FFFF56B2FFFF387FE4FF2863C1ACFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF000000001E2862C1AC2D6EDBFF2D6DDBFF2D6EDBFF2862C1AC0000001EFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00000000000000001E0000003300000033000000330000001E00000000FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00000000009A6BDC979968DBFF9968DBFF9968DBFF9A6BDC9700000000FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF009A6BDC97A17DE7FFC6BCFFFFC9C1FFFFC6BCFFFFA17DE7FF9A6BDC97FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF009A69DBFFC5BDFFFFAA9DFFFFA798FFFFAA9DFFFFC5BDFFFF9A69DBFFFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF009A68DBFFB3ACFFFFA396FFFFA396FFFFA396FFFFB3ACFFFF9A68DBFFFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF009A69DBFFACA5FFFFACA5FFFFABA3FFFFACA5FFFFACA5FFFF9A69DBFFFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00885EC1ACA17BE4FFB3B1FFFFB4B6FFFFB3B1FFFFA17BE4FF885EC1ACFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF000000001E885EC1AC9A69DBFF9A68DBFF9A69DBFF885EC1AC0000001EFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00000000000000001E0000003300000033000000330000001E00000000FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF0000000000AB499C97AA459AFFA94499FFAA459AFFAB499C9700000000FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00AB499C97B462AAFFD8B8D9FFDBBEDDFFD8B8D9FFB462AAFFAB499C97FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00AA469AFFDCB6DAFFCA91C9FFC78CC5FFCA91C9FFDCB6DAFFAA469AFFFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00A94699FFD69ED4FFCA83C7FFCA83C6FFCA83C7FFD69ED4FFA94699FFFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00AA489AFFD68ED1FFD68ED2FFD58DD1FFD68ED2FFD68ED1FFAA489AFFFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00964189ACB85CAAFFE195DAFFE499DEFFE195DAFFB85CAAFF964189ACFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF000000001E964189ACA94899FFA84799FFA94899FF964189AC0000001EFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00000000000000001E0000003300000033000000330000001E00000000FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF0000000000354CCD973249CCFF3148CBFF3249CCFF354CCD9700000000FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00354CCD97455DDBFF90A6FCFF95ACFFFF90A6FCFF445DDBFF354CCD97FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00334ACCFF90A5FDFF5A79FAFF5573F9FF5A79FAFF90A5FDFF334ACCFFFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00334ACBFF6D88FFFF4D6DFBFF4D6DFAFF4D6DFBFF6D88FFFF334ACBFFFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00354BCBFF5F7CFFFF607CFFFF5F7BFDFF607CFFFF5F7CFFFF354BCBFFFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF002F44B4AC425AD9FF6F88FFFF738CFFFF6F88FFFF425AD9FF2F44B4ACFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF000000001E2F44B4AC344BCBFF334ACAFF344BCBFF2F44B4AC0000001EFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00000000000000001E0000003300000033000000330000001E00000000FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00000000002CC1FF9729C0FFFF28C0FFFF29C0FFFF2CC1FF9700000000FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF002DC1FF9741C6FFFF96DCFFFF9CDDFFFF96DCFFFF41C5FFFF2DC1FF97FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF002AC0FFFF95DDFFFF62CDFFFF5CCBFFFF62CDFFFF95DDFFFF2AC0FFFFFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF002AC0FFFF75D7FFFF56CEFFFF56CEFFFF56CEFFFF75D7FFFF2AC0FFFFFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF002BC0FFFF68D8FFFF69D8FFFF68D8FFFF69D8FFFF68D8FFFF2BC0FFFFFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF0028AAE0AC3EC9FFFF76E0FFFF7BE2FFFF76E0FFFF3EC9FFFF28AAE0ACFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF000000001E28AAE0AC2BC0FFFF2ABFFFFF2BC0FFFF28AAE0AC0000001EFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00000000000000001E0000003300000033000000330000001E00000000FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF0000000000DADADA97D9D9DAFFD9D9D9FFD9D9DAFFDADADA9700000000FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00DADADA97DADADBFFE5E5E4FFE6E6E4FFE5E5E4FFDADAD9FFDADADA97FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00D9DADAFFE6E6E5FFDBDBD9FFDADAD8FFDBDBD9FFE6E6E5FFD9DADAFFFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00D9DADAFFE2E1E0FFDBDAD9FFDBDAD9FFDBDAD9FFE2E1E0FFD9DADAFFFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00D9DADAFFE2E1E0FFE3E2E0FFE2E1E0FFE3E2E0FFE2E1E0FFD9DADAFFFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00BFBFBFACDDDDDDFFE8E7E6FFE9E8E7FFE8E7E6FFDDDDDDFFBFBFBFACFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF000000001EBFBFBFACD9D9D9FFD9D9D9FFD9D9D9FFBFBFBFAC0000001EFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00000000000000001E0000003300000033000000330000001E00000000FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF003B85CC003B85CC003B85CC003B85CC003B85 - CC003B85CC003983CA213384CDFF3384CDFF3983CA213B85CC003B85CC003B85 - CC003B85CC003B85CC003B85CC003B85CC003B85CC003B85CC003B85CC003B85 - CC003983CB00337EC7CF84C3F1FF84C3F1FF337EC7CF3983CB003B85CC003B85 - CC003B85CC003B85CC003B85CC003B85CC003B85CC003B85CC003B85CC003A84 - CB003580CA6D5398D7FFC1F0FFFFC1F0FFFF5398D7FF3580CA6D3A84CB003B85 - CC003B85CC003B85CC003B85CC003B85CC003B85CC003B85CC003B85CC003882 - CA0A3A83CBFFB2E5FFFF9EC8DEFF9EC8DEFFB2E5FFFF3A83CBFF3882CA0A3B85 - CC003B85CC003B85CC003B85CC003B85CC003B85CC003B85CC003983CB00337E - C8CF86BEEAFFA4ECFFFF6C5D53FF6C5D53FFA4ECFFFF86BEEAFF337EC8CF3983 - CB003B85CC003B85CC003B85CC003B85CC003B85CC003A84CC003580C9585797 - D5FFC6F3FFFF3ACAFFFF6C5B54FF6C5B54FF3ACAFFFFC6F3FFFF5797D5FF3580 - C9583A84CC003B85CC003B85CC003B85CC003B85CC003882CA003C82C9FFC1E8 - FDFF50CCFFFF27C5FFFF69554CFF69554CFF27C5FFFF50CCFFFFC1E8FDFF3C82 - C9FF3882CA003B85CC003B85CC003B85CC003983CB00337EC8BB90BFE6FF6FD7 - FFFF32C3FFFF34CBFFFF644B3FFF644B3FFF34CBFFFF32C3FFFF6FD7FFFF90BF - E6FF337EC8BB3983CB003B85CC003A84CC003680C9445B97D4FF9EE8FFFF38C7 - FFFF3DC8FFFF3DCFFFFF4BBCE9FF4BBCE9FF3DCFFFFF3DC8FFFF38C7FFFF9EE8 - FFFF5B97D4FF3680C9443A84CC003982CB003F82C9FFA3E0FAFF40CFFFFF44CE - FFFF46CFFFFF44D6FFFF775C50FF775C50FF44D6FFFF46CFFFFF44CEFFFF40CF - FFFFA3E0FAFF3F82C9FF3982CB003880C9947AB8E4FF52DBFFFF4BD5FFFF4DD5 - FFFF4DD6FFFF4BDCFFFF67493FFF67493FFF4BDCFFFF4DD6FFFF4DD5FFFF4BD5 - FFFF52DBFFFF7AB8E4FF3880C9943B86CDFF55E3FFFF55E3FFFF56E1FFFF56E1 - FFFF56E2FFFF56E5FFFF55E9FFFF55E9FFFF56E5FFFF56E2FFFF56E1FFFF56E1 - FFFF55E3FFFF55E3FFFF3B86CDFF3A82CAFF397FC8FF387DC7FF387CC7FF397C - C7FF397CC7FF387DC7FF387EC9FF387EC9FF387DC7FF397CC7FF397CC7FF387C - C7FF387DC7FF397FC8FF3A82CAFF000000330000003300000033000000330000 - 0033000000330000003300000033000000330000003300000033000000330000 - 0033000000330000003300000033FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF006A85 - FC236984FA7D6782F9DB6580F7F3637EF5F3617CF3DB5F7AF17D5D77EF23FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF006984FA536882 - F9E66E83EEFF92A6F4FFA0B4F8FFA0B4F8FF91A6F3FF687DE9FF5973EBE65671 - E953FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF006883F9536681F8F48497 - F1FFA9BDFBFF8AA3F8FF6B89F6FF6B89F6FF89A2F8FFA8BCFAFF7F92ECFF526C - E4F44F69E253FFFFFF00FFFFFF00FFFFFF006781F822657FF6E58397F0FFA9BD - FBFF6382F5FF6382F5FFFFFFFFFFFFFFFFFF617EF3FF607CF3FFA6B9F9FF7B8D - EAFF4A64DEE54862DB22FFFFFF00FFFFFF00637EF57E6C81ECFFA9BDFBFF6382 - F5FF6281F5FF6280F4FFFFFFFFFFFFFFFFFF5F7AF1FF5F78F0FF5D76EFFFA5B5 - F8FF5D70DDFF435DD77EFFFFFF00FFFFFF005F7AF1DB91A6F3FF88A1F8FF6280 - F4FF617EF3FF607CF3FFFFFFFFFFFFFFFFFF5D76EFFF5C73EEFF5B70ECFF8293 - F1FF8998ECFF3E58D2DBFFFFFF00FFFFFF005B76EDF6A1B6F8FF6784F4FF607C - F3FF5F7AF1FF5F78F0FFFFFFFFFFFFFFFFFF5B70ECFF5A6EEBFF596CEAFF5F6F - E9FF9BA8F1FF3A53CEF6FFFFFF00FFFFFF005771E9F6A0B3F7FF6580F2FF5F78 - F0FF5D76EFFF5C73EEFFD3D9FAFFFFFFFFFF596CEAFF5869E8FF5767E7FF5D6C - E7FF99A5F1FF354FCAF6FFFFFF00FFFFFF00526DE5DB8E9FF0FF8499F4FF5C73 - EEFF5B70ECFF5A6EEBFF909DF1FFA6AFF3FF5767E7FF5665E6FF5562E5FF7D89 - EBFF8591E7FF314AC6DBFFFFFF00FFFFFF004E68E17E6073E0FFA4B3F7FF5A6E - EBFF596CEAFF5869E8FFFFFFFFFFFFFFFFFF5562E5FF5461E3FF535FE2FF9FA9 - F2FF5061D1FF2D46C27EFFFFFF00FFFFFF004963DC224660DAE57888E6FFA3B0 - F5FF5767E7FF5665E6FF8992EDFF8892ECFF535FE2FF525DE1FF9FA9F2FF6F7D - DDFF2B44C0E52942BE22FFFFFF00FFFFFF00FFFFFF00425CD5533F59D3F47584 - E3FFA1ACF4FF7F8BECFF5C67E4FF5B66E3FF7D87EAFF9FA8F1FF6F7CDDFF2943 - BFF42741BD53FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF003A54CF533852 - CCE65264D4FF8490E7FF95A0EEFF959FEDFF838EE5FF4C5DCEFF2841BDE6263F - BB53FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00334D - C823314BC67D2F48C4DB2C46C2F32A44C0F32842BEDB2640BC7D243EBA23FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00 - } - end end diff --git a/src/ce_symlist.pas b/src/ce_symlist.pas index 7f16b76e..d0bcdede 100644 --- a/src/ce_symlist.pas +++ b/src/ce_symlist.pas @@ -107,7 +107,6 @@ type TCESymbolListWidget = class(TCEWidget, ICEDocumentObserver, ICEEditableOptions) btnRefresh: TCEToolButton; - imgList: TImageList; Tree: TTreeView; TreeFilterEdit1: TTreeFilterEdit; procedure btnRefreshClick(Sender: TObject); @@ -117,6 +116,7 @@ type procedure TreeFilterEdit1MouseEnter(Sender: TObject); procedure TreeKeyPress(Sender: TObject; var Key: char); private + fImages: TImageList; fHasToolExe: boolean; fToolExeName: string; fOptions: TCESymbolListOptions; @@ -299,7 +299,7 @@ begin if Dest is TCESymbolListWidget then begin widg := TCESymbolListWidget(Dest); - // + widg.updaterByDelayDuration := fAutoRefreshDelay; widg.fRefreshOnFocus := fRefreshOnFocus; widg.fRefreshOnChange := fRefreshOnChange; @@ -310,7 +310,7 @@ begin widg.fSortSymbols := fSortSymbols; widg.fSmartExpander := fSmartExpander; widg.fDeep := fDeep; - // + widg.fActAutoRefresh.Checked := fAutoRefresh; widg.fActRefreshOnChange.Checked:= fRefreshOnChange; widg.fActRefreshOnFocus.Checked := fRefreshOnFocus; @@ -323,12 +323,13 @@ end; constructor TCESymbolListWidget.create(aOwner: TComponent); var fname: string; + i: integer; begin fAutoRefresh := false; fRefreshOnFocus := true; fRefreshOnChange := false; checkIfHasToolExe; - // + fActCopyIdent := TAction.Create(self); fActCopyIdent.OnExecute:=@actCopyIdentExecute; fActCopyIdent.Caption := 'Copy identifier'; @@ -353,11 +354,65 @@ begin fActSelectInSource := TAction.Create(self); fActSelectInSource.OnExecute := @TreeDblClick; fActSelectInSource.Caption := 'Select in source'; - // + inherited; + // allow empty name if owner is nil fSyms := TSymbolList.create(nil); - // + + fImages := TImageList.Create(self); + case GetIconScaledSize of + iss16: + begin + Tree.DefaultItemHeight:= 20; + fImages.Width:= 16; + fImages.Height:= 16; + fImages.AddResourceName(HINSTANCE, 'BULLET_BLACK'); + fImages.AddResourceName(HINSTANCE, 'BULLET_BLUE'); + fImages.AddResourceName(HINSTANCE, 'BULLET_GREEN'); + fImages.AddResourceName(HINSTANCE, 'BULLET_ORANGE'); + fImages.AddResourceName(HINSTANCE, 'BULLET_PINK'); + fImages.AddResourceName(HINSTANCE, 'BULLET_PURPLE'); + fImages.AddResourceName(HINSTANCE, 'BULLET_RED'); + fImages.AddResourceName(HINSTANCE, 'BULLET_YELLOW'); + fImages.AddResourceName(HINSTANCE, 'WARNING'); + fImages.AddResourceName(HINSTANCE, 'WARN_RED'); + end; + iss24: + begin + Tree.DefaultItemHeight:= 28; + fImages.Width:= 24; + fImages.Height:= 24; + fImages.AddResourceName(HINSTANCE, 'BULLET_BLACK24'); + fImages.AddResourceName(HINSTANCE, 'BULLET_BLUE24'); + fImages.AddResourceName(HINSTANCE, 'BULLET_GREEN24'); + fImages.AddResourceName(HINSTANCE, 'BULLET_ORANGE24'); + fImages.AddResourceName(HINSTANCE, 'BULLET_PINK24'); + fImages.AddResourceName(HINSTANCE, 'BULLET_PURPLE24'); + fImages.AddResourceName(HINSTANCE, 'BULLET_RED24'); + fImages.AddResourceName(HINSTANCE, 'BULLET_YELLOW24'); + fImages.AddResourceName(HINSTANCE, 'WARNING24'); + fImages.AddResourceName(HINSTANCE, 'WARN_RED24'); + end; + iss32: + begin + Tree.DefaultItemHeight:= 36; + fImages.Width:= 32; + fImages.Height:= 32; + fImages.AddResourceName(HINSTANCE, 'BULLET_BLACK32'); + fImages.AddResourceName(HINSTANCE, 'BULLET_BLUE32'); + fImages.AddResourceName(HINSTANCE, 'BULLET_GREEN32'); + fImages.AddResourceName(HINSTANCE, 'BULLET_ORANGE32'); + fImages.AddResourceName(HINSTANCE, 'BULLET_PINK32'); + fImages.AddResourceName(HINSTANCE, 'BULLET_PURPLE32'); + fImages.AddResourceName(HINSTANCE, 'BULLET_RED32'); + fImages.AddResourceName(HINSTANCE, 'BULLET_YELLOW32'); + fImages.AddResourceName(HINSTANCE, 'WARNING32'); + fImages.AddResourceName(HINSTANCE, 'WARN_RED32'); + end; + end; + Tree.Images := fImages; + TreeFilterEdit1.BorderSpacing.Left:= ScaleX(30,96); fOptions := TCESymbolListOptions.Create(self); fOptions.Name:= 'symbolListOptions'; @@ -365,7 +420,7 @@ begin if fname.fileExists then fOptions.loadFromFile(fname); fOptions.AssignTo(self); - // + ndAlias := Tree.Items[0]; ndClass := Tree.Items[1]; ndEnum := Tree.Items[2]; @@ -380,23 +435,23 @@ begin ndVar := Tree.Items[11]; ndWarn := Tree.Items[12]; ndErr := Tree.Items[13]; - // + Tree.OnDblClick := @TreeDblClick; Tree.PopupMenu := contextMenu; - // + EntitiesConnector.addObserver(self); end; destructor TCESymbolListWidget.destroy; begin EntitiesConnector.removeObserver(self); - // + killProcess(fToolProc); fSyms.Free; - // + fOptions.saveToFile(getCoeditDocPath + OptsFname); fOptions.Free; - // + inherited; end;