From 5ed7f3b47a793ec14c834000a84916ca003a25b3 Mon Sep 17 00:00:00 2001 From: qwerty2501 Date: Sat, 11 Feb 2012 13:13:43 +0900 Subject: [PATCH] =?utf8?q?=E3=83=AA=E3=82=B9=E3=83=8A=E3=83=BC=E8=A8=AD?= =?utf8?q?=E5=AE=9A=E3=82=A6=E3=82=A3=E3=83=B3=E3=83=89=E3=82=A6=E3=81=AE?= =?utf8?q?=E8=89=B2=E5=A4=89=E6=9B=B4=E3=83=9C=E3=82=BF=E3=83=B3=E9=80=9A?= =?utf8?q?=E9=81=8E=E6=99=82=E3=81=AB=E6=8C=87=E3=82=AB=E3=83=BC=E3=82=BD?= =?utf8?q?=E3=83=AB=E3=81=AB=E3=81=AA=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= =?utf8?q?=E5=A4=89=E6=9B=B4=20=E3=83=AA=E3=82=B9=E3=83=8A=E3=83=BC?= =?utf8?q?=E8=A8=AD=E5=AE=9A=E5=A4=89=E6=9B=B4=E6=99=82=E3=81=ABUI?= =?utf8?q?=E3=81=AB=E6=9B=B4=E6=96=B0=E3=81=8C=E3=81=8B=E3=81=8B=E3=82=8B?= =?utf8?q?=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- nlite.suo | Bin 164864 -> 167936 bytes nlite/nlite.h | 3 ++- nlite/nlite_chatData.cpp | 10 ++++------ nlite/nlite_chatData.h | 1 - nlite/nlite_commentview.cpp | 15 +++++++++++---- nlite/nlite_commentview.h | 6 ++++++ nlite/nlite_common.cpp | 5 ++++- nlite/nlite_common.h | 2 ++ nlite/nlite_mainframe.cpp | 9 +++++++++ nlite/nlite_mainframe.h | 7 +++++++ nlite/nlite_propertyWindow.cpp | 15 +++++++++++++-- nlite/nlite_propertyWindow.h | 6 ++++++ 12 files changed, 64 insertions(+), 15 deletions(-) diff --git a/nlite.suo b/nlite.suo index c52d4aa52d4dd67e36b1e19d02d7b0adb9a9037d..2057d2ce2ab5b12e9046ca3935fd6b53e4661f7c 100644 GIT binary patch delta 5675 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 delta 5533 zcmb_gdtB7jw*Rfo%rM}HKSm^+2nQr2Lj)oXQUs(fKElyM>M=w#d?rXbrI!*1QG9?f z%tDrROdk2co0)MKW2|chgrz-@{8*=RdXbOPGDD^EoLhR={vk@|-+O=a*|2~6vG&^Q z@m*{E9Cf~qt-ehwb^4g~yTR;!Qdc5$)4deMea&Fg>5Ph^;E1A7jL~_!?Ss06@diJZ z0i$U5o8bdNpeREJjJkXMY->lCFK{~0vR7{H{| z0n>(X9(dLt3x`k9D?{W&t0~IeJKQADbuJBazBV$q*;rdPpAKDs=~%bJw(}ww;V{**HY_`VDeU!9v&#AC!c^d_zQsNOxB zdM>eGM^b1t>?GUA5Woz7i8tb3hyC&<|KS>EH;iMdv(4_pafgArUWd`>mtdlNZ!o*& zETikmB8Z&B!NME!>8}@H21_TEDlS3*Ce1crz=KvMvnMd72 z!K{~hYQf967FRD1afeKZ@KV3AUvHS~>GD5lQRVhy}Qh?hrsY8z)x)?(u zZ!&?q@S#!_T?uI{`~9#>a$ADdQVU+0yB|+(b5QHM5CHXfdCqc?qhN|V8!ycMz6kn*tcC37`XSZ21dj?%1t=oM{(O>=It^uc1Qa<=0q^l~N3Wa0foZH0v&a0l(jF zW@dNwNqfPNmC72{yi}f(+Y!m@hMg)TK{vBOXdB@I8>I|``{}g|Hl?pB4B(WD$|ySu z3IiEq4|FI5-VgJuZj=mJv`Tm@16{BJ(b{hyW2jPB&eYWGQn3`R|zJcQ2(gN5NbLPDm;L(=iIKB!zlbI2*#uU zgDyjoXIw*j7qgbdZ_@@Gh`n7WG{$>B4)=fc{!Vk-D;eJp`{~7L?Y|yv(PMG;P@Hgb z7tZ=T+#mMBSaAJ_UMZ>aCTZl@DTb=|jE)RQw(wI_-fNea?X5Y$@7KG@wj24Ihz^WyXUCzsk{D%R}9!4>W6hd=mh&z@uQi%>>j*v=0S2Ug$SxU4uR-s zGvQau44C_i1G}#TGSWr5USiYzT$*lgJJ9N0D4^(JV9>nb7o7RqU!?P3cWwwK{$^ob z6J2?%B!9shuC;q%T*y3hmibbS7o)?TUnS`p(181KYWfDkF#8unA6n!!To=^736k_h zEWPI$MN8;efM8~#5naFMV^4%{qW~jgahl)nr|jYBnx0~ zZAfDT2yCxi-5&#OR38pyaELyx2BNuJAei=qYfGbAM#C)O8fCpHqroz+lj9i(W8y#` z-veW*^(w<5L%A=yzD;e3h9ut_1E{3#hal$k{oA*9#A^ZPDJq^1I~c52kmDRAk)se| zJo$;>3PtmXaLS+0dXCG2gRonZV&_9bWjZpx$Q!SsRcpYHPk&Cceup1SptXXR>F2TZ7hOxPkIg<_M+6qki~*G~!xut*04x)5rO z6edWayeD8YZJH0c)D$43f|nC)hPzRn6V_PDM}-k&P|i*WV|SZb4vV#jaL5qK~F~cWgwQ{ts9$y-EU;FSO5@S7<=ipl%#wD!a6xB@D zJsc1+e{)dsk9?P}UgNvC4#69oga(oWA>0#Q2VeLNVm0{U@hwUkGug1oSr7fPecqoS*P$*U3}q;W-2R|~Vy z)4~z$>}#-y{Z}H{5tU6h=rCI(qwP4#OAon;+O|^&F zfgCT%3%mhec+>L>Ap&iWXY<)HeD+PmaUSMNv+g#rEW*k09{YL2&yd#G!EPM3Jw|4Y zL7G)yca2Kp-eoR0eR7cV9fa))A$L5|#& z*z!JffX@|H+f{DY>7x(e$$pIo(&`Tx@}wzhhsK{`*gM2hSXE<#Fi%(~e5J>>Fpg(# z2XHSb{L?H}k$mrh~F9P<Vn#7$l&Kea(&l8+iL&NBr z(UQx5fX>%H;=Y1+#^dIRWg#)&pS^cgxwmKhSvc;6*0~W9`vd6I-&x^J^C6ua8(8ZZ zoT^aV1=vU(=OG{V^V!o}>sf=}gQ`Qvr=wX|@wclASwv{5^-3C>#ZKgWN~Y-dOAuTt zy*Pjpd)OVs{TroqGLu`F$-TF0Ee=R{>@`N@%Y1A0IqJFs@lwCd7(Vh4BvRE?@R05* zC)Kh*qOPl)Zu@ydFrVV;V?({eK#oy@S^R~K3|$v9w8*}Oi@Xvp(t@?O$Efya4l=eH z_9zAn-aQ(B#P!u8S8w4W^v<1^#oE`p#Q}g=+9AZ)ha__KH;G_gTyn|(@)^(l2e>70 zOXN0zn_N4Q|0i)v<~EvJ4A#Fnw5s4D<$T9RoiiV-oGpAkaXt1}IsRLO5e~9=U)C5L zPqkCTLhOz(lH*tDF$NJV@O1es%_=+%Mv*-PDvABvaFIHuL{e4ZcIOKw9PvLH~aR_jv7|(D0d^(hSEkesBa&72SHAH8Pjfg__4agP~Ph7WZFG5o*iOy`!kfBh2==C#qK!696Gy4@5z$H~Y@&?5%o8K&Z5yMV=@HRR zK7SJB^!9vVq{pU-d#ECV*Cqa042FLv27^4_St1IkVX4TbraUobz(MLJ5$Jy>U%l^% zY#qgYpo~1xOs|%T2`E@jq(poJc*{ab{S8Sy)igOV>(MofSFg!hn43r4 zwdZy-z7TD*=7ou^Q0I0*_s7aK1k`sZamy7KlM}a63 zRJBk<-jcfyyhpxSVmf^}9!BDU!FQ<(*4Up~l$F17xqY$LrG+y^lqQxySw-|epK#|W zx3t3=hkgS&T%O-(7dpE5w21OV6^dW<)L@4&;~jkG;oNSyfqfmTwsE5nEvv+JFEL4R zO%12;G8iFCY_dB9SI0x-2Cm0V7ul}gy?MG^xA#S`>iloclD$}zw^WG#0%|G}Mq8Zn zu=0>HUWwname = name; - this->writePropertyFlag = TRUE; + } @@ -398,7 +397,7 @@ BOOL CListenerList::WriteProperty(LPCTSTR fileName){ auto end = m_listenerList.end(); for(;begin != end;++begin){ - if(begin->writePropertyFlag == TRUE){ + if(begin->name.Length() > 0 || begin->nameColor != ListenerData::INIT_COLOR || begin->bgcolor != ListenerData::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); @@ -462,7 +461,6 @@ ReadUserSettingXML::ReadUserSettingXML(CListenerList &in_listenerList):m_listene if(_tcstol(listenerBuff.user_id,NULL,10) != 0 || ((difftime(time(NULL),604800)) chatChildCtrlsList.ShowCntrls(); + this->m_commentListWindow.Invalidate(); + return; + } VOID CCommentView::OnConnect(){ @@ -619,16 +624,16 @@ namespace nlite{ ::SendMessage(::GetAncestor(*this,GA_ROOT),uMsg,wParam,lParam); - wincheck(GetLastError()); + return 0; } LRESULT CCommentView::OnClickUserName(UINT uMsg,WPARAM wParam,LPARAM lParam){ - - + + ::SendMessage(::GetAncestor(*this,GA_ROOT),uMsg,wParam,lParam); - + return 0; } @@ -889,6 +894,8 @@ namespace nlite{ CCommentListWindow::~CCommentListWindow(){ } + + VOID CCommentListWindow::OnSetProperty(){ if(IsWindow() == TRUE)this->SetRedraw(FALSE); diff --git a/nlite/nlite_commentview.h b/nlite/nlite_commentview.h index 4d60a70..6f63398 100644 --- a/nlite/nlite_commentview.h +++ b/nlite/nlite_commentview.h @@ -206,6 +206,8 @@ namespace nlite{ ~CCommentListWindow(); + + /// ///ƒvƒƒpƒeƒBÝ’莞‚̏ˆ— /// @@ -389,6 +391,10 @@ namespace nlite{ /// ~CCommentView(); + /// + ///ƒEƒBƒ“ƒhƒEXV + /// + VOID UpDateUI(); // diff --git a/nlite/nlite_common.cpp b/nlite/nlite_common.cpp index f780541..3d5e1d6 100644 --- a/nlite/nlite_common.cpp +++ b/nlite/nlite_common.cpp @@ -211,6 +211,9 @@ public: return rslt; } + + const CApplicationInfo * appInfo = NULL; -} \ No newline at end of file +} + diff --git a/nlite/nlite_common.h b/nlite/nlite_common.h index d3e8bef..6f0e202 100644 --- a/nlite/nlite_common.h +++ b/nlite/nlite_common.h @@ -27,6 +27,8 @@ namespace nlite{ extern CString GetNCVListenerInfoFilePath(); + + namespace nliteregex{ typedef std::tr1::basic_regex tregex; namespace text{ diff --git a/nlite/nlite_mainframe.cpp b/nlite/nlite_mainframe.cpp index ec67ece..1d1eb0a 100644 --- a/nlite/nlite_mainframe.cpp +++ b/nlite/nlite_mainframe.cpp @@ -431,6 +431,15 @@ LRESULT CNliteMainFrame::OnRbnHeightChange(INT_PTR wParam,LPNMHDR lParam,BOOL &b return 0; } + +LRESULT CNliteMainFrame::OnUpDateUI(UINT uMsg,WPARAM wParam,LPARAM lParam){ + + + commentView.UpDateUI(); + + return 0; +} + LRESULT CNliteMainFrame::OnClickChatNo(UINT uMsg,WPARAM wParam,LPARAM lParam){ auto &chatData = *(CChatData*)wParam; diff --git a/nlite/nlite_mainframe.h b/nlite/nlite_mainframe.h index 0cc379a..2db1fbf 100644 --- a/nlite/nlite_mainframe.h +++ b/nlite/nlite_mainframe.h @@ -225,6 +225,7 @@ namespace nlite{ MSG_WM_SIZING(OnSizing) MESSAGE_HANDLER(WM_SETCURSOR,OnSetCursor) MESSAGE_HANDLER_EX(UM_CLICK_CHATNO,OnClickChatNo) + MESSAGE_HANDLER_EX(UM_UPDATEUI,OnUpDateUI) MESSAGE_HANDLER_EX(UM_CLICK_USERNAME,OnClickUserName) COMMAND_ID_HANDLER_EX(IDM_EXIT, OnMenuExit) COMMAND_ID_HANDLER_EX(IDM_ABOUT,OnMenuAbount) @@ -270,6 +271,12 @@ namespace nlite{ /// LRESULT OnRbnHeightChange(INT_PTR wParam,LPNMHDR lParam,BOOL &bHandled); + + /// + ///‚±‚̃EƒBƒ“ƒhƒE‚ÌUIXV + /// + LRESULT OnUpDateUI(UINT uMsg,WPARAM wParam,LPARAM lParam); + /// ///ƒrƒ…[ƒA‚É•\Ž¦‚³‚ê‚Ä‚¢‚éƒRƒ”Ô‚ªƒNƒŠƒbƒN‚³‚ꂽŽž‚̏ˆ— /// diff --git a/nlite/nlite_propertyWindow.cpp b/nlite/nlite_propertyWindow.cpp index 447c4fc..88c8398 100644 --- a/nlite/nlite_propertyWindow.cpp +++ b/nlite/nlite_propertyWindow.cpp @@ -126,6 +126,14 @@ VOID CColorSettingButton::SetColor(COLORREF in_color){ return; } +LRESULT CColorSettingButton::OnSetCursor(HWND wparam,UINT loLparam,UINT hiLparam){ + + ::SetCursor(::LoadCursor(NULL,IDC_HAND)); + + return FALSE; + +} + VOID CListenerSettingWindow::ShowSettingWindow(ListenerData &listenerData){ this->ShowWindow(SW_HIDE); @@ -184,8 +192,11 @@ VOID CListenerSettingWindow::OnOK(UINT uNotifyCode, int nID, CWindow wndCtl){ this->listenerData->SetBkColor( backColorButton.color); this->listenerData->SetNameColor( nameColorButton.color); - ::ShowWindow(::GetAncestor(*this,GA_ROOTOWNER),SW_HIDE); - ::ShowWindow(::GetAncestor(*this,GA_ROOTOWNER),SW_SHOW); + + + + ::SendMessage(GetParent(),UM_UPDATEUI,(WPARAM)NULL,(LPARAM)NULL); + this->ShowWindow(SW_HIDE); return; diff --git a/nlite/nlite_propertyWindow.h b/nlite/nlite_propertyWindow.h index b9c92ff..cf811e0 100644 --- a/nlite/nlite_propertyWindow.h +++ b/nlite/nlite_propertyWindow.h @@ -56,6 +56,7 @@ namespace nlite{ BEGIN_MSG_MAP(CColorSettingButton) MSG_WM_LBUTTONDOWN(OnLButtonDown) + MSG_WM_SETCURSOR(OnSetCursor) END_MSG_MAP() @@ -69,6 +70,11 @@ namespace nlite{ /// VOID SetColor(COLORREF in_color); + + /// + ///ƒJ[ƒ\ƒ‹•ÏXˆ— + /// + LRESULT OnSetCursor(HWND wparam,UINT loLparam,UINT hiLparam); }; /// -- 2.11.0