Changeset 32 in chevmsgr

Timestamp:

12/07/15 18:32:33 (8 years ago)

Author:

cheese

Message:

UI 검색기능 추가
클라이언트 수정

Location:

trunk

Files:

• msgclnt.cpp (modified) (1 diff)
• msvc14/ChevMsgrClient_MFC/ChevMsgrClient_MFC.rc (modified) ( previous)
• msvc14/ChevMsgrClient_MFC/ChevMsgrClient_MFCDlg.cpp (modified) (4 diffs)
• msvc14/ChevMsgrClient_MFC/ChevMsgrClient_MFCDlg.h (modified) (1 diff)
• msvc14/ChevMsgrClient_MFC/Resource.h (modified) ( previous)
• msvc14/ChevMsgrClient_MFC/cnct2srv.ini (modified) (1 diff)

trunk/msgclnt.cpp

@@ -341 +341 @@
             Protocol::Message message = messageQ.pop(ProtocolType::OPEN_SESSION);
 
-            std::string sessionID = message.get<std::string>(ProtocolType::SESSION_ID);
-            sessionMap[concat] = sessionID;
-
             if (message.mObject.HasKey(ProtocolType::SESSION_KEY))
             {
+                std::string sessionID = message.get<std::string>(ProtocolType::SESSION_ID);
+                sessionMap[concat] = sessionID;
                 std::string encodedKey = message.get<std::string>(ProtocolType::SESSION_KEY);
                 cf::bin key = cf::codec::hex::getInstance()->decode(encodedKey);

trunk/msvc14/ChevMsgrClient_MFC/ChevMsgrClient_MFCDlg.cpp

@@ -69 +69 @@
     : CDialogEx(IDD_CHEVMSGRCLIENT_MFC_DIALOG, pParent)
     , mCheckedSensitive(FALSE)
+    , mSearch(_T(""))
+    , mSearchIndex(0)
 {
     m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
@@ -80 +82 @@
     DDX_Control(pDX, IDC_LIST_FRIENDS, mFriendListBox);
     DDX_Check(pDX, IDC_CHECK_SENSITIVE, mCheckedSensitive);
+    DDX_Text(pDX, IDC_EDIT_SEARCH, mSearch);
 }
 
@@ -91 +94 @@
     ON_LBN_SELCHANGE(IDC_LIST_FRIENDS, &CChevMsgrClient_MFCDlg::OnLbnSelchangeListFriends)
     ON_WM_TIMER()
+    ON_BN_CLICKED(IDC_BTN_SEARCH, &CChevMsgrClient_MFCDlg::OnBnClickedBtnSearch)
 END_MESSAGE_MAP()
 
@@ -462 +466 @@
     CDialogEx::OnTimer(nIDEvent);
 }
+
+void CChevMsgrClient_MFCDlg::OnBnClickedBtnSearch()
+{
+    // TODO: ¿©±â¿¡ ÄÁÆ®·Ñ ¾Ë¸² 󸮱â Äڵ带 Ãß°¡ÇÕ´Ï´Ù.
+    UpdateData(TRUE);
+    CString search;
+    int test = mChatListBox.GetCount();
+
+    if (mSearch == "")
+        return;
+
+    for (int iter = mSearchIndex; ; iter++)
+    {
+        if ((iter * 3) == mChatListBox.GetCount())
+        {
+            mSearchIndex = -1;
+            break;
+        }
+        mChatListBox.GetText((iter * 3) + 1, search);
+
+        if (search.Find(mSearch, 0) != -1)
+        {
+            mChatListBox.SetCurSel((iter * 3) + 1);
+            mSearchIndex = iter;
+            break;
+        }
+    }
+    mSearchIndex++;
+}

trunk/msvc14/ChevMsgrClient_MFC/ChevMsgrClient_MFCDlg.h

@@ -57 +57 @@
     afx_msg void OnLbnSelchangeListFriends();
     afx_msg void OnTimer(UINT_PTR nIDEvent);
+    afx_msg void OnBnClickedBtnSearch();
+    CString mSearch;
+    int mSearchIndex;
 };

trunk/msvc14/ChevMsgrClient_MFC/cnct2srv.ini

@@ -1 @@
-192.168.0.15
+127.0.0.1
 6051