Changeset 28 in chevmsgr

Timestamp:

11/30/15 01:23:56 (8 years ago)

Author:

cheese

Message:

UI
그룹챗

Location:

trunk/msvc14/ChevMsgrClient_MFC

Files:

• AddGroupChat.cpp (modified) (4 diffs)
• AddGroupChat.h (modified) (4 diffs)
• ChevMsgrClient_MFC.cpp (modified) (2 diffs)
• ChevMsgrClient_MFC.rc (modified) ( previous)
• ChevMsgrClient_MFCDlg.cpp (modified) (7 diffs)
• ChevMsgrClient_MFCDlg.h (modified) (1 diff)
• Resource.h (modified) ( previous)

trunk/msvc14/ChevMsgrClient_MFC/AddGroupChat.cpp

@@ -36 +36 @@
 END_MESSAGE_MAP()
 
+BOOL CAddGroupChatDlg::OnInitDialog()
+{
+    CDialogEx::OnInitDialog();
+
+    for (size_t iter = 0; iter < mMsgrClntDlg->idList.size(); iter++)
+    {
+        mFriendListToChat.InsertString(iter, str2cstr(mMsgrClntDlg->idList[iter].id));
+    }
+
+    return TRUE;
+}
 
 // CAddGroupChat ¸Þ½ÃÁö 󸮱âÀÔ´Ï´Ù.
@@ -41 +52 @@
 {
     // TODO: ¿©±â¿¡ ÄÁÆ®·Ñ ¾Ë¸² 󸮱â Äڵ带 Ãß°¡ÇÕ´Ï´Ù.
-    
+    int leftidx = mFriendListToChat.GetCurSel();
+        
+    mFriendListToChat.GetText(leftidx, selectedId);
+    mListSelectFriend.InsertString(mListSelectFriend.GetCount(), selectedId);
+    mFriendListToChat.DeleteString(leftidx);
 }
 
@@ -48 +63 @@
 {
     // TODO: ¿©±â¿¡ ÄÁÆ®·Ñ ¾Ë¸² 󸮱â Äڵ带 Ãß°¡ÇÕ´Ï´Ù.
+    if (mListSelectFriend.GetCount() <= 1)
+        return;
+
+    mListSelectFriend.GetText(0, groupChat);
+    for (size_t iter = 1; iter < mListSelectFriend.GetCount(); iter++)
+    {
+        mListSelectFriend.GetText(iter, selectedId);
+        groupChat = groupChat + "," + selectedId;
+    }
 
     CDialogEx::OnOK();
@@ -56 +80 @@
 {
     // TODO: ¿©±â¿¡ ÄÁÆ®·Ñ ¾Ë¸² 󸮱â Äڵ带 Ãß°¡ÇÕ´Ï´Ù.
+    int rightidx = mListSelectFriend.GetCurSel();
+    
+    if (rightidx < 0)
+        return;
+
+    mListSelectFriend.DeleteString(rightidx);
+    mListSelectFriend.GetText(rightidx, selectedId);
+    mFriendListToChat.InsertString(mFriendListToChat.GetCount(), selectedId);
 }

trunk/msvc14/ChevMsgrClient_MFC/AddGroupChat.h

@@ -2 +2 @@
 #include "msgclnt.h"
 #include "afxwin.h"
+#include "ChevMsgrClient_MFCDlg.h"
 
 // CAddGroupChat ´ëÈ­ »óÀÚÀÔ´Ï´Ù.
@@ -13 +14 @@
     virtual ~CAddGroupChatDlg();
     chev *chev;
+    CChevMsgrClient_MFCDlg *mMsgrClntDlg;
 
 // ´ëÈ­ »óÀÚ µ¥ÀÌÅÍÀÔ´Ï´Ù.
@@ -24 +26 @@
     DECLARE_MESSAGE_MAP()
 public:
+    virtual BOOL OnInitDialog();
     afx_msg void OnBnClickedAddList();
     afx_msg void OnBnClickedOk();
@@ -29 +32 @@
     CListBox mFriendListToChat;
     CListBox mListSelectFriend;
+    CString selectedId;
+    CString groupChat;
 };

trunk/msvc14/ChevMsgrClient_MFC/ChevMsgrClient_MFC.cpp

@@ -49 +49 @@
     InitCtrls.dwICC = ICC_WIN95_CLASSES;
     InitCommonControlsEx(&InitCtrls);
-
+    
     CWinApp::InitInstance();
 
@@ -59 +59 @@
     // MFC ÄÁÆ®·ÑÀÇ Å׸¶¸¦ »ç¿ëÇϱâ À§ÇØ "Windows ¿øÇü" ºñÁÖ¾ó °ü¸®ÀÚ È°¼ºÈ­
     CMFCVisualManager::SetDefaultManager(RUNTIME_CLASS(CMFCVisualManagerWindows));
-
     // Ç¥ÁØ ÃʱâÈ­
     // ÀÌµé ±â´ÉÀ» »ç¿ëÇÏÁö ¾Ê°í ÃÖÁ¾ ½ÇÇà ÆÄÀÏÀÇ Å©±â¸¦ ÁÙÀÌ·Á¸é

trunk/msvc14/ChevMsgrClient_MFC/ChevMsgrClient_MFCDlg.cpp

@@ -84 +84 @@
     ON_BN_CLICKED(IDC_BTN_ADD_FRIEND, &CChevMsgrClient_MFCDlg::OnBnClickedBtnAddFriend)
     ON_BN_CLICKED(IDC_BTN_ADD_CHAT, &CChevMsgrClient_MFCDlg::OnBnClickedBtnAddChat)
+    ON_LBN_SELCHANGE(IDC_LIST_FRIENDS, &CChevMsgrClient_MFCDlg::OnLbnSelchangeListFriends)
 END_MESSAGE_MAP()
 
@@ -155 +156 @@
     chev.listen(cb);
 
-    CString cstrId;
-    if (!chev.getFriendList(idList))
-    {
-        AfxMessageBox(_T("cannot get friend list"));
-        ::SendMessage(GetSafeHwnd(), WM_QUIT, NULL, NULL);
-    }
-
-    for (size_t iter = 0; iter < idList.size(); iter++)
-    {
-        cstrId = str2cstr(idList[iter].id);
-        this->mFriendListBox.InsertString(this->mFriendListBox.GetCount(), cstrId);
-    }
+    UpdateFriendList();
+
+    scl.resize(idList.size());
 
     return TRUE;  // Æ÷Ä¿½º¸¦ ÄÁÆ®·Ñ¿¡ ¼³Á¤ÇÏÁö ¾ÊÀ¸¸é TRUE¸¦ ¹ÝȯÇÕ´Ï´Ù.
@@ -222 +214 @@
 int cb_listen(SConversation & chat)
 {
-    gDlg->mChatListBox.InsertString(gDlg->mChatListBox.GetCount(), str2cstr(chat.from));
-    gDlg->mChatListBox.InsertString(gDlg->mChatListBox.GetCount(), str2cstr(chat.message));
-
-    gDlg->scl[gDlg->mFriendListBox.GetCurSel()].chatList.push_back(chat);
+    CString cstr;
+
+    if (gDlg->mFriendListBox.GetCurSel() >= 0)
+    {
+        gDlg->mFriendListBox.GetText(gDlg->mFriendListBox.GetCurSel(), cstr);
+
+        if (cstr2str(cstr) == chat.from)
+        {
+            gDlg->mChatListBox.InsertString(gDlg->mChatListBox.GetCount(), str2cstr("<" + chat.from + ">"));
+            gDlg->mChatListBox.InsertString(gDlg->mChatListBox.GetCount(), str2cstr(chat.message));
+            gDlg->mChatListBox.InsertString(gDlg->mChatListBox.GetCount(), _T(""));
+        }
+    }
+
+    for (int iter = 0; iter < gDlg->mFriendListBox.GetCount(); iter++)
+    {
+        gDlg->mFriendListBox.GetText(iter, cstr);
+
+        if (cstr2str(cstr) == chat.from)
+        {
+            gDlg->scl[iter].chatList.push_back(chat);
+            break;
+        }
+    }
 
     return 0;
@@ -263 +275 @@
 
     if (chev.tell(conversation))
+    {
+        mChatListBox.InsertString(mChatListBox.GetCount(), str2cstr("<" + mId + ">"));
         mChatListBox.InsertString(mChatListBox.GetCount(), chat);
+        mChatListBox.InsertString(mChatListBox.GetCount(), _T(""));
+    }
+
+    gDlg->scl[gDlg->mFriendListBox.GetCurSel()].chatList.push_back(conversation);
     
     SetDlgItemText(IDC_EDIT_INPUT, _T(""));
@@ -271 +289 @@
 {
     // TODO: ¿©±â¿¡ ÄÁÆ®·Ñ ¾Ë¸² 󸮱â Äڵ带 Ãß°¡ÇÕ´Ï´Ù.
-    //chev.addFriend();
     CAddFriendDlg AFDlg;
 
@@ -278 +295 @@
 
     AFDlg.DoModal();
+    UpdateFriendList();
 }
 
@@ -287 +305 @@
 
     AGCDlg.chev = &this->chev;
-
+    AGCDlg.mMsgrClntDlg = this;
     AGCDlg.DoModal();
-}
+
+    mFriendListBox.InsertString(mFriendListBox.GetCount(), AGCDlg.groupChat);
+}
+
+void CChevMsgrClient_MFCDlg::UpdateFriendList()
+{
+    CString cstrId;
+    if (!chev.getFriendList(idList))
+    {
+        AfxMessageBox(_T("cannot get friend list"));
+        ::SendMessage(GetSafeHwnd(), WM_QUIT, NULL, NULL);
+    }
+
+    this->mFriendListBox.ResetContent();
+
+    for (size_t iter = 0; iter < idList.size(); iter++)
+    {
+        cstrId = str2cstr(idList[iter].id);
+        this->mFriendListBox.InsertString(this->mFriendListBox.GetCount(), cstrId);
+    }
+}
+
+void CChevMsgrClient_MFCDlg::OnLbnSelchangeListFriends()
+{
+    // TODO: ¿©±â¿¡ ÄÁÆ®·Ñ ¾Ë¸² 󸮱â Äڵ带 Ãß°¡ÇÕ´Ï´Ù.
+    mChatListBox.ResetContent();
+    int idx = mFriendListBox.GetCurSel();
+    
+    if (idx < 0)
+        return;
+    
+    if (scl[idx].sessionId == "")
+        return;
+
+    for (std::list<SConversation>::iterator iter = scl[idx].chatList.begin();
+    iter != scl[idx].chatList.end(); iter++)
+    {
+        mChatListBox.InsertString(mChatListBox.GetCount(), str2cstr("<" + iter->from + ">"));
+        mChatListBox.InsertString(mChatListBox.GetCount(), str2cstr(iter->message));
+        mChatListBox.InsertString(mChatListBox.GetCount(), _T(""));
+    }
+}

trunk/msvc14/ChevMsgrClient_MFC/ChevMsgrClient_MFCDlg.h

@@ -48 +48 @@
     afx_msg void OnBnClickedBtnAddFriend();
     afx_msg void OnBnClickedBtnAddChat();
+    void UpdateFriendList();
+    afx_msg void OnLbnSelchangeListFriends();
 };