Ticket #1455: patch5.diff

UsersListCtrl.cpp

@@ -52 +53 @@
     ON_COMMAND(ID_USERVIEWCONTEXT_KICK, OnContextmenuKick)
     ON_WM_CONTEXTMENU()
     //}}AFX_MSG_MAP
+    ON_WM_SIZE()
 END_MESSAGE_MAP()
 
 /////////////////////////////////////////////////////////////////////////////
@@ -62 +64 @@
     if (CListCtrl::OnCreate(lpCreateStruct) == -1)
         return -1;
     
-    InsertColumn(0,"Connected users",LVCFMT_LEFT,1000);
+    InsertColumn(0,"ID",LVCFMT_RIGHT,-1,0);
+    InsertColumn(1,"Account",LVCFMT_LEFT,-1,1);
+    InsertColumn(2,"IP",LVCFMT_RIGHT,-1,2);
+    AutoResizeColumns();
+
     return 0;
 }
 
+void CUsersListCtrl::AutoResizeColumns()
+{
+    SetColumnWidth(0,LVSCW_AUTOSIZE_USEHEADER);
+    SetColumnWidth(1,LVSCW_AUTOSIZE_USEHEADER);
+    SetColumnWidth(2,LVSCW_AUTOSIZE_USEHEADER);
+}
+
 void CUsersListCtrl::ProcessConnOp(int op, const t_connectiondata &connectionData)
 {
     if (op == USERCONTROL_CONNOP_ADD)
     {
-        CString str;
+        CString str_id;
+        str_id.Format("%06d",connectionData.userid);
+        int index = InsertItem(GetItemCount(), str_id);
         if (connectionData.user == "")
-            str.Format("(not logged in) (%06d)",connectionData.userid);
+            SetItemText(index,1,"(not logged in)");
         else
-            str.Format("%s (%06d)", connectionData.user, connectionData.userid);
-        int index = InsertItem(GetItemCount(), str);
+            SetItemText(index,1,connectionData.user);
+        SetItemText(index,2,connectionData.ip);
         t_connectiondata *pData = new t_connectiondata;
         *pData = connectionData;
         SetItemData(index, (DWORD)pData);
+        AutoResizeColumns();
 
         if (GetItemCount() == 1)
             m_pOwner->SetIcon();
@@ -92 +108 @@
             {
                 *pData = connectionData;
 
-                CString str;
+                CString str_id;
+                str_id.Format("%06d",connectionData.userid);
+                SetItemText(i,0,str_id);
                 if (connectionData.user=="")
-                    str.Format("(not logged in) (%06d)",connectionData.userid);
+                    SetItemText(i,1,"(not logged in)");
                 else
-                    str.Format("%s (%06d)",connectionData.user,connectionData.userid);
-                SetItemText(i,0,str);
+                    SetItemText(i,1,connectionData.user);
+                AutoResizeColumns();
+
                 break;
             }
         }
@@ -111 +130 @@
             {
                 delete pData;
                 DeleteItem(i);
+                AutoResizeColumns();
                 break;
             }
         }
@@ -257 +277 @@
         break;
     }
     return TRUE;
-}
- No newline at end of file
+}
+
+void CUsersListCtrl::OnSize(UINT nType, int cx, int cy)
+{
+    CListCtrl::OnSize(nType, cx, cy);
+
+    AutoResizeColumns();
+}

UsersListCtrl.h

@@ -42 +42 @@
 // Operationen
 public:
     BOOL ParseUserControlCommand(unsigned char *pData, DWORD dwDataLength);
+    void AutoResizeColumns();
 
 // Überschreibungen
     // Vom Klassen-Assistenten generierte virtuelle Funktionsüberschreibungen
@@ -63 +64 @@
     //}}AFX_MSG
 
     DECLARE_MESSAGE_MAP()
+public:
+    afx_msg void OnSize(UINT nType, int cx, int cy);
 };
 
 

UsersView.cpp

@@ -95 +95 @@
     
     CMainFrame *pMainFrame = (CMainFrame *)AfxGetMainWnd();
     m_pListCtrl=new CUsersListCtrl(pMainFrame);
-    m_pListCtrl->Create(LVS_NOSORTHEADER|LVS_REPORT|WS_CHILD | WS_VISIBLE | LVS_SHOWSELALWAYS|LVS_SHAREIMAGELISTS|WS_VSCROLL|LVS_NOCOLUMNHEADER,CRect(0,0,0,0),this,0);
+    m_pListCtrl->Create(LVS_NOSORTHEADER|LVS_REPORT|WS_CHILD | WS_VISIBLE | LVS_SHOWSELALWAYS|LVS_SHAREIMAGELISTS|WS_VSCROLL,CRect(0,0,0,0),this,0);
     
     return 0;
 }