Changeset 4905

Timestamp:

05/13/07 03:23:46 (19 months ago)

Author:

flynd

Message:

Implemented a qt4 model representing the contact list in the licq daemon.

The model is a tree structure with all groups (including system groups) as root elements and users sub elements.
Each group also contains the bars used to separate online and offline contacts.
The list is unsorted and no users or groups can be hidden. Proxy models are needed to present a sorted and filtered contact list to a view.

The file contactlist.h contains the public interface to access the model and contactlistdata.h contains the internal classes used by the model.
Everything in contactlistdata is internal to the model and is not meant to be included anywhere else as all access should be made through the CContactList interface.

The classes in contactlistdata represents the users, groups and bars that previously was handled by CUserViewItem.
The item types are now implemented as separate classes (CContactUser, CContactGroup, CContactBar) with the little they have in common inherited from the base class CContactItem.
As a user can be a member of multiple groups the CContactUser class does not contain any data. Instead there is a CContactUserData object for each actual contact that the CContactUser objects share.

Much of the code in CContactUserData is just copied from CUserViewItem.
Currently animations are triggered from the model, they should perhaps be handled entirly by the view and delegate. Since the delegate is stateless and the view doesn't really know what data it is presenting it was easier to implement this way.

Known problems:
- The model is not updated when contacts are added to or removed from groups. This is because the daemon does not notify plugins of contact group changes.

Location:

branches/qt-gui_qt4/src

Files:

• CMakeLists.txt (modified) (1 diff)
• contactlist.cpp (added)
• contactlist.h (added)
• contactlistdata.cpp (added)
• contactlistdata.h (added)
• mainwin.cpp (modified) (13 diffs)
• mainwin.h (modified) (2 diffs)
• optionsdlg.cpp (modified) (2 diffs)

branches/qt-gui_qt4/src/CMakeLists.txt

@@ -7 +7 @@
   chatdlg.cpp
   chatjoin.cpp
+  contactlist.cpp
+  contactlistdata.cpp
   editfile.cpp
   editfilelistdlg.cpp

branches/qt-gui_qt4/src/mainwin.cpp

@@ -97 +97 @@
 #include "emoticon.h"
 #include "ownermanagerdlg.h"
+#include "contactlist.h"
 
 #ifdef USE_KDE
@@ -677 +678 @@
      colInfo.push_back(new CColumnInfo(QString::fromLocal8Bit(colTitle), colFormat, colWidth, colAlign));
   }
+  contactList = new CContactList(theSigMan, this);
   CreateUserView();
 
@@ -1126 +1128 @@
 CMainWindow::~CMainWindow()
 {
+  delete contactList;
   delete licqIcon;
   if (skin) delete skin;
@@ -1863 +1866 @@
 void CMainWindow::updateUserWin()
 {
+  // Reload contact list from the daemon
+  contactList->reloadAll();
   // set the pixmap and color for each user and add them to the view
   userView->setUpdatesEnabled(false);
@@ -3470 +3475 @@
     }
   }
+
+  // The daemon does not send an update when group membership changes so tell the contactList it needs to update
+  contactList->updateUser(m_szUserMenuId, m_nUserMenuPPID);
 }
 
@@ -3493 +3501 @@
          gUserManager.RemoveUserFromGroup(szId, nPPID, group);
          updateUserWin();
+
+        // The daemon does not send an update when group membership changes so tell the contactList it needs to update
+        contactList->updateUser(m_szUserMenuId, m_nUserMenuPPID);
          return true;
       }
@@ -3505 +3516 @@
     gUserManager.DropUser(u);
     updateUserWin();
+
+    // The daemon does not send an update when group membership changes so tell the contactList it needs to update
+    contactList->updateUser(m_szUserMenuId, m_nUserMenuPPID);
     return true;
   }
@@ -3510 +3524 @@
   return false;
 }
-
 
 bool CMainWindow::RemoveUserFromGroup(GroupType gtype, unsigned long group, unsigned long nUin, QWidget *p)
@@ -3533 +3546 @@
          gUserManager.RemoveUserFromGroup(nUin, group);
          updateUserWin();
+
+        // The daemon does not send an update when group membership changes so tell the contactList it needs to update
+        contactList->updateUser(m_szUserMenuId, m_nUserMenuPPID);
          return true;
       }
@@ -3545 +3561 @@
     gUserManager.DropUser(u);
     updateUserWin();
+
+    // The daemon does not send an update when group membership changes so tell the contactList it needs to update
+    contactList->updateUser(m_szUserMenuId, m_nUserMenuPPID);
     return true;
   }
@@ -3592 +3611 @@
 
   gUserManager.AddUserToGroup(m_szUserMenuId, m_nUserMenuPPID, a->data().toInt());
+
+  // The daemon does not send an update when group membership changes so tell the contactList it needs to update
+  contactList->updateUser(m_szUserMenuId, m_nUserMenuPPID);
   updateUserWin();
 }
@@ -4273 +4295 @@
      // TODO Qt4 mnuUser->changeItem(QIcon(pmCustomAR), tr("Custom Auto Response..."), mnuUserCustomAutoResponse);
      updateUserWin();
+    contactList->configUpdated();
    }
 }
@@ -4491 +4514 @@
      CUserView::UpdateFloaties();
      updateUserWin();
+    contactList->configUpdated();
      updateEvents();
      updateStatus(0); //This shows ICQ status for the status label and dock icon

branches/qt-gui_qt4/src/mainwin.h

@@ -75 +75 @@
 class UserSendCommon;
 class IconManager;
+class CContactList;
 class CUserView;
 
@@ -215 +216 @@
   FlashType m_nFlash;
   CSkin *skin;
+  CContactList* contactList;
 
   unsigned long m_nCurrentGroup, m_nGroupStates;

branches/qt-gui_qt4/src/optionsdlg.cpp

@@ -48 +48 @@
 #endif
 
+#include "contactlist.h"
 #include "ewidgets.h"
 #include "optionsdlg.h"
@@ -678 +679 @@
   mainwin->CreateUserView();
   mainwin->updateUserWin();
+  mainwin->contactList->configUpdated();
   mainwin->resizeEvent(NULL);
   mainwin->userView->show();