From ddd88b4e891e77a6daf7e75270751670973486ec Mon Sep 17 00:00:00 2001 From: qwerty2501 Date: Sun, 26 Feb 2012 19:17:24 +0900 Subject: [PATCH] =?utf8?q?=E3=83=81=E3=83=A3=E3=83=83=E3=83=88=E3=82=AF?= =?utf8?q?=E3=83=A9=E3=82=B9=E3=81=AE=E3=82=A2=E3=82=AF=E3=82=BB=E3=82=B9?= =?utf8?q?=E4=BF=AE=E9=A3=BE=E5=AD=90=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- nlite.suo | Bin 197120 -> 197120 bytes nlite/nlite.h | 2 +- nlite/nlite_chatData.cpp | 129 ++++++++++++++++++++++++++++++++++------- nlite/nlite_chatData.h | 126 +++++++++++++++++++++++++++++++++++----- nlite/nlite_commentview.cpp | 82 +++++++++++++------------- nlite/nlite_mainframe.cpp | 8 +-- nlite/nlite_propertyWindow.cpp | 17 +++--- nlite/nlite_propertyWindow.h | 4 +- 8 files changed, 276 insertions(+), 92 deletions(-) diff --git a/nlite.suo b/nlite.suo index 5eb3415563439023ae49d2f7b29dbf2c8517f922..75ff014979b499eb231cc879e92286eccc376ba9 100644 GIT binary patch delta 6840 zcmbtZdtB7jw*Rfg%m|1$jKdtn5eJ;m5OpLiC4xc8&@%DV1qVL!{sR5bT{h@ZE*2r@)Vg zyh9t7Yd!@S*zk~UUiSbcfX8|;i9RbLg-z3?p*7Tj{%!mTxn)%3hc&5#a=i{#-6&9$ zv~aP!XPU-v%XmX;&ma^>%fo4f6?MX3Hi+Uh(22|) zdU1S1naHq&i;LN2VK*k9SQK9% zGVcqcigXC)nd`+PwqassjIF^I)zppRy22_Dl$44^u6`C#`>vjOLaA~N4>lK|K|6zG zt`%pS_Cx7$@Q6WZC<~2wl z?^6)ObM6(3T#H=sI`V#_KDW@|?l8)AXTEj{zu(&M#GQrE<tbCf5Q$;w`q3%x@hRpvHhRWT4%pj7J zC-nT!0#rWp$FI}gnm=J^d*x3U`lMmMeWR8kq=+Z(9k0>z#ydQ`q4nM%y@+$gYiIFj zt~j#c1t_KvE8a!Ua7+;H4Mt%#Zxu}qHfoNAslvJ5Bu1_~MCp3AoAYmAa!p-^u^Mqh z6D77xodP`@ewf;IfUCqLj+bqv#aXbNmd9d@I9#UV7}*S&BC^jN!ciK>cQb7A&LRR! z4I<_Ga#2wdEoPQiiG0@@kst4(iop;ra$WMpJjzQ3J&U6e^_507NSK8g7>FbRW1MPx9K^Y9`+PW>Wo@CSqMQQH(tl`MA9 zb>e6xOFf9Cw%n}~*51p>l8X^^ekK|;iqZ|pJ00xgOvQNta!CybPn9T&E*DK_G|Z5o zh{j8kguBWJ)vTr>F|sP0wpZgS(p$j*yEq*b3h(t`dM5*;Sd0KQcqg2M_4LjWFtR?p z;Ug${{cAbpUNNVm58Du{Ifv}&QWu&`quLw{kr;wSaU4!E?%65jAFjf`i5Sbbbjpg-jjzwU;oC(ma=bj8^5kQ z@cBQ7uNu+deb%IMM1crLCR6?aAHA8+zh)gt-QC~~jD6yf~RC=$Ln)SmjMiErbFYR5Cn zwDwqt5V`LM!9XgkLLn-anpnI*)v+n>EXL6%k3bN%N#D34yqENJd@ctSJC;E-T{qIm zK!_sCDaa#z16W1kbsZH~VTGv3H?btLYC37cSe!-frToUJD|*<&%Wf35D-lpDiei%* z>{q>7Z5}gj5<`AGDayVw!MRT77B_x0!E;=cl3YhE!qU1!tGd6csn*sY5a>#vL%SeW z4Ej+gF4jCPR($U-j{edjoUN?g5M+n@`KTXGQp6GeRN?-`Kq)7{B`Si9BJ&rWOe9WG z@l%Y<6=~al<+2(vk}3wGbmya+9)WFY9ob|9o80P@{RpFU0g%JuKE~AH36$>-sYa${P+rWGlo#a=e8aR$3p9D_)(#KtgEgp*r`f39diEbYM&Hj7A_yCZ@Puw!>Y3;?XMKg0Sfogj|5T~6Z zlgr8R4Cu&W<$vr+%g9;9`qB3X6YZ&jVC^`b;AUK>)mcCzu9upqF@p0mXK`}(=Pj{S zJ70`um*Xr~7Y!)%J7o05Nzn2)X%IctTOn4O_Bm>bLWzbJx$c(ejlzm(W(VkQu9DCaZO;irr`A|27AEs{Xi%PWbhP3TVo*{*0Bu=Y04uI zO!jH8nH@ESic>L{+{?jAEv2aQY>tQQNO5%NB()aKrh7)f47JV)`;`9h9d(}%OGMrn zjSNVM=Zb~*l!Z5Qm}){{hH#o~9jm)(VHUh7?F_k8v;xL>QZwOzpBQPL%E8ZYt|x@E zZ#Y@g1onb^BxI@%B5bm6b+%AWP)Eu4j1Ewh=>8voc1MSnlFp%Ye3&w4>N@Gb*aHr z5ovzdwSYBW3w=Nf@A1kqwNm~zUq17+ZiBOanz!V5djsQXeHK<}MN2%V*=UES=>>2j z759W_F*`Bb#% z&-5fk*1+JpgWykZ{S5KK(P)GaO7cJ{>{F+6z70{Zn-(2|M+02SDDFw7DGpEDG0wU) zF#;YVXER4d?lBgE>qb3Qyag|lCK(xMo#K3$HIIv-nxWi3fE5nOos?5BHxJzvC5r`c zx6k=kPuoeJQ!H*=L%e1*!#TBz>S@CqH1ocDa0t0&D^x?xpjzL)uOnCpaO_O}vB%EV;H$TFKE@E-qa_Jgj@V=N{UO@Ub2(Q-S z0Vzd96|S<~$4I*`la=XLE{G1k_G9YLbbI^Q0KUey-*0*uv-_v=!@72xQkmo$WB59@{eB!@A7Dyj8qefln!q%X=|QGxOtMfXv|r`@ zLwrA#X*$zAi6e z_?(~Od!y>kD}=W`n%rj8NzXfcv;T~cxWfpmWJy>;&O#2`Tm~ZCb73)U?~A#xn`IT$ zcpIAKDGpg~W08(;Fzt`VER;Z8Ph-cS43rSosIOZ3Q2a2N=>A4wx3he1R@AWlF=*G3 zvmRn-<~*qn8y*+NBt4}J!Ps5SAqaFP4g3G$iN*8dar}V)e54Vlj8KyKz@vcGI*}pM z0($)c>@AA_676x`fliIUUikqXS#7O2-CLpr6WQ%7<4$hL*HYOCjN+bms4u4C@q$)t zFOR2hhhrEw0`mNbdkfb7bTyRi)vVqXJ=nrG>=-DlebcH(Bgf)M`QGBbvmsvQE{|FX zWuxAa(!P{cL(SA?YMRKWX!3x}Z8m9_us3W~mvPLOfahVEL>`uHhD5<0R`p{b_C?z3 z(h!Af=4jf(xs>@7+Pe$-dYle)0@;s&4Pv+t^m96qhmtJ!tR()N;_M-Kn>K6pW%p3-P~Y z0m!4wh3uR1Ot6%TgaPLHu%@pi(9^gnXynXe0^zM>|GuuLQ?t;*BY{BfWOS$sU;eWS z<-X=cB?`_F_^&A<^Q#EYV~cS^03FUli?5zH-%zphMQ)8%c&&Ct(NM3hZo3l2%`>{c*Y@JK^8wpV=WpiX9cQI!0v8Y<9Eoz|(_m}z@DAW%sSXPm5f2`*tJO}c_M+It1P)t7LixX0;r+YvJRx@DRqp8-ECx3VN3##pZ4JRA#WWwY$Dm*8=r#5J5B+pY4w0p6AxQ;~h%5sn6p3#&a) zft(-Payc2#;1VetR*zH=d-iHy#@Z+w{-SCfA0X*>tA)0a8MbsBnXq-sFb{lwBC(s1 zYR{p@!v{i5;8|RaWkA;sVMdp^xw955&3e?gpF`>%=+t-I&gLD$+vUzTlJiXnq>+bl z0PK_BulMo3*0J9J+V~pp{|g%X0fU1i2PRYVyV#Swr?5NyGnd~jZNz(Ma0!Oc)DQTC z_9lymS^5IpqH5mFyN&om^%=bDmf_K+zcaS+ef+(z@;y7LlG3UDBwBbCLx0Cac9Z-S z!1syt&f^;fc1ntBlnnvxdmofdL$2a9dhZbD?2f%BajPAv=|S!*_)*Av>^8so(2G~F z{H9`(O_y&nSiQ(SN0?mYcRgaHsq*GbR&O2O50<<>&7x0~v4Juh=;ZiswVXtQn=mL) z{wTrTuB802&SQ2tw<6Z?{zQ58-m(e8G4Dho*?WIcaTS$(}oQzt&!3>=4^%Sf_Gt!pz_%9lA48v42(6Tph zU0o}3u~1V*BAHI`!PbM^l`Z97jN@Sco0#th>pV-}#*H98pA@fk${xv+^bRs^Fa8*^ z|NZBJIldFz|JM%##q%)Ub7Kp>1!M?ibj&c{to~3yEnWr|vaROKEKjkM;S3esfrWMZ zP{VK^891NEof?U$I)F2^p2xGAyKfosw0?}^H34uJk4Y!%;Pm8wiX~9DA94TZ=#3D# Lao+D7lBfM2!B*J0 delta 6455 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 lmiwf-9`+Yr#0sdbM_t1;^qQ%<8V{Q}K05#a diff --git a/nlite/nlite.h b/nlite/nlite.h index 293b314..cca12e9 100644 --- a/nlite/nlite.h +++ b/nlite/nlite.h @@ -9,7 +9,7 @@ namespace nlite{ class CListenerList; struct Property; struct GeneralProperty; - struct ListenerData; + class CListenerData; diff --git a/nlite/nlite_chatData.cpp b/nlite/nlite_chatData.cpp index 4b14fbe..c496aae 100644 --- a/nlite/nlite_chatData.cpp +++ b/nlite/nlite_chatData.cpp @@ -9,16 +9,16 @@ namespace nlite{ //ƒŠƒXƒi[ŒŸõƒIƒuƒWƒFƒNƒg struct ListenerPre{ - ListenerData &user; + CListenerData &user; - ListenerPre(ListenerData &in_user): + ListenerPre(CListenerData &in_user): user(in_user) {} bool operator()(CListenerList::reference listenerData){ - return (user.user_id == listenerData.user_id)/* && (user.community == listenerData.community)*/; + return (user.GetUserID() == listenerData.GetUserID())/* && (user.community == listenerData.community)*/; } }; @@ -29,7 +29,7 @@ struct ListenerPre{ ///////////////////////////////////////////////////////////////////////////////////////////////// -ListenerData::ListenerData(): +CListenerData::CListenerData(): user_id(TEXT("")), name(TEXT("")), community(TEXT("")), @@ -39,26 +39,51 @@ onlyCommunityFlag(FALSE), nameColor(INIT_COLOR) {} -VOID ListenerData::SetNameColor(COLORREF nameColor_in){ +VOID CListenerData::SetNameColor(COLORREF nameColor_in){ nameColor = nameColor_in; return; } -VOID ListenerData::SetBkColor(COLORREF bkColor_in){ +VOID CListenerData::SetBkColor(COLORREF bkColor_in){ bgcolor = bkColor_in; return; } -VOID ListenerData::SetUserName(LPCTSTR name){ +VOID CListenerData::SetUserName(LPCTSTR name){ this->name = name; } +COLORREF CListenerData::GetBackColor()const { + + return this->bgcolor; + +} + +COLORREF CListenerData::GetNameColor()const{ + + return this->nameColor; +} + + +const CNLiteString &CListenerData::GetUserID()const{ + + return this->user_id; + +} + + + +const CNLiteString &CListenerData::GetName()const{ + + return this->name; + +} CChatData::ViewData::ViewData(): sellLineColor(INIT_COLOR), @@ -68,7 +93,7 @@ CChatData::ViewData::ViewData(): height(0) {} -VOID CChatData::SetChat(NicoLiveChat &chat_in,ListenerData &listener){ +VOID CChatData::SetChat(NicoLiveChat &chat_in,CListenerData &listener){ this->anonymity = _ttol(chat_in.anonymity); @@ -115,6 +140,66 @@ VOID CChatData::SetChat(NicoLiveChat &chat_in,ListenerData &listener){ } +VOID CChatData::SetHeight(UINT_PTR height){ + + this->viewData.height = height; + +} + +CListenerData &CChatData::GetListnerData() { + + + return *this->listenerData; +} + +const CNLiteString &CChatData::GetChatBuff()const{ + + return this->chatBuf; +} + +BOOL CChatData::IsSelect()const{ + + return this->viewData.selectFlag; +} + +COLORREF CChatData::GetBackColor()const{ + + return this->viewData.backColor; +} + +UINT_PTR CChatData::GetPremium()const{ + + return this->premium; + +} + +time_t CChatData::GetDate()const{ + + return this->date; + +} + +UINT_PTR CChatData::GetNo()const{ + + return this->no; +} + +COLORREF CChatData::GetStringColor()const{ + + return this->viewData.stringColor; + +} + +COLORREF CChatData::GetSellLineColor()const{ + + return this->viewData.sellLineColor; +} + +UINT_PTR CChatData::GetHeight()const{ + + return this->viewData.height; +} + // // //ƒRƒƒ“ƒgƒŠƒXƒgƒNƒ‰ƒX @@ -131,7 +216,7 @@ struct GetCurSelFunc_t{ BOOL operator() (const CChatData &target){ count++; - return target.viewData.selectFlag; + return target.IsSelect(); } }; @@ -144,7 +229,7 @@ struct SeartchSetPos_t{ bool operator()(const CChatData &target){ - return time > target.date; + return time > target.GetDate(); } }; @@ -177,7 +262,7 @@ INT_PTR CCommentList::GetCurSelNo(){ CCommentList::iterator CCommentList::OnChatReceve(NicoLiveChat_P chatData_in,LPCTSTR communityID, UINT_PTR commnetCountSum,CCommentListWindow &listWindow){ CChatData chatData; - ListenerData listenerData; + CListenerData listenerData; listenerData.user_id = chatData_in->user_id; listenerData.time = time(NULL); listenerData.community = communityID; @@ -319,7 +404,7 @@ VOID CListenerList::BkColorCollect(CListenerColorCollector &target){ std::for_each(m_listenerList.begin(), end,target); } -CListenerList::reference CListenerList::Register(ListenerData &listener,BOOL bUpdate){ +CListenerList::reference CListenerList::Register(CListenerData &listener,BOOL bUpdate){ //ŠÖ”ƒIƒuƒWƒFƒNƒg¶¬ ListenerPre listenerPre(listener); @@ -368,7 +453,7 @@ BOOL CListenerList::ReadProperty(LPCTSTR fileName){ userSettingFile.Read(&userSettingBuf[0],userSettingBuf.size()); LPSTR userSettingStart = strstr(&userSettingBuf[0],"<"); if(userSettingStart != NULL){ - ReadUserSettingXML rusx(nlite::listenerList); + CReadUserSettingXML rusx(nlite::listenerList); rusx.Parse(userSettingStart); } @@ -408,13 +493,13 @@ BOOL CListenerList::WriteProperty(LPCTSTR fileName){ //ƒŠƒXƒi[ƒŠƒXƒg‚©‚ç•Û‘¶‘Ώۂ̃f[ƒ^‚Ì‚ÝxmlŒ`Ž®‚Å•Û‘¶ for(;begin != end;++begin){ - if(begin->name.Length() > 0 || begin->nameColor != ListenerData::INIT_COLOR || begin->bgcolor != ListenerData::INIT_COLOR){ + if(begin->name.Length() > 0 || begin->nameColor != CListenerData::INIT_COLOR || begin->bgcolor != CListenerData::INIT_COLOR){ pWriter->WriteStartElement(NULL,TEXT("user"),NULL); if(begin->name.Length() > 0) NLITE_ATTRIBUTE_WRITE_STR(pWriter,(*begin).name); if(begin->community.Length()> 0) NLITE_ATTRIBUTE_WRITE_STR(pWriter,(*begin).community); NLITE_ATTRIBUTE_WRITE_INT(pWriter,(*begin).time); - if(begin->bgcolor != ListenerData::INIT_COLOR)NLITE_ATTRIBUTE_WRITE_INT(pWriter,(*begin).bgcolor); - if(begin->nameColor != ListenerData::INIT_COLOR)NLITE_ATTRIBUTE_WRITE_INT(pWriter,(*begin).nameColor); + if(begin->bgcolor != CListenerData::INIT_COLOR)NLITE_ATTRIBUTE_WRITE_INT(pWriter,(*begin).bgcolor); + if(begin->nameColor != CListenerData::INIT_COLOR)NLITE_ATTRIBUTE_WRITE_INT(pWriter,(*begin).nameColor); pWriter->WriteString(begin->user_id); pWriter->WriteEndElement(); } @@ -425,12 +510,12 @@ BOOL CListenerList::WriteProperty(LPCTSTR fileName){ } -ReadUserSettingXML::ReadUserSettingXML(CListenerList &in_listenerList):m_listenerList(in_listenerList),userNodeFlag(FALSE){} +CReadUserSettingXML::CReadUserSettingXML(CListenerList &in_listenerList):m_listenerList(in_listenerList),userNodeFlag(FALSE){} #define NLITE_READ_USER_STRING(at,l,t) if(_tcscmp(at[0],TEXT(#t)) == 0)l.t = at[1] #define NLITE_READ_USER_INT(at,l,t) if(_tcscmp(at[0],TEXT(#t))==0)l.t = _tcstol((const wchar_t*)at[1],NULL,10) - void ReadUserSettingXML::OnStartElement (const XML_Char *pszName, const XML_Char **papszAttrs){ + void CReadUserSettingXML::OnStartElement (const XML_Char *pszName, const XML_Char **papszAttrs){ if(_tcscmp(pszName,TEXT("user")) == 0){ @@ -452,21 +537,21 @@ ReadUserSettingXML::ReadUserSettingXML(CListenerList &in_listenerList):m_listene return; } - void ReadUserSettingXML::OnEndElement (const XML_Char *pszName){ + void CReadUserSettingXML::OnEndElement (const XML_Char *pszName){ if(_tcscmp(pszName,TEXT("user")) == 0){ listenerList.Register(listenerBuff,TRUE); this->userNodeFlag = FALSE; - this->listenerBuff.~ListenerData(); - new(&listenerBuff) ListenerData(); + this->listenerBuff.~CListenerData(); + new(&listenerBuff) CListenerData(); } return; } - void ReadUserSettingXML::OnCharacterData (const XML_Char *pszData, int nLength){ + void CReadUserSettingXML::OnCharacterData (const XML_Char *pszData, int nLength){ if(this->userNodeFlag == TRUE){ diff --git a/nlite/nlite_chatData.h b/nlite/nlite_chatData.h index a61cca0..dbc88ea 100644 --- a/nlite/nlite_chatData.h +++ b/nlite/nlite_chatData.h @@ -4,6 +4,10 @@ namespace nlite{ //‘O•ûéŒ¾ class CCommentListWindow; + class CListenerColorCollector; + class CCommentList; + class CListenerList; + class CReadUserSettingXML; //‘ƒR[ƒh namespace cuntry{ @@ -19,10 +23,13 @@ namespace nlite{ /// ///ƒŠƒXƒi[ƒf[ƒ^ /// - struct ListenerData{ + class CListenerData{ private: + friend CListenerColorCollector; + friend CCommentList; + friend CListenerList; + friend CReadUserSettingXML; - public: CNLiteString user_id; //ƒ†[ƒU[ID CNLiteString name; //ƒ†[ƒU[–¼ CNLiteString community; //“o˜^‚µ‚½ƒRƒ~ƒ…ƒjƒeƒB @@ -36,11 +43,15 @@ namespace nlite{ INIT_COLOR = -1 }; + + + //ƒZƒbƒ^[ + public: /// ///ƒRƒ“ƒXƒgƒ‰ƒNƒ^ /// - ListenerData(); + CListenerData(); /// ///”wŒiFÝ’è @@ -56,6 +67,32 @@ namespace nlite{ ///ƒ†[ƒU–¼Ý’è /// VOID SetUserName(LPCTSTR name); + + + //ƒQƒbƒ^[ + public: + + /// + ///”wŒiF‚ðŽæ“¾ + /// + COLORREF GetBackColor() const; + + + /// + ///ƒjƒbƒNƒl[ƒ€‚̐F‚ðŽæ“¾ + /// + COLORREF GetNameColor() const; + + /// + ///ƒ†[ƒU–¼‚ðŽæ“¾ + /// + const CNLiteString &GetUserID() const; + + + /// + ///ƒ†[ƒU–¼‚ðŽæ“¾ + /// + const CNLiteString &GetName() const; }; // @@ -79,9 +116,9 @@ namespace nlite{ } //ƒtƒ@ƒ“ƒNƒVƒ‡ƒiƒ‹ - void operator()(ListenerData &target){ + void operator()(CListenerData &target){ - if(target.bgcolor != ListenerData::INIT_COLOR){ + if(target.bgcolor != CListenerData::INIT_COLOR){ colorlist.push_back(target.bgcolor); } @@ -97,7 +134,7 @@ namespace nlite{ class CListenerList{ private: - typedef ListenerData InternalType; + typedef CListenerData InternalType; typedef std::list ListenerList_Internal; ListenerList_Internal m_listenerList; @@ -112,7 +149,7 @@ namespace nlite{ /// ///ƒ†[ƒU[“o˜^ /// - reference Register(ListenerData &listener,BOOL bUpdate); + reference Register(CListenerData &listener,BOOL bUpdate); /// @@ -136,7 +173,7 @@ namespace nlite{ class CChatData{ - + friend CCommentList; public: struct ViewData{ @@ -155,6 +192,7 @@ namespace nlite{ ViewData(); }; + private: ViewData viewData; //•\Ž¦—pƒf[ƒ^ UINT_PTR premium; //ƒvƒŒƒ~ƒAƒ€Ží•Ê BOOL anonymity; //“½–¼ƒtƒ‰ƒO @@ -162,19 +200,79 @@ namespace nlite{ UINT_PTR vpos; //ƒRƒƒ“ƒg•\Ž¦ˆÊ’u time_t date; //ŽžŠÔ cuntry::LOCALE locale; //‘ƒR[ƒh - ListenerData *listenerData; //ƒ†[ƒUî•ñ + CListenerData *listenerData; //ƒ†[ƒUî•ñ CNLiteString name; //–¼‘OB‚‚¢‚Ä‚±‚È‚¢Žž‚à‚ ‚é CNLiteString chatBuf; //ƒ`ƒƒƒbƒg–{•¶ std::vector mail; //ƒ[ƒ‹ƒRƒ}ƒ“ƒh ULONG_PTR thread; //ƒXƒŒƒbƒh”ԍ† - public: + //ƒZƒbƒ^[ + public: /// ///nlib‚̃`ƒƒƒbƒgƒf[ƒ^‚ðƒZƒbƒg /// - VOID SetChat(NicoLiveChat &chat_in,ListenerData &listener); + VOID SetChat(NicoLiveChat &chat_in,CListenerData &listener); + + /// + ///•\Ž¦—p‚‚³‚ðÝ’è + /// + VOID SetHeight(UINT_PTR height); + + //ƒQƒbƒ^[ + public: + + /// + ///ƒŠƒXƒi[î•ñƒNƒ‰ƒX‚ÌŽQÆ‚ðŽæ“¾ + /// + CListenerData &GetListnerData(); + + /// + ///ƒ`ƒƒƒbƒg–{•¶Žæ“¾ + /// + const CNLiteString &GetChatBuff()const; + + /// + ///‘I‘ðó‘Ô”»’èƒtƒ‰ƒOŽæ“¾ + /// + BOOL IsSelect()const; + + /// + ///”wŒiF‚ðŽæ“¾ + /// + COLORREF GetBackColor()const; + + /// + ///ƒvƒŒƒ~ƒAƒ€Ží•ÊŽæ“¾ + /// + UINT_PTR GetPremium()const; + + /// + ///ƒRƒƒ“ƒgŽžŠÔŽæ“¾ + /// + time_t GetDate()const; + + /// + ///ƒRƒƒ“ƒg”ԍ†Žæ“¾ + /// + UINT_PTR GetNo()const; + + /// + ///•¶Žš—ñ•\Ž¦Žž‚̐F‚ðŽæ“¾ + /// + COLORREF GetStringColor()const; + + /// + ///˜güFŽæ“¾ + /// + COLORREF GetSellLineColor()const; + + /// + ///•\Ž¦—p‚̍‚‚³Žæ“¾ + /// + UINT_PTR GetHeight()const; + }; @@ -320,10 +418,10 @@ namespace nlite{ /// ///ƒ†[ƒUÝ’èƒtƒ@ƒCƒ‹“ÇŽæƒNƒ‰ƒX /// - class ReadUserSettingXML:public CXmlParser{ + class CReadUserSettingXML:public CXmlParser{ private: - ListenerData listenerBuff; + CListenerData listenerBuff; CListenerList &m_listenerList; BOOL userNodeFlag; @@ -333,7 +431,7 @@ namespace nlite{ public: - ReadUserSettingXML(CListenerList &in_listenerList); + CReadUserSettingXML(CListenerList &in_listenerList); void OnStartElement (const XML_Char *pszName, const XML_Char **papszAttrs); diff --git a/nlite/nlite_commentview.cpp b/nlite/nlite_commentview.cpp index 1f0e4c8..8313163 100644 --- a/nlite/nlite_commentview.cpp +++ b/nlite/nlite_commentview.cpp @@ -22,13 +22,13 @@ namespace nlite{ BOOL rslt = FALSE; try{ - tstring viewString(regex_replace(tstring(chat.chatBuf),nliteregex::TAGSTRING,nliteregex::text::NUTHINGSTRING)); + tstring viewString(regex_replace(tstring(chat.GetChatBuff()),nliteregex::TAGSTRING,nliteregex::text::NUTHINGSTRING)); rslt = __super::SetWindowText(viewString.c_str()); CHARFORMAT2 defaultFormat; this->GetDefaultCharFormat(defaultFormat); defaultFormat.dwMask |= CFM_COLOR; - if(chat.premium == 2 || chat.premium == 3){ + if(chat.GetPremium() == 2 || chat.GetPremium() == 3){ defaultFormat.crTextColor = m_master.viewproperty.ownerStringColor; } @@ -160,7 +160,7 @@ namespace nlite{ COLORREF bkColor; - if (comment.viewData.selectFlag == TRUE) + if (comment.IsSelect() == TRUE) { bkColor = m_master.viewproperty.selectBackColor; @@ -169,13 +169,13 @@ namespace nlite{ { - if(comment.viewData.backColor != CChatData::ViewData::INIT_COLOR){ + if(comment.GetBackColor() != CChatData::ViewData::INIT_COLOR){ - bkColor = comment.viewData.backColor; + bkColor = comment.GetBackColor(); - }else if(comment.listenerData->bgcolor != ListenerData::INIT_COLOR){ + }else if(comment.GetListnerData().GetBackColor() != CListenerData::INIT_COLOR){ - bkColor = comment.listenerData->bgcolor; + bkColor = comment.GetListnerData().GetBackColor(); } else { @@ -245,7 +245,7 @@ namespace nlite{ for(;chatDataBegin != chatDataEnd && heightSum < listRect.bottom;++chatDataBegin){ m_hMaster.m_commentListWindow.CalcItemHeight(*chatDataBegin); counter++; - heightSum += chatDataBegin->viewData.height; + heightSum += chatDataBegin->GetHeight(); } @@ -258,7 +258,7 @@ namespace nlite{ tmpRect = headerRect; tmpRect.top += heightSum; - tmpRect.bottom += heightSum + chatDataBegin->viewData.height; + tmpRect.bottom += heightSum + chatDataBegin->GetHeight(); if(ctrlsBegin == ctrlsEnd)ctrlsBegin = Extend(); @@ -459,7 +459,7 @@ namespace nlite{ for(;begin != end;++begin){ - begin->viewData.height = 0; + begin->SetHeight(0); } @@ -994,7 +994,7 @@ namespace nlite{ for(;chatData != endData && listRect.top < clientRect.bottom;++chatData){ CalcItemHeight(*chatData); - listRect.bottom += chatData->viewData.height; + listRect.bottom += chatData->GetHeight(); headerRects[CCommentView::NO].top = listRect.top + SELL_SPACE_LENGTH; headerRects[CCommentView::USERNAME].top = listRect.top + SELL_SPACE_LENGTH; @@ -1008,7 +1008,7 @@ namespace nlite{ headerRects[CCommentView::TIME].bottom = listRect.bottom - SELL_SPACE_LENGTH; headerRects[CCommentView::INFO].bottom = listRect.bottom - SELL_SPACE_LENGTH; - if(chatData->viewData.selectFlag == TRUE){ + if(chatData->IsSelect() == TRUE){ selectFlag = TRUE; selectData = chatData; selectRect = listRect; @@ -1114,7 +1114,7 @@ namespace nlite{ CCommentList::reverse_iterator rend = self.commentlist.rend(); for(;rbegin != rend;++rbegin){ CalcItemHeight(*rbegin); - height += rbegin->viewData.height; + height += rbegin->GetHeight(); rslt++; if(height > clientRect.bottom)goto overclientrect; @@ -1141,13 +1141,13 @@ overclientrect: // //ƒRƒƒ“ƒgŽžŠÔ•\Ž¦—p•¶Žš—ñì¬ // - time_t chatTime = (time_t)difftime(chatData.date,self.stream.GetStartTime()); + time_t chatTime = (time_t)difftime(chatData.GetDate(),self.stream.GetStartTime()); BOOL beforeStartFlag = chatTime < 0 ? TRUE : FALSE; - TCHAR noString[sizeof(chatData.no) * 8]; + TCHAR noString[sizeof(UINT_PTR) * 8]; TCHAR dateString[LENGTH_16]; - if(chatData.no != 0)_stprintf(noString,TEXT("%u"),chatData.no); + if(chatData.GetNo() != 0)_stprintf(noString,TEXT("%u"),chatData.GetNo()); else _tcscpy(noString,TEXT("")); CNLiteString timeFormat; @@ -1175,7 +1175,7 @@ overclientrect: CBrush originBkBrush; //”wŒi•`‰æ—pƒuƒ‰ƒV //‘I‘ðó‘Ô‚©ƒ`ƒFƒbƒN - if (chatData.viewData.selectFlag == TRUE) + if (chatData.IsSelect() == TRUE) { bkColor = self.viewproperty.selectBackColor; @@ -1185,27 +1185,27 @@ overclientrect: else { - if(chatData.viewData.sellLineColor == CChatData::ViewData::INIT_COLOR){ + if(chatData.GetSellLineColor() == CChatData::ViewData::INIT_COLOR){ dc.SelectPen(this->normalSellLinePen); } else { - originSellLinePen.CreatePen(PS_SOLID,1,chatData.viewData.sellLineColor); + originSellLinePen.CreatePen(PS_SOLID,1,chatData.GetSellLineColor()); dc.SelectPen(originSellLinePen); } - if(chatData.viewData.backColor != CChatData::ViewData::INIT_COLOR || chatData.listenerData->bgcolor != ListenerData::INIT_COLOR){ + if(chatData.GetBackColor() != CChatData::ViewData::INIT_COLOR || chatData.GetListnerData().GetBackColor() != CListenerData::INIT_COLOR){ - if(chatData.viewData.backColor != CChatData::ViewData::INIT_COLOR){ - bkColor = chatData.viewData.backColor; - originBkBrush.CreateSolidBrush(chatData.viewData.backColor); + if(chatData.GetBackColor() != CChatData::ViewData::INIT_COLOR){ + bkColor = chatData.GetBackColor(); + originBkBrush.CreateSolidBrush(chatData.GetBackColor()); - }else if(chatData.listenerData->bgcolor != ListenerData::INIT_COLOR){ + }else if(chatData.GetListnerData().GetBackColor() != CListenerData::INIT_COLOR){ - bkColor = chatData.listenerData->bgcolor; - originBkBrush.CreateSolidBrush(chatData.listenerData->bgcolor); + bkColor = chatData.GetListnerData().GetBackColor(); + originBkBrush.CreateSolidBrush(chatData.GetListnerData().GetBackColor()); } @@ -1232,16 +1232,16 @@ overclientrect: - CComBSTR &viewUserName = chatData.listenerData->name.Length() == 0 ? chatData.listenerData->user_id : chatData.listenerData->name; + const CNLiteString &viewUserName = chatData.GetListnerData().GetName().Length() == 0 ? chatData.GetListnerData().GetUserID() : chatData.GetListnerData().GetName(); dc.SelectFont(linkFont); - dc.SetTextColor(chatData.listenerData->nameColor != ListenerData::INIT_COLOR ? chatData.listenerData->nameColor : self.viewproperty.linkStringColor); + dc.SetTextColor(chatData.GetListnerData().GetNameColor() != CListenerData::INIT_COLOR ? chatData.GetListnerData().GetNameColor() : self.viewproperty.linkStringColor); //ƒeƒLƒXƒg•`‰æ dc.DrawTextW(noString,_tcslen(noString),&noViewRect,DT_WORD_ELLIPSIS); dc.DrawTextW(viewUserName,viewUserName.Length(),&userNameViewRect,DT_WORD_ELLIPSIS); dc.SelectFont(::AtlGetDefaultGuiFont()); - dc.SetTextColor(chatData.viewData.stringColor == CChatData::ViewData::INIT_COLOR ? chatData.viewData.stringColor :self.viewproperty.baseStringColor); + dc.SetTextColor(chatData.GetStringColor() == CChatData::ViewData::INIT_COLOR ? chatData.GetStringColor() :self.viewproperty.baseStringColor); dc.DrawTextW(dateString,_tcslen(dateString),&timeViewRect,DT_WORD_ELLIPSIS); return; @@ -1284,7 +1284,7 @@ end: VOID CCommentListWindow::CalcItemHeight(CChatData &chatData){ - if(chatData.viewData.height == 0){ + if(chatData.GetHeight() == 0){ RECT drowSize; self.m_header.GetItemRect(CCommentView::COMMENT,&drowSize); @@ -1300,7 +1300,7 @@ end: cedit.DestroyWindow(); drowSize.bottom += 12; if(drowSize.bottom - drowSize.top > 120)drowSize.bottom = drowSize.top + 120; - chatData.viewData.height = drowSize.bottom - drowSize.top; + chatData.SetHeight(drowSize.bottom - drowSize.top); } return ; @@ -1324,7 +1324,7 @@ end: for(; chatData != end ;(++chatData)){ CalcItemHeight(*chatData); - heightSum += chatData->viewData.height; + heightSum += chatData->GetHeight(); if(heightSum >= height)break; @@ -1351,24 +1351,24 @@ end: auto endData = self.commentlist.end(); for(;clickData != endData;++clickData){ - heightsum += clickData->viewData.height; + heightsum += clickData->GetHeight(); if(heightsum > point.y){ CDC cdc = this->GetDC(); - rc.top = heightsum -= clickData->viewData.height; + rc.top = heightsum -= clickData->GetHeight(); RECT calcRect = {0}; cdc.SelectFont(linkFont); if(index == CCommentView::USERNAME){ - LPCTSTR viewStr = clickData->listenerData->name.Length() == 0 ? clickData->listenerData->user_id : clickData->listenerData->name; + LPCTSTR viewStr = clickData->GetListnerData().GetName().Length() == 0 ? clickData->GetListnerData().GetUserID() : clickData->GetListnerData().GetName(); cdc.DrawTextW(viewStr ,_tcslen(viewStr),&calcRect,DT_CALCRECT); } else if(index == CCommentView::NO){ TCHAR viewStr[sizeof(UINT_PTR) * 8]; - _stprintf(viewStr,TEXT("%d"),clickData->no); + _stprintf(viewStr,TEXT("%d"),clickData->GetNo()); cdc.DrawTextW(viewStr,_tcslen(viewStr),&calcRect,DT_CALCRECT); } @@ -1377,7 +1377,7 @@ end: //À•W‚ªƒŠƒ“ƒN‘Ώە¶Žš—ñ“à‚É‚ ‚éê‡‚Ítrue‚ðÝ’è‚·‚é rslt = (point.y >= rc.top && point.y <= rc.bottom && point.x >= rc.left && point.x <= rc.right) && - ((index ==CCommentView::NO && clickData->no != 0) ||index ==CCommentView::USERNAME); + ((index ==CCommentView::NO && clickData->GetNo() != 0) ||index ==CCommentView::USERNAME); break; @@ -1441,7 +1441,7 @@ end: COLORREF bkColor; - if(lineIte->listenerData->bgcolor == ListenerData::INIT_COLOR){ + if(lineIte->GetListnerData().GetBackColor() == CListenerData::INIT_COLOR){ CListenerColorCollector colorCollector; listenerList.BkColorCollect(colorCollector); UCHAR red; @@ -1459,11 +1459,11 @@ end: }while(colorCollector.Find(bkColor)); - lineIte->listenerData->SetBkColor(bkColor); + lineIte->GetListnerData().SetBkColor(bkColor); } else { - - lineIte->listenerData->bgcolor = ListenerData::INIT_COLOR; + lineIte->GetListnerData().SetBkColor(CListenerData::INIT_COLOR); + } } diff --git a/nlite/nlite_mainframe.cpp b/nlite/nlite_mainframe.cpp index 1de1c28..9ef4a78 100644 --- a/nlite/nlite_mainframe.cpp +++ b/nlite/nlite_mainframe.cpp @@ -497,10 +497,10 @@ LRESULT CNliteMainFrame::OnClickChatNo(UINT uMsg,WPARAM wParam,LPARAM lParam){ auto &chatData = *(CChatData*)wParam; CString setString; - if(chatData.listenerData->name.Length() == 0){ - setString.Format(TEXT(">>%d "),chatData.no); + if(chatData.GetListnerData().GetName().Length() == 0){ + setString.Format(TEXT(">>%d "),chatData.GetNo()); }else{ - setString.Format(TEXT(">>%s "),chatData.listenerData->name); + setString.Format(TEXT(">>%s "),chatData.GetListnerData().GetName()); } this->commentWriteWindow.SetText(setString); @@ -512,7 +512,7 @@ LRESULT CNliteMainFrame::OnClickChatNo(UINT uMsg,WPARAM wParam,LPARAM lParam){ LRESULT CNliteMainFrame::OnClickUserName(UINT uMsg,WPARAM wParam,LPARAM lParam){ auto &chatData = *(CChatData*)wParam; - listenerSettingWindow.ShowSettingWindow(*chatData.listenerData); + listenerSettingWindow.ShowSettingWindow(chatData.GetListnerData()); return 0; diff --git a/nlite/nlite_propertyWindow.cpp b/nlite/nlite_propertyWindow.cpp index 7348706..badb605 100644 --- a/nlite/nlite_propertyWindow.cpp +++ b/nlite/nlite_propertyWindow.cpp @@ -144,7 +144,7 @@ VOID CColorSettingButton::SetColor(COLORREF in_color){ if(brush.IsNull() != TRUE){ brush.DeleteObject(); } - if(color != ListenerData::INIT_COLOR){ + if(color != CListenerData::INIT_COLOR){ brush.CreateSolidBrush(color); this->SetWindowText(TEXT("")); @@ -164,17 +164,18 @@ LRESULT CColorSettingButton::OnSetCursor(HWND wparam,UINT loLparam,UINT hiLparam } -VOID CListenerSettingWindow::ShowSettingWindow(ListenerData &listenerData){ +VOID CListenerSettingWindow::ShowSettingWindow(CListenerData &listenerData){ this->ShowWindow(SW_HIDE); this->listenerData = &listenerData; - backColorButton.SetColor(this->listenerData->bgcolor); - nameColorButton.SetColor(this->listenerData->nameColor); + backColorButton.SetColor(this->listenerData->GetBackColor()); + nameColorButton.SetColor(this->listenerData->GetNameColor()); + + idField.SetWindowText(listenerData.GetUserID()); + nameEdit.SetWindowText(listenerData.GetName()); - idField.SetWindowText(listenerData.user_id); - nameEdit.SetWindowText(listenerData.name); this->ShowWindow(SW_SHOW); return; @@ -243,11 +244,11 @@ VOID CListenerSettingWindow::OnButton(UINT hiWParam,INT_PTR loWParam,HWND lParam if(this->backColorReturnButton == lParam){ - backColorButton.SetColor(ListenerData::INIT_COLOR); + backColorButton.SetColor(CListenerData::INIT_COLOR); } else if(this->nameColorReturnButton == lParam){ - nameColorButton.SetColor(ListenerData::INIT_COLOR); + nameColorButton.SetColor(CListenerData::INIT_COLOR); } return; diff --git a/nlite/nlite_propertyWindow.h b/nlite/nlite_propertyWindow.h index d5d5876..c1d7478 100644 --- a/nlite/nlite_propertyWindow.h +++ b/nlite/nlite_propertyWindow.h @@ -88,7 +88,7 @@ namespace nlite{ CColorSettingButton backColorButton; //”wŒiF•ÒWƒ{ƒ^ƒ“ CButton backColorReturnButton; //”wŒiF‚ð–ß‚·ƒ{ƒ^ƒ“ CStatic idField; //ID•\Ž¦—̈æ - ListenerData *listenerData; //‘Ώۂ̃ŠƒXƒi[ƒf[ƒ^ + CListenerData *listenerData; //‘Ώۂ̃ŠƒXƒi[ƒf[ƒ^ public: enum { IDD = IDD_LISTENER_SETTING_DIALOG }; @@ -104,7 +104,7 @@ namespace nlite{ /// ///Ý’èƒEƒBƒ“ƒhƒE•\Ž¦ /// - VOID ShowSettingWindow(ListenerData &listenerData); + VOID ShowSettingWindow(CListenerData &listenerData); private: /// -- 2.11.0