From 451e903f9a7821c7ef82c5d2411e90a629b53ed8 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Sat, 26 Dec 2015 01:32:07 +0000 Subject: [PATCH] CMM: minor optimizations, Eolite: better about window git-svn-id: svn://kolibrios.org@6005 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/browser/download_manager.h | 2 +- programs/cmm/browser/http_downloader.h | 4 +- programs/cmm/eolite/imgs/left_p.txt | 36 +--------------- programs/cmm/eolite/imgs/logo8b.raw | Bin 7225 -> 0 bytes programs/cmm/eolite/imgs/png/Eolite-Sun.png | Bin 3469 -> 3032 bytes programs/cmm/eolite/include/about.h | 45 +++++++------------- programs/cmm/lib/obj/http.h | 34 ++++++--------- 7 files changed, 33 insertions(+), 88 deletions(-) delete mode 100644 programs/cmm/eolite/imgs/logo8b.raw diff --git a/programs/cmm/browser/download_manager.h b/programs/cmm/browser/download_manager.h index 58f92e42e1..9667d1ed60 100644 --- a/programs/cmm/browser/download_manager.h +++ b/programs/cmm/browser/download_manager.h @@ -82,7 +82,7 @@ void Downloader() if (downloader.state == STATE_COMPLETED) { strcpy(#filepath, #save_to); - strcat(#filepath, #downloader.url+strrchr(#downloader.url, '/')); + strcat(#filepath, #save_to+strrchr(#save_to, '/')); if (WriteFile(downloader.bufsize, downloader.bufpointer, #filepath)==0) sprintf(#notify_message, "%s%s%s",FILE_SAVED_AS,#filepath,"' -Dt"); else diff --git a/programs/cmm/browser/http_downloader.h b/programs/cmm/browser/http_downloader.h index aaa040da8f..3b50549b09 100644 --- a/programs/cmm/browser/http_downloader.h +++ b/programs/cmm/browser/http_downloader.h @@ -6,7 +6,6 @@ enum { }; struct DOWNLOADER { - char url[10000]; int data_downloaded_size, data_full_size; dword bufpointer, bufsize; byte state; @@ -20,8 +19,7 @@ struct DOWNLOADER { dword DOWNLOADER::Start(dword _url) { state = STATE_IN_PROGRESS; - strcpy(#url, _url); //need to replace my malloc() - http_get stdcall (#url, 0, 0, #accept_language); + http_get stdcall (_url, 0, 0, #accept_language); http_transfer = EAX; return http_transfer; } diff --git a/programs/cmm/eolite/imgs/left_p.txt b/programs/cmm/eolite/imgs/left_p.txt index cbe86f6280..a1d6c536cb 100644 --- a/programs/cmm/eolite/imgs/left_p.txt +++ b/programs/cmm/eolite/imgs/left_p.txt @@ -22,38 +22,4 @@ unsigned char devices[18*204]= FROM "imgs\dev.raw"; unsigned char factions[14*39] = FROM "imgs\actions.raw"; -unsigned char logo[7225] = FROM "imgs\logo8b.raw"; - -dword logo_pal[]= {0x8096C0,0x7D93BC,0x7D76B0,0x8094BE,0x7C83B3,0x7D0C82, -0x7B73AC,0x7B90B7,0x7D7AB0,0x8C1B8C,0x74378B,0x7488AE,0x7C8EB8,0x846BAB, -0xAF63B0,0x821C89,0x697A9C,0x768AB1,0x8B66A9,0xBF80BF,0x993399,0x6B5C90, -0x975EA9,0xC48BC4,0xA955A9,0x72438B,0x7083A7,0x798DB5,0xA45CAA,0xC993C9, -0xB164B1,0x793A8C,0x8185B5,0xB46CB5,0xC791C7,0xB873B8,0x84328F,0x7D54A0, -0x840B84,0x82238B,0x7C539D,0x8A4C9F,0x8C3B95,0x637393,0x824399,0x9D409D, -0x942B94,0x83288E,0x7B599E,0x833C94,0xA043A0,0x8B4194,0xA264AA,0xAC5BAC, -0x9C3B9C,0x7982AE,0x861588,0xBC7BBC,0x7E4C90,0xAC6AB0,0xC083C0,0x7F4199, -0xA650A6,0x68628B,0x7D73A6,0xB670B7,0x95449A,0x7D6BAA,0x953195,0x8B5C9B, -0x60708E,0x8E519F,0x835598,0x7E65A9,0x7E2D91,0x7D5AA2,0x64648A,0xAD61AE, -0x8B3594,0x8D218E,0x796BA5,0x902390,0x735B90,0x7384AA,0x756294,0xA752A8, -0x76669F,0x8C2A91,0x965DA1,0x5D6C89,0x6C7EA2,0x8175AF,0x7474A5,0xB773B8, -0x6E80A4,0x9254A2,0x814D9B,0x6B6B98,0x832F91,0x9F60A7,0x8D419A,0x6B6992, -0x933A9A,0x8089B6,0x9C52A3,0x696492,0xA44AA4,0x606A8B,0x666690,0x75689F, -0x79498E,0x7D3492,0x8C2791,0x795390,0x71709C,0x964E9D,0x7E1E89,0x7B2A8B, -0x95539E,0x9C4A9B,0x645B88,0x7C4C9C,0x8E5FA8,0x891489,0x7D238B,0x824D95, -0x963398,0x6B5A8A,0x774B94,0x810481,0x7A7CAE,0x7C2386,0x814494,0x753B89, -0x861186,0x6F3C85,0x7C3D94,0x782D86,0x5C6B87,0x7C63A5,0x685187,0x6B5089, -0xA4499B,0xB9656E,0xC77647,0xD08131,0xD1842C,0x8060A3,0xAB528D,0xCA7937, -0xDE9408,0xE19808,0xE3A01C,0xE6AB36,0xE4A426,0xE29D14,0x655785,0x745A9A, -0xBC6655,0xE6AE42,0x705593,0x717AA4,0x843291,0x7B308E,0xA34285,0x694B86, -0x7F0280,0x7667A0,0x743484,0x615A85,0x7478A8,0x676892,0x703C86,0x9A3290, -0x862186,0x6E5491,0x6F3E89,0xAD5066,0x764F98,0xC06947,0xCE8031,0x6F75A1, -0xE3DEE0,0xE1DCDE,0xDAD5D7,0xC0ABBD,0x7F027F,0xBF6948,0x914490,0xCAC5C8, -0xB38CB1,0xAA4964,0xE8B247,0xA887A6,0xD4CDD1,0xB089AE,0x8E1C84,0xE09F26, -0xEAB855,0x8B328B,0xB7A9B5,0xD1CBCE,0xA677A5,0x8C2C8B,0x942577,0xC6BAC4, -0xC1BABE,0xB09BAD,0x966695,0x883387,0x978495,0x987997,0x8D458D,0x985A97, -0xB88AB6,0xAD6EAB,0x9D5C9C,0xCC8048,0x90468F,0xBAB5B7,0x851B85,0xA86AA6, -0xC09EBE,0x943A94,0x882387,0x9E519D,0xBB96B9,0x8D3B8C,0x924C91,0x9A327D, -0xC77C59,0xB0AAAD,0x872887,0xA599A3,0xB682B4,0xA0869E,0x935292,0x922488, -0xB1576D,0xD49256,0x8F558E,0xAAA5A7,0xC39BC1,0xC6A8C4,0xA763A5,0xB47CB3, -0x925A91,0x90578F,0xA09B9D,0xA06F9F,0x9E949C,0xB077AE,0xA66EA5,0xA75FA5, -0xB98EB8}; \ No newline at end of file +unsigned char logo[] = FROM "imgs\logo.raw"; \ No newline at end of file diff --git a/programs/cmm/eolite/imgs/logo8b.raw b/programs/cmm/eolite/imgs/logo8b.raw deleted file mode 100644 index 00b6c9667a461ecd9a3d2c95d49d246dc6679076..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7225 zcmb`K4SW;j9mgB45Mn}TZCyL!q9KwxN)8C7B(n>)oZV25A5xb3t5|1L?BGzn%O|DbpG zynLVE^M84skd>98$;QZJM22&&F`OW>$BvVK!Biq^yy7~gN_LI4GwUX@Ca5Ro+|w&P|7p(Dv@?PL42v8@XM1lX$OtoJOMVkHQGYl_!aF?0vxfaT%D=jT3Exog1l038Mi_~xAc#yABpXyK#99pFPSI>ssYs+sj!zY?n+fb=i ztL;?}7dyvISy42xe#IkjV`0u^5x=N)-H`H3BxH}80HxL1&5t=7?P{&rCVpa*)@)Wo z`>N%?oKBY1+G>rIi>bf$ao|o^W~NrBE;T|n-2_t+TJ^+Kvt4bstML;IMB=CM$vRV^ zS+c@fk{w%r|5BT|R`D=IHdUZNso87?Gn;KN8Q z!G{y&X=7wg$OYn8l#ns9rx0<*F@nSuzaMUfCom*s#rM}eE z+_IsywRK}#bJI&BSd*#p*K3M%s%xCiTum~WVi6PB^Eb_GEGe1lTHd3OVc_L zYcv`ulB6d-y;v@vTQnm+n?zvtym|BBHj=4Sn#Gp<{E`y*3s^K@;?^U!v8AO+>VOe2 zj&dk|S4lsbql}Fb$QwVU$U-|vN9BteIZ%I3Hs&K&vi25$Zj3SbZjW@rxW-0`a;z+d zlO!hevbie_3I|D2RDM2H3Adc;ah5`=WG^=Zq%DTI0lu4Gj&$SGQS^rjxL;!n^bt2p zFC@Vz@DNEpHe0UwV-X1}NCuk++c08n_}vulr5u0SvSrKY9L;{^zCS?!QuT{^-;B~&1B(+}9RklqP%%%Ae~V!N3fL(3?Fe&c*ziyR?AxM37ZPDS zOkFfq#QBT#T@J2pvJT-k8S@ALTgh2!ORyLTMhD?}3t zUpR{CIPDePDNRFwLh=5Yumg7PJoCQPBw{VcSr|Lu^LTuFPj4N|jAhUE2L=avd~wio z^sa$m@ce~S{ay=D!}H-h_~64c7cX8s^Wg{4!W5~2OCYraqRxASU}$hK6dDNj2=P_G zeIx|^g3sp<4$@JkRO8|)6Mh}h+C2~et(JxZe!%(!0p`L234!9E3A%?q7B??WMo`SL zpi#~V~%r2haTGf=T0=#Nr8_rW0CldScz(Jo$e9*LELiEv=?2= zeIzARdMHvOQjZ5QO0egIEk`58ai4@MbOZ|X6NSbog~B?IRfHDB#J_OoAcdipFr(04 zq8f;NGAj1L5S9(3**M_2Avac=1VyR{O_T~t#O$7BFZ6g)iA1Ky;NCGJHLSI}86fi@Co-QmoNWTW$ zW_Ryp5Eo9+-YWn-91>2rppIGAGVD*Cp>KHH#|J|_m~T)Rn0i=oeh8NL^3_lSjXwu~ zMt2W)!ZLk9AJ!ZQ^@fD_b1p8SJ}Msw3Q%R(h-oL5+(}n=-|#?iy8{J_76`os>kRjJ z&LPrZ2n_hr1Rt&uNaMJ5IPNpol@J^{RS~43`)be+yB`qvqX0D+j$G|Ym=sUI!yv8& z1n*}DVX1RbCfz$Acs_P{2YkE$cRt)uX?HK~Ii88-;OG+gA&fI{;eVGyc*HfhuE0&S z5SWI3z$ebS#y7{GgwQo2RJ2crAt^cDb5OCJ=RZTJH<-?)$?*W-_lpMsYjGV3025pU zja^+l?^6Jj4P~qp(}1TS%E&#{D`p(5jycD}E&$3LPJf=H&^p8#5ZWCWh8TrIi75xm z{Tpx4J(0%b^OLr6pWr5sTporiGX5Y2FYIC&hV4pspd@E<{{iTc-cS&KdBhI^>h=zX zIh(lyxB~zUgp&UB0^bUIJKP83Z{+xulYVjkh239;lPE!^I2hAQ=;{=bb|%G1joc6< zBa}@tCX7I=Cv&HIEKJ(65fdSes$^XpU(Q_kKguQNTW;OBBZ>xp7-r%$5}`yg1SI*s zO!}Susabki<rC+%A81efew?7f`7?pLF#YoltJdQ6rH zi*3SYnm6~Kdcn42vmMwR3}-52YLN(8B}2ZKLpDLyKsKL1HtAwNn-qSw%WpEIHap~h zGE_I2@|(SgO_m-xgJI=i@X#f< zz%YPM3j8M^ww=;fsZgYIq|1I_KLG6dBV#}VTB;ZT_|VefRHz&MJsh31p+_5f^qKu{%6 zR4D{iN+gJu_(%97N`c*N!@uUw;64>x8uz}c+|2h9(6BU%>8Srd;k*-ds0p#px z004-j*jk#qT_rc>i(6FN$R-Y=Y&~bKZrwuR@+Vur4D*XBvQS%F$G;eMTc|TvxLn1y zo`vP`+4cZ#&)gWHa=tH4`_;p@Sr4WQ(;WwYIE549%yN=TTm7~Sb2hkLCn~s?yuY+% zXOlBSi#`!2CkLE7N~GTjSudWK_|!702R&elYa?2vwN-G7(i~5>X}r69)WBb>p3CJ% z^5R3Q%!V(vT^H{yDKT3&UDR+4%Y9|DReVev2@gK(!Jo6XlJ>Cv0A6_6FqWx$=wYTs z;{jLs-YSFOZ|{g~#urHekX}nJ6qh;S!a}R+pBKqu{nErihiV}fJ;b&_GK0q^O z(iNZ1U!yLlJRN^4!%Ujn*`M53)+F$p92@+P{U|}YnGy$~;*e*H6v=d$=r^yS~{A z@S-MC6ul|S$Yr zTr~L=sHc5T6v?0v#&vLRN*iYMes_|Cdulnp4?$`3y%a1$cues&zlz0LyMP#I5sD6KuY^Ly~!5@Q7#VQtT4*(N@?2JZY z|FWOszGxzn_-5^kv3}3@%+wndU$s$#<6ugI-2OiI zrkG<|y+_lV-W?J;-pxFrbfG(tEcxO0HO6Gk@q)XImQMLQ_9Nj%`%_!B4|sn6E74J{ zXza5$!j=%GkwXs|=g@g7F*JxAafvx~v5x zTE^BccY4r<^TU^vGI$BZ5$S_FAG?ofQ+^HU6eEU()!{7$O4w((#<@~m6%`eCO*M_A zLQZF?M{We)y-P|$7oA+*h6j;$Td(dhPPA}~UdfU+A6nV)5gbLY(!y_1#@}$ybqh5) z`eq^aaAaMz4biQZHdXT}Th>ed>kI<>wYTT=*~B+DBlfw-R4@`Hs-q`D#Qa3YJq2yu zCUG3R!Rt&XFXCqlMAnJRiE%SQK7TXc+~{qT7LOVfuEl&56Zv&ERfs8Y)_`tb6QOB% z-KAo10iNG~crg0j>E+Qw^pj4?yP75W$H_QvwI3@(=2ud8S(PN3ZN;vyeB1oCnRh*z zFmmd8!u`BszV!zqfp-gEVLfIU_9~dnzjZo2i@dh3t_#pJgFf_&Jsw#o&iiiDk=#+1 zdpcq_^EZjQ@l6BeBF4?~f)oVU5X1cIqw_BLj1w0NJzvQSGWl0lRvwLXzF*$>2EnM6 zt$wW~1gmHoWvRqiAHNmg(VvKq?W2(U>#ux0$q=K%?)SBO?$tdNYgv`YKZK8+bs&xe z)`p~_p>*Rp8Bg^(mH6(4(OZ+%zTWSXTK`sDk)ve7%qRWgK5HKltM%=~F9q<<&HO?c z4Ph+=#4?><%zPBB%Ke7oL@;h{OpwJ@swvayLv>mYXE~hyn;OJ33P?O~;nr3C=c{rQ zcDBcr&W>VNb|sYG(WN!H!S_TA+)$t_9BrjLw?hhQYMlNH%0b`8ZhS47s*D~vjGs#E zK=%y|SmrF7ndhV}{d2xFNshSt5#xFw>GffV%lV>)NZ3_OF?@=ssb-?Q!#~UZW|AA- z4vC!LtDh>tJyxGxURjqYcqTunzJq3NE102Ib6Z_v8FJ%1e3i)8-l8i1(+_*v04cZM zvbH^e@1XT>>I;#>UfI0$Yf`F-I71&QmqC4ziRgamT&0aO?yAuAp9((P(?*$?cOwTo zo653VSYARCow0CzE8K3)I|Ces&LU};5*PAv@(yR{L|v#rGvVnF1Ct9*P>Q5;XYd1RD6?x%G@WKr=U*O;x=|zJ*f$l8z;DjkW#!J=*W@YcO6eX@<~!C z>!<@yj25?#S6?l*pME6fjG#X5@gc;|A+`0B`a9xv(kvdpk|-^0Nu|uBc~{2h%PRw2 zAeCnb#`&EN)i?V5wzj4v9ewu5*57F;=?1NPeik4?elitaP>KkAP>_-(W9*pk% zm}d<|2$W4B6G**! z{^u5r+4P~E8KUA52!rv-tu^-pjdiAngMzCKD{1M9{F76en1M42D~FFYJ|w|0sHzc| z!j!wsrY06h_ipZkYSfRCWbSrW(oP5oHdrXJO|cNwx`4=wk9WyVu3LvUH5Fk;pQ4Of z*F|Z;$_Xd%GO!;;b_?#IAJfQ8*T%BK&7zX!dKOP_vWz92x>4>i chZWIv81%N====gwWBci4Yvp8Fd(u1UKXq#^lK=n! literal 3469 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 diff --git a/programs/cmm/eolite/include/about.h b/programs/cmm/eolite/include/about.h index 0991deb31e..8333113b9a 100644 --- a/programs/cmm/eolite/include/about.h +++ b/programs/cmm/eolite/include/about.h @@ -1,23 +1,14 @@ -//Leency 2008-2013 +//Leency 2008-2016 #define BROWSER_PATH "/sys/network/webview" -#define BROWSER_LINK "http://kolibri-n.org/index.php" +#define BROWSER_LINK "http://kolibri-n.org/inf/eolite/eolite_p1" #ifdef LANG_RUS - ?define INTRO_TEXT_1 "О Eolite" - ?define INTRO_TEXT_2 "Разработчики:" - ?define INTRO_TEXT_3 "Посетите" - ?define INTRO_TEXT_4 "Закрыть" -#elif LANG_EST - ?define INTRO_TEXT_1 "Programmis Eolite" - ?define INTRO_TEXT_2 "Arendajad:" - ?define INTRO_TEXT_3 "K№lasta" - ?define INTRO_TEXT_4 "Sulge" + ?define DEVELOPERS_TEXT "Разработчики:\nLeency Veliant PunkJoker Pavelyakov\nKolibriOS Team\n2008-2016" + ?define CLOSE_BUTTON_TEXT "Закрыть" #else - ?define INTRO_TEXT_1 "About Eolite" - ?define INTRO_TEXT_2 "Developers:" - ?define INTRO_TEXT_3 "Visit" - ?define INTRO_TEXT_4 "Close" + ?define DEVELOPERS_TEXT "Developers:\nLeency Veliant PunkJoker Pavelyakov\nKolibriOS Team\n2008-2016" + ?define CLOSE_BUTTON_TEXT "Close" #endif void about_dialog() @@ -25,8 +16,7 @@ void about_dialog() byte id; proc_info about_form; - IF (active_about){cmd_free = 2;ExitProcess();} - active_about=1; + if (active_about) {cmd_free=2;ExitProcess();} else active_about=1; loop() switch(WaitEvent()) { case evButton: @@ -37,7 +27,7 @@ void about_dialog() cmd_free = 2; ExitProcess(); } - IF (id==23) RunProgram(BROWSER_PATH, BROWSER_LINK); + IF (id==11) RunProgram(BROWSER_PATH, BROWSER_LINK); break; case evKey: @@ -50,18 +40,15 @@ void about_dialog() break; case evReDraw: - DefineAndDrawWindow(Form.left+Form.width/2,Form.top+Form.height/2-114,300,248+GetSkinHeight(),0x34,system.color.work,INTRO_TEXT_1); + DefineAndDrawWindow(Form.left+Form.width/2,Form.top+Form.height/2-114,440,200+GetSkinHeight(),0x34,system.color.work,0); GetProcessInfo(#about_form, SelfInfo); if (Form.status_window>2) break; - DrawBar(0,0,about_form.cwidth,50,0x8494C4); - PutPaletteImage(#logo,85,85,about_form.cwidth/2-43,7,8,#logo_pal); - WriteTextB(-strlen(ABOUT_TITLE)*12+about_form.cwidth/2,100,0x81,0xBF40BF,ABOUT_TITLE); - WriteTextCenter(0,130,about_form.cwidth,0,INTRO_TEXT_2); - WriteTextCenter(0,143,about_form.cwidth,0,"Leency Veliant PunkJoker Pavelyakov"); - WriteTextCenter(0,156,about_form.cwidth,0,"KolibriOS Team"); - WriteTextCenter(0,169,about_form.cwidth,0,"2008-2015"); - WriteTextCenter(10,182,about_form.width-125,0,INTRO_TEXT_3); - DrawLink(about_form.cwidth/2-15,182,0x80,23, "kolibri-n.org"); - DrawFlatButton(about_form.cwidth/2-35,about_form.cheight-35,70,22,10,0xE4DFE1, INTRO_TEXT_4); + _PutImage(10, 15, 86, 86, #logo); + WriteTextB(110,15,0x81,0xBF40BF,ABOUT_TITLE); + WriteTextLines(110,53,10010000b,0,DEVELOPERS_TEXT,21); + #ifdef LANG_RUS + DrawFlatButton(about_form.cwidth-250,about_form.cheight-35,130,22,11,0xE4DFE1,"История разработки"); + #endif + DrawFlatButton(about_form.cwidth-100,about_form.cheight-35,70,22,10,0xE4DFE1,CLOSE_BUTTON_TEXT); } } diff --git a/programs/cmm/lib/obj/http.h b/programs/cmm/lib/obj/http.h index a0c24594d3..5a1c1dcf78 100644 --- a/programs/cmm/lib/obj/http.h +++ b/programs/cmm/lib/obj/http.h @@ -1,7 +1,6 @@ -//HTTP library #ifndef INCLUDE_LIBHTTP_H #define INCLUDE_LIBHTTP_H -#print "[include ]\n" +#print "[include