From 02e226cd9a6fbf94c24bfe656c5f55de8cca9eb6 Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Sun, 14 Oct 2018 18:05:52 +0000
Subject: [PATCH] ftpc 0.12a: - bigger fonts in editbox - press enter to login
 - compressed images: 3 sectors instead of 5, system icons

git-svn-id: svn://kolibrios.org@7464 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/network/ftpc/ftpc.asm      |   4 +--
 programs/network/ftpc/gui.inc       |   4 +--
 programs/network/ftpc/login_gui.inc |  47 +++++++++++++++++++---------
 programs/network/ftpc/tl_nod_16.png | Bin 712 -> 325 bytes
 programs/network/ftpc/tl_sys_16.png | Bin 1425 -> 700 bytes
 5 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/programs/network/ftpc/ftpc.asm b/programs/network/ftpc/ftpc.asm
index 35c61172b5..02a3200e9a 100644
--- a/programs/network/ftpc/ftpc.asm
+++ b/programs/network/ftpc/ftpc.asm
@@ -749,8 +749,8 @@ exit2:
 
 
 ; data
-str_title       db 'FTP client',0
-str_welcome     db 'FTP client for KolibriOS v0.12',10
+str_title       db 'FTP client for KolibriOS',0
+str_welcome     db 'FTP client for KolibriOS v0.12a',10
                 db 10,0
 str_srv_addr    db 'Please enter ftp server address.',10,0
 
diff --git a/programs/network/ftpc/gui.inc b/programs/network/ftpc/gui.inc
index 862361b8f7..9eca681fd9 100755
--- a/programs/network/ftpc/gui.inc
+++ b/programs/network/ftpc/gui.inc
@@ -149,7 +149,7 @@ gui: ;//////////////////////////////////////////////////////////////////////////
     .draw:
         mcall   12, 1
         ; main window
-        mcall   0, <35,830>, <20,555>, 0x34000000+SYS_COL, 0x805080DD, hed
+        mcall   0, <35,830>, <20,555>, 0x34000000+SYS_COL, 0x805080DD, str_title
 
         ;-------------------------
         ; textedit components
@@ -867,7 +867,7 @@ search: ;///////////////////////////////////////////////////////////////////////
 
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
-hed             db 'FTP Client - KolibriOS',0
+;hed             db 'FTP Client for KolibriOS',0
 str_change      db 'Change',0
 str_disconnect  db 'Disconnect',0
 str_copy        db 'Copy',0
diff --git a/programs/network/ftpc/login_gui.inc b/programs/network/ftpc/login_gui.inc
index fd644e9d98..8525cab29f 100755
--- a/programs/network/ftpc/login_gui.inc
+++ b/programs/network/ftpc/login_gui.inc
@@ -2,6 +2,13 @@ SYS_COL  = 0xe6e6e6
 BT_COL   = 0xcccccc
 STR_COL  = 0x595959 ;0x000000
 
+WIN_X = 320
+WIN_Y = 300
+WIN_W = 390
+WIN_H = 230
+
+pad = 28 ; padding between editboxes
+
 ;;================================================================================================;;
 login_gui: ;//////////////////////////////////////////////////////////////////////////////////////;;
 ;;------------------------------------------------------------------------------------------------;;
@@ -20,7 +27,7 @@ login_gui: ;////////////////////////////////////////////////////////////////////
   .get_username:
         ; in case of error when either login_gui.server_addr or 
         ; login_gui.get_username is called, should resize window
-        mcall   67, 320, 300, 390, 200 ; resize to login gui window size
+        mcall   67, WIN_X, WIN_Y, WIN_W, WIN_H ; resize to login gui window size
 
   .redraw:
         call    .draw
@@ -30,7 +37,7 @@ login_gui: ;////////////////////////////////////////////////////////////////////
   align 4
   .draw:
         mcall   12, 1
-        mcall   0, <320,390>, <300,200>, 0x34000000+SYS_COL, 0x805080DD, hed
+        mcall   0, <WIN_X,WIN_W>, <WIN_Y,WIN_H>, 0x34000000+SYS_COL, 0x805080DD, str_title
 
         stdcall [edit_box_draw], edit_usr
         stdcall [edit_box_draw], edit_pass
@@ -39,16 +46,16 @@ login_gui: ;////////////////////////////////////////////////////////////////////
         stdcall [edit_box_draw], edit_path
 
         ; draw "connect" button
-        mcall   8, <162,65>, <140,25>, 2, BT_COL
+        mcall   8, <162,65>, <150,25>, 2, BT_COL
 
         ; draw strings
-        mcall   4, <3,5>, 0xb0000000, gui_str_usr
-        mcall   4, <3,25>, 0xb0000000, gui_str_pass
-        mcall   4, <3,45>, 0xb0000000, gui_str_server
-        mcall   4, <3,65>, 0xb0000000, gui_str_port
-        mcall   4, <3,85>, 0xb0000000, gui_str_path
-        mcall   4, <167,145>, 0xb0000000+STR_COL, gui_str_connect
-        mcall   4, <3,115>, 0xb0ff0000, [str_error_addr]
+        mcall   4, <3,      8>, 0xb0000000, gui_str_usr
+        mcall    , <3,pad*1+8>,           , gui_str_pass
+        mcall    , <3,pad*2+8>,           , gui_str_server
+        mcall    , <3,pad*3+8>,           , gui_str_port
+        mcall    , <3,pad*4+8>,           , gui_str_path
+        mcall    , <167,155>, 0xb0000000+STR_COL, gui_str_connect
+        mcall    , <3,115>, 0xb0ff0000, [str_error_addr]
         mov     [str_error_addr], gui_str_null ; reset error string address
 
         mcall   12, 2
@@ -86,6 +93,12 @@ login_gui: ;////////////////////////////////////////////////////////////////////
   .key:
         mcall   2
 
+        cmp     ah,13
+        je      gui.main
+
+        cmp     ah,9
+        je      .tab
+
         stdcall [edit_box_key], edit_usr
         stdcall [edit_box_key], edit_pass
         stdcall [edit_box_key], edit_server
@@ -101,6 +114,10 @@ login_gui: ;////////////////////////////////////////////////////////////////////
   .exit:
         jmp     gui.exit
 
+  .tab:
+        ;TODO
+        jmp     .still
+
 
 gui_str_connect db 'Connect',0
 gui_str_usr     db 'Username:',0
@@ -114,10 +131,10 @@ gui_str_null    db ' ',0
 str_error_addr  dd gui_str_null
 
 ; login window components
-edit_usr edit_box 300,75,5, 0xffffff,0x6f9480,0,0xAABBCC,0,99,param_user,mouse_dd,ed_focus
-edit_pass edit_box 300,75,25,0xffffff,0x6a9480,0,0xAABBCC,0,99,param_password,mouse_dd,ed_pass
-edit_server edit_box 300,75,45,0xffffff,0x6a9480,0,0xAABBCC,0,99,param_server_addr,mouse_dd,0
-edit_port edit_box 50,75,65,0xffffff,0x6a9480,0,0xAABBCC,0,99,param_port,mouse_dd,ed_figure_only
-edit_path edit_box 300,75,85,0xffffff,0x6a9480,0,0xAABBCC,0,99,param_path,mouse_dd,0
+edit_usr    edit_box 300,75,5,      0xffffff,0x94AECE,0,0xAABBCC,0x10000000,99,param_user,mouse_dd,ed_focus
+edit_pass   edit_box 300,75,pad+5,  0xffffff,0x94AECE,0,0xAABBCC,0x10000000,99,param_password,mouse_dd,ed_pass
+edit_server edit_box 300,75,pad*2+5,0xffffff,0x94AECE,0,0xAABBCC,0x10000000,99,param_server_addr,mouse_dd,0
+edit_port   edit_box 50, 75,pad*3+5,0xffffff,0x94AECE,0,0xAABBCC,0x10000000,99,param_port,mouse_dd,ed_figure_only
+edit_path   edit_box 300,75,pad*4+5,0xffffff,0x94AECE,0,0xAABBCC,0x10000000,99,param_path,mouse_dd,0
 
 mouse_dd rd 1
\ No newline at end of file
diff --git a/programs/network/ftpc/tl_nod_16.png b/programs/network/ftpc/tl_nod_16.png
index 5e2d7eb7544508f67f4bdc4d6c2b4e7df1d209e3..845f93f675d4f2bedc667f076e15b16a2bf27e9c 100755
GIT binary patch
delta 299
zcmV+`0o4A;1;ql8BYyw{XF*Lt006O%3;baP00001b5ch_0Itp)=>Px#PEbr#MgRZ*
z?(XvE!9U;M=J)sc`|GCj)O@>*5L{q-{QUgv(sA(g{QT*{`Phf(=<wv^?A6uX%FERK
z`P0dm68-eJ?Z{lk#mR??rT5>Jqoulx&q@OT005OqL_t(2&wriIM-syz3_wu=#sa5O
zg7N(?8iXamc$vTBQAQ}G92FGhd~X+VepwI<3qq5_coOGtD97I3VdxS{VR*kzx-%G(
z0VDz+k^v+FfkdE?2zZ>ey~!}8{tU2rU1N-T5{NnHCcq~l+EE1r-lZdu(?i-$$a3Y2
xV3U1v3@g{6UL;{ncH?kB&`FPg|1!q7_5+lu3;55<b<_X=002ovPDHLkV1jM7m1O_`

delta 689
zcmV;i0#5zK0>}lBBYy#FP)t-s|NsB~{{Q^^|5#Y-Ha5#jO5A>a`B+=+4I$31uE4La
zz*<_yR8-_vTI~l+<pW~xhKRwyz`(!1z@??YN=nI8SnLN)<^X^H0Dk@yJky(-z`eb|
zlas+sP1jOa>jqEf0D%7hY4iX;-wQ_FR$Rlny1-Ue)lgOH1%FZK0B7?6LEr#={sD9N
z5joRwbHT8%z(+^b{r&$>R_g^*=>TQ&07BsafBphy@)<SGBqYfZLf`;o@c={N0CD#w
zG}#h2+W=zl07c>ebonGZ-I9|0P*>*yQ|SOk;sAB}BRk!Phx|fF<OWOS0D1fXcKRVZ
z-FbQYZ*cc5Jb&H;Q|SPG{UAHtczF9}XY(XF-2z+fA3NQKhWlh^?>|T1ii-RD`~Uj-
z|8a5AadFOZanOi}p1HZwi;JM0ownZI|DmC}(9rInptPc*wtRezu&~FnvdXu&(Q$FL
zv9ZXktiynS!FG0#mX@)8ew1!*u4%UCjsO4v0b)x>M1KH?1szBL000SaNLh0L01egv
z01egwkZ*aM00007bV*G`2jT(_5C$0|P?$^r0084jL_t(2&tqU<NKAr(WClh<1_p+d
zR2WEO0E6@l7|0wv0*nZOtn8dz6cu^-1%)UAMa3lv5P{M%FetBJAQ3R4@R%5wSy<VS
zW!X76xqrBM5PV)fegQ!tVG$T#R7_k#Qc6%zT1FPkmy;J)P*hS@;S^L=1DUO^A+DgQ
zrLCZ&tEX=Oj0PiPaRn1oZ3P7dGjj_|pn#RQg0+o=0vOoZ0R`+892}v1CubKX1_oC*
zcPQV((+g~?w~sHF@8=%?aX({VP;dy49~uVb8!9pxhDSvDMMWDT`H(RtHja^j5hwrv
XmiSu>r$$e;00000NkvXXu0mjf6k|5c

diff --git a/programs/network/ftpc/tl_sys_16.png b/programs/network/ftpc/tl_sys_16.png
index 65fac3ba12531b6c908b82d8a509744468817157..3b0312da64e1d0355059e22f382d05ff75cbd289 100755
GIT binary patch
delta 687
zcmV;g0#N;t3%mu88Gi!+001#D9=!kn00d`2O+f$vv5yP<VFdsH00DDSM?wIu&K&6g
z006E~OjJex|Nj900KcDq{QUdBp8$Y>fPer1|Nj7hKmh*$004mhiB1dR)5HJ(z$PXp
z{rmt1M+T~Y2vAT^;nDz+Sr(9xkkGjXe}CW0r<MRf-(_WGpMP&W0HOeYpMRWd1*(5a
zzW@Nge}C}k007niKtMo4c|!+!2f3DN(Ym9{%ge*k!;cpi|Nk$uy0ez6mZWwD@8{na
z8^@oY=i%kyb8~Z$2nf#r0A-S8<lEAraT{$F4PXEO0jx<xK~zY`?Umbdf-n$<Q4WFP
z0jW@mAmG_rZGW}ZzW<vw8%bb;c66pzF8bZbeoP4dvuqUQVm{)HibOn{O_7PC1~=*^
zrc9#-H(#>|7&pLxaNsh>0WmGan2EK+h@gH!yP%p1Tq_#~*VkeaV*ZP3#d|YQk!TLz
zdMXlHw<ipUfkp~Lg|CeW7$IH>&^0CTXbaIdeOmWh<$qm@Iu}LF#KN>&wTy581WG9n
zU^til{>YYu-!J6>l=Ha#t6w-jJZXM-lSzn-=jz<39^kq<H~Pc{K6Nl4I&hiO0pW(C
z4w+bY7$MY4v<s@Kz%?vfDs@8*nnxD7m=84#^@lwoMD7n#hyJ*kKzUTZm#&n@z?br9
z*`|r|sDBe^o&t29Cdj}%6$bi)%~Nhzf3SI)Nc~Zor{wfJwWWD#OY_ve!#q88z9g0N
zC8?Y*N#%S=r2gP}i2mStu>L6LaZDZ83d#dOdHfDRmIX){X=-3$Sw9H6J_C{Q=g{@(
z!Lkl1e-6FNIU`nvVeBnyPk&YyZhKO!%IojM?kGvHW1{^mXdlIc;EdR|1>3)R?{7SL
VGn$=<zqkMZ002ovPDHLkV1gOuJAVKG

delta 1402
zcmV-=1%>*&1(6Go85ITq000K>?vDTf00DDSM?wIu&K&8HArpTfV@Og>004R>004l5
z008;`004mK004C`008P>0026e000+ooVrmw0000PbVXQnQ*UN;cVTj60C#tHE@^IS
zb7Ns}WiD@WXPfRk8UO$U>PbXFRA@u(nq5d#K@@<;9@MrCeKRV`w*(=PUVPgEUyKqF
z!XBhD4KauWEeL<a-FoPUtlfSLlJE)z;m=bP5*b#~9}-(e^=M(?Lq!ltglnfcv(9zy
z+_`sVQ!DJ=<*=9CIo~~J?#!7p=iV%!2bs@-fcYFmr#wD64pA!#iGc)6r>0%awE$Em
z2MH`cyc{apD_jsWfJK0$2!x^`7sLj9`~D3&dOMi8qC|fVMt~pyKMIHq*mr&(WFN^+
zH<o2`79c>jAKT9Q!v^G4=K=X3G)!Mp{h^kS&1qE|u<^h~AP)@zW3)fEg`9vJk8VIt
zMGhmoWKaN8<#2TvM#e^*0I%`DZX@qRN!j6o7NAfz0$76<a|wOsW{Vfo4kX=B{|5mv
zHbBynKKFk=TrC0s%ywMRiNQb$Cewn)gD*5c7^Z8(6Ph2)nB)ht1*mM%{NU;#0)2FO
zmm%7ahJazZGR@EhwJ++1XaN?@4-kO!Lj~~#BnLMz<u5cp;1i5P29B*zFRo%A07Ps>
z4&avXknd}O7vLRTXisj-*IN*;$zw4xN%I440V;oYRIh?}UipFQHu6rCm6gl87eJ+K
z1W3~S0HNqJH`_NqSn#<Jtj<d!L&10;%aeg~06%}~C)2Z=c`P2ta;a_^-0p1B0|3@5
z<H6UD1Wr{N1r#-4Y>2?6x<b7LoqMv`M3Uv~j(m9k=BXYKWU7BFTh~P(`G5U<&2+;d
zx1WEQn1FaZ4&B||kV>UoIIRV!Tvk>Fkw^p@8X8;>BS2ME6|}dvLwR|*3t|JNrlz2)
ztBaW{N=;1-ARrctDIqqXt*wojiH&7xZEa-$5z^S$=$uTYrKQl)(qcE{3aW2(r?60(
z&XtvwP+wnf1ZZk%g5u(0rv*bpLr_#y#K?cL)YjJ8U{o$CDS^?^QFT0!Z!~r&??hQy
zxx9M;RLVwx{{DXE68g-|_RSCey~(7rNIMq-fUXCGVjORpn*ITg`p&Rzj+eZ=d!42S
zGwQi;=W;XjH0LPu0-h&a*&l{miM?vT>8h3Rd15X*7xxML{OczIC${G5S7((n{`P<R
z0fEll>-2!c&Rk`FaG`cJynS(B4+!#uzm*>ZTb@NI2dZMitKmMg{Q_>fRr`gm#<2H(
z;pmnuNKI?vf!}_ir+E`RzwHn3-7nxgKTe~KYM;P=ySQtu_kKYihn+2grA@IiEx}IA
zxSlBY0k0=sqt6?A>GMWyJy8Xit0#YkToBhtl=B03J<$nq0aW>cyPg<=0r`0&H{B#Z
zz@nsKJy9JO()C2?c_X(#Tv&L1;I1cz=TlFdQ&y(?{`EwsvJqgeo)`-1i5`(gTU*yf
zC@mo4c;NMX!8jgx4Wx8c-yj~yfQ;jT2;liaM)ANTKk$tQCi#JHJW%Ba8O47Cuc(Zx
zVEPe(CLVYJRLVy6gN);WZtTndFXa>`X<0BFrTb?pc<yz0_Cbu$Jb6~|{I>w~T`PRw
z3jPd0^cnqTR~0Pa{UP^>?VRW{`koX3c+UF+zeSfE0DeW?_u>HJ1qIABE{R-Pp_p|8
z&&B_+EkAt6!Joa2@<@|!W5!w|QS1}Z=l>}ln8wDX6ca6L5~5N1I;DYNTi0A5<Q{zk
zZrn_0TQwj?C!mQe3ZP)kV>)}O8wP@HwejG897v`<FL*%t1*P$I^*2`GYXATM07*qo
IM6N<$f(Yn+3jhEB