From 42e9b18ab557bd1cc5c8143c76b14e4b367306c0 Mon Sep 17 00:00:00 2001 From: Kenneth van Ewijk Date: Sat, 17 Oct 2015 21:47:04 +0200 Subject: [PATCH] Added chat functionality (broken) --- .../.vs/ErgometerApplication/v14/.suo | Bin 101376 -> 101376 bytes .../ErgometerApplication/MainClient.cs | 2 +- .../ErgometerApplication/PanelClientChat.cs | 12 +++++++----- .../ErgometerApplication/PanelLogin.cs | 9 +++++++++ .../bin/Debug/ErgometerLibrary.dll | Bin 23552 -> 24064 bytes 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/ErgometerApplication/.vs/ErgometerApplication/v14/.suo b/ErgometerApplication/.vs/ErgometerApplication/v14/.suo index d55e72b20c2da078adf1ee18a1a0baf20fc7fc8d..5b04bd4e755a254d28da2785f974f27a2423cbd8 100644 GIT binary patch delta 1663 zcmb`HZERCz6vv-)?Ji}zt+&vQ+HR$TwUo82>u_XSblqqtr66pxiCHs@1{Rj#$kghG z#*Cp;Fc97PfOn4Zc84U>4@$2|;|F=!7K0LA>IXx3`2ZpK1(V^b(dnq?X-iULLS*qK zznpuXd(L_O|EEvdKg{Dw?O`4j*VpBQ|>xW}5k-k(Dh1OPcZ)i;|d_vRl!# z(@!Tkj}me12idBM)%vLK2@j3bUe=HXta~=Ekw)q^vtnL{%`Q-8Z9FGI4YW(At)NSE zSAr3A7wWm6XYQYJw%2?!Ilj~K15+%WbVFFK;9^0)k*Q(N0UUe~S)AKI=?I>HxIO^t z4gc7(HKg8@w@~yR?p>Z0FP&?E-AaE|{{m^P7pm!vKJ8dz7kk*k2ib|VsPyC zqSV*3@83&~tPH=fH%tfD71L?2CPQ>7y&J51Aaftxng79s1APSTTW;d|~2$;8ZzZzwsm=c}nEY%$QQW`{Jf z14@*VjynMJxMwk!pH9_P(TFR1u?%^qq@-K|oGb@!!ESY_&}?EN6R7bn#2k|vV5i{A zE2k+(Nc~v1RY^Ak7k@4Q;^&7?ba$@4@Z*=qUrJm%a{aP&)&>UJvyMttwsL>#U~Lx~A1?rRzroVPv+tR@&FD5tU$(L{w0**$Ux9ZB!3s zE$-ZEdytH&$D-N^>ZOuCdQiiMsIP+;cz9`Omp`Zs?*E zx+t~!$#ttXQ?z+bgu_EqyJ?Fc2%(*7W%@K|aU=Ge9nw4f4PcV!2^eU;#^c3L83wfG6T2qLJDH%GN)a zTF7=eF!Y& zWZt5fEC$1ohIwSyKP0c9bUt^Q1fd0-0o)(H)zD6nfLoPIDbZh`*`!!eH6`;>@L0^A z>SDoSAA2M&l1^fyne+jBjmZ6^Q}BOcMKQ}sb+X5I%3yOwC=pGQ`C7TC1{9`jxGk?q zBruZby&GiGwu)MgDYnW>R$(0$WdEjO^%*Tsj5#q$o(a2IFv~BOW3Xb}4of#22Q;GT z@r5MDTC0gwXWxxJET=Zswy#uqdHseezdjY8`O(`j&^fh|weHPe-)banKWQb&s>{p2 zlLcMRt+WDBmIFgD3+DQmcgG@&9U0t4mZfBhRX-)AFlEluA?>+vfN+0?OoSCUz_rv2htMSc&JFgEEzFMCW#yPTP0b&+fPr} zb@%S1PDI7O@+r2eibn3`#G_F+25Fhzbg6~LUErEAEu(cBxxi{;kos9uW1POSrb9lN z7m+_-Mlmg4;A{qHEWWJDN_>VtK*kCdEc023ze4=qH%9f|GMQK?pd42Mca#8q%lrk! CnZ$np diff --git a/ErgometerApplication/ErgometerApplication/MainClient.cs b/ErgometerApplication/ErgometerApplication/MainClient.cs index ef6215e..9a2bfdf 100644 --- a/ErgometerApplication/ErgometerApplication/MainClient.cs +++ b/ErgometerApplication/ErgometerApplication/MainClient.cs @@ -159,7 +159,7 @@ namespace ErgometerApplication ParseValueSet(command); break; case NetCommand.CommandType.CHAT: - Chat.Add(new ChatMessage(Name, command.ChatMessage)); + Chat.Add(new ChatMessage(Name, command.ChatMessage, true)); Client.chat.AddChatItem(command.ChatMessage); break; case NetCommand.CommandType.RESPONSE: diff --git a/ErgometerApplication/ErgometerApplication/PanelClientChat.cs b/ErgometerApplication/ErgometerApplication/PanelClientChat.cs index 4753f69..b1eb161 100644 --- a/ErgometerApplication/ErgometerApplication/PanelClientChat.cs +++ b/ErgometerApplication/ErgometerApplication/PanelClientChat.cs @@ -139,26 +139,28 @@ namespace ErgometerApplication this.Location = new System.Drawing.Point(0, 0); this.Name = "container"; this.MouseWheel += new System.Windows.Forms.MouseEventHandler(this.panel3_MouseWheel); + + Form.CheckForIllegalCrossThreadCalls = false; } private void button1_Click(object sender, EventArgs e) { if (richTextBox1.TextLength > 1) { - AddChatItem(richTextBox1.Text, DateTime.Now.ToString("h:mm:ss tt"), false); + AddChatItem(richTextBox1.Text, Helper.MillisecondsToTime(Helper.Now), false); MainClient.SendNetCommand(new NetCommand(richTextBox1.Text, MainClient.Session)); richTextBox1.ResetText(); } } - public void AddChatItem(string chatmessage) + public void AddChatItem(string text) { - - } + flowLayoutPanel1.Controls.Add(new ChatItem(text, Helper.MillisecondsToTime(Helper.Now), true)); + } public void AddChatItem(string text, bool isDoctor) { - flowLayoutPanel1.Controls.Add(new ChatItem(text, DateTime.Now.ToString("h:mm:ss tt"), isDoctor)); + flowLayoutPanel1.Controls.Add(new ChatItem(text, Helper.MillisecondsToTime(Helper.Now), isDoctor)); } public void AddChatItem(string text, string time, bool isDoctor) diff --git a/ErgometerApplication/ErgometerApplication/PanelLogin.cs b/ErgometerApplication/ErgometerApplication/PanelLogin.cs index 3969b12..e265523 100644 --- a/ErgometerApplication/ErgometerApplication/PanelLogin.cs +++ b/ErgometerApplication/ErgometerApplication/PanelLogin.cs @@ -81,6 +81,7 @@ namespace ErgometerApplication this.textBoxPassword.PasswordChar = '*'; this.textBoxPassword.Size = new System.Drawing.Size(167, 20); this.textBoxPassword.TabIndex = 2; + this.textBoxPassword.KeyDown += TextBoxPassword_KeyDown; // // textBoxUsername // @@ -138,6 +139,14 @@ namespace ErgometerApplication ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBike)).EndInit(); } + private void TextBoxPassword_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Enter) + { + buttonLogin_Click(this, new EventArgs()); + } + } + public void buttonLogin_Click(object sender, EventArgs e) { string username = textBoxUsername.Text; diff --git a/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerLibrary.dll b/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerLibrary.dll index aff32ccd6bc9cae4efbce4723da3dedd87b4be0f..1e827ccf1b5839b8536b077379a0d830bd4f6500 100644 GIT binary patch delta 9273 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 OSWouCPsG;7;Qs-UB|g3Y delta 9207 zcmb7K33wD$wm!G2y1Ki1qmvM_(}5&Z(vc)A3W69EWD$@xEP^H?A|keQm^U&Aos5XP z!YgEyhZ+>e6=eh*+Xn9JkzP{Itrs4)tf1T7T77(>WlOgzA@rT809&QM4T1<4F6k3R87;8$i zgKb1X@UN~UDsoD-YGG%k%iRDC+p z&Qpnm(>nDuXQEbGeye6ji7dGFkHULyb&STmSA=pM$FN8_MY17|N zt;>`xkV#DBup@kTONY4h)0wEAmJ0J6ABLjE9R6e`yjVpWCydUflx*8Oned+eOe6BS z5htp}u=^ZSOUX%V>A}%QI;wYxmi4P~a(jBD={>rH9TSC)mLJoEypu-v=IDnr{VY_` zo|GCF-R>?!G~;r+kYiV6VvEwTnNW9-f67GUs)+E3N14Ml!|us7cZJzQ}T{g zhWE%QH7ckkKO-rnxZqeNknF8F!e5cP2K8lna%`JF%`~Qe*Ot|KlYh^6PU+gUs(3$) zMm4v!e~+|PnU}VD=BKUh1#EfIsX#KKJDdF#d5iTfZILa;T48F;f^`g)V+W(Zn6GeZW&M|T-dEP|-I%jh+`N==s$c9mit&WQUMTq%%T=xnqq zQhSiR>);LabZOJb45{!Y&(DzF-ehxz#Nsx_tBTuFiScqRIZCe89V6#jfn*A$n#<&z z^HpWnY80UWFXBUn~_)C zTb`f%lGOsuE`oY*d7%=DH2JESwx88vrIu)Ri8D4-RsQwKb75f3#AVK%p`wNVd-BL$ zGQW*EZdrrIV;?KHr5hSno{OgRNcw#zYH@d|sv-p_VkXO>pj%EX9E;VRuuP_xSx#fP zCU(ZjgL0h5!-bYx1_M#xyb&%vb&%bTj%+%4P#!v(ZDyIj z@3*?vpS>{?1WYY*`uTv`=j&* zywxLIB~R|2R*-znXOQzwG!*&(k0NmClv$s#VeB7VK%5 z@R~i*Y0K&(CONx+lbx@!dd4RrO1E(awD??hGZrHu4q{aA~RfOyjD44v*Ih<2?l+u2j@}_fc_fj#+S=9Yn z;J4lHulZDV1^u;JO z_t>-fj)T$#uHms8UBk35at*J2v1|D3OI*Xh9LucxN*E+h);Lh67gV)I6}yX6)KZJo zbd=02tIM6mc|CemrhPMy_YF+@&X+#!8k>ORm1S9!_(Tn0wTVUcn)EC zq5@u65~$LWv%+ddC6;CC3Cs+8m2lYPqh~A_z+_R#C+TW$#&G??NWzZUY5mNlo!fok$tH%wrJR} zHdNYs1(xbuqR+5m^`5dMx!{WV&4{G$utw~(piP@XPods!(0Y%WHU{q}?E?SV|Y8Mve_ZK4jpdp9ZSD-W5pg0afGJs6>pSf)){ zEus|;Zex}Lz`CN9dZo_^}$UOP1XnGv> ztD4O7VYo)GqgFitJe9qM5!F+I+Jtm(7c$W&jCXOxgWwkQ1>4(zr6e0?nq`P@XnCA+ zfO8m0NIREtJ1ZWxce8yZW0;kdY&QT^o>a?E6hqpPgeL{t5iFz7XA>wL|TVLDa|JYS-9^nvFrutAD_Z;aAC zG`kc(14(BGC|)aeu0m21v-Ad+`DUPcFRfAR5>)S{^@?3@S(=aTRcx&#@Dto4ishT* zbU$rXtd}_n?AdfVbGmNPPB7HJ%6Gdt8+5mFZtz{C2k1@3e(#$P_P$~V!i)4EeWKXm za1!i*Vw?O|=^^@2vB&+(!AKrgQNz2w@f0SXVxRf?>tTvYmV$FLhC4#}%K4n98&;}b zimeS+h;CG+*v4RYyvh9)yT!0Xl!hp_-spzCVT59Z$eBgs6pJHg7EM#^H~wq%Y?{L? zwaRy`|9a3%l=B&%rRC5SioNO+ltaIE86J$>=I+X{TlHLeEyHft^XaDy+n^UxU2pC^ z%5Bn1=)w$pM32$6E=$4rgx-s`W}NMM8ST%o=k*E-mZj6YtXERs4Es;LnyzHFj$Sd} z(rf86?0H0MXte0STOO-$+0*_Gy+3`Ym^ad)52Q96xMgJOV4y=kjXD+G;_J`{(^`Dm zOXt02hdzYlr@3Tp)<^moG(xcoq!~tSiVg8}==Id8*f3Oo7FFY5A~>hX%NmE)PElwnece;R-Q|IuyIwk}Qa?FBGK1W;Yr|0~A{>EHRoc zX130^EwCDFp<=Bb$(Fc`G|%VyX!2qIm+##(R_bq{7c08i`UY$^KI5cwf^|?IOKTMy zZt2E2dR?*BP{(k>%kmuuaU?(B43?aUShbEa@pWCel}m&9;h-Nt7qgS{Rv{ zaB<3*O!Z9H(dtkyV+y^d*!oZ$tm~REm9CN}5n7XXOYn1jD&5CymGAE%OPflMC>9C} zno8RgbMQ;wGaR z(9&km0maV7TQP$UDt1l8(r_FeC>y%UcWXpofAlN13*}}}RIxWuZdQs46de!e`P56X zIdGm&amC~kJevl%3~$UpV>aEv%$-p4s0_co%6TynYr;J8;WJl0m{-iR4EQo^v~dYd z80`8M80Q(6QmRqWG5#6GWz?qFEThr5oOUWU%zvq|hzOsmGU>~dFs?Z2!6cvy`rapT zFAj$qjRRtrzyc^}K}2G;km$yA!PN26KdroqQ*OHAK{y-f1X}~{QBWNRi6&w${GdP0=i-VyHXp9(&jAO*yP=Y3jnw0-nxRv;qL7L-l zMbM4m-%*n|?75p3h*!+}pzQWP2%PWV%qgCr#X>e(rfa9A%H9##BO@8Fu|B3&l>Hu! zlSeWc83xt`Ez!=+ZKpPz2-@l85YE5t^ll^%jyFO*fv=lVS%EK@cDf2%PCK=m(mu=u zzQM8LPVsfhSVx516CI{_etq#MuQj3a+b(=Ou{ExAK@-g7IYlrZFy3rva<4ai) znjD)-@v_;DBk9%j2C#+R2Ck&{f!EVtfH&iV#Yd~@OW<1iM)RfU4*C&f1N{taBcc0f z6MpdX(W9JV3#Zt|DW2jK&vJ^L?A^uQ*Vy|yd-t*4!Fng_AF=*d*1ux?JJt`fp86T- zV)zDrTPsy~4SnnBi+?+K)aXmuv>jMTZvcDKd%!q-3+zur5Ho~^1J7ptTxx(lh4u3p z=h78W7SbKSX1d=~&-sTdl(jU{vJ@(AVyTIw)WUYFLaA(Idn0>yu)Txr{cP`NTL{?! zA!K|h+ofy|XL~r?O>8%@-NJS&F!i?9%2FFk8x_h#FR;Bsp;S8A-mg$9_?=l+tWYX3 zwo4UCrJn6Z#wLYQZ;^INYh|fblTsVo8x>0B1-5r6lu9St`xQ!sbZ&$~sl?bWRVbBu zwudW}N+a8;CcZW4QfgtlRiRYc*xsm6Dlf3z$w-E*IL27d*vQzz*v9w*W2bBTWPGQK zmbB@D0H!}{08=~BP)QHvHha;TiA`}D&Pa=O~3=b)xf&Q?ZD^# z>w$mu$x=Hw!~MZ~VBc-Xob{~S;J-5jUBU&(oG z*f5bO^Y`!COq|1x)$*|$AFExB6Or7CkNmx=6*!yw#kRiMZ=*1VPM$d4`NP2Mt!oDS zXl-3{<`CW4eb#s}&nY~6sE9jTMpkWYI6G{0+wtxxp>bE#oOfHzlxNzuEGXZ)Wc&@9 z?(qsoOf1m7Uft