Changeset 6200 for trunk/qt4-gui/src/contactlist

Timestamp:

05/25/08 06:25:18 (6 months ago)

Author:

flynd

Message:

Use new group subsignals from daemon. Removed some workarounds no longer needed.

Location:

trunk/qt4-gui/src/contactlist

Files:

• contactgroup.cpp (modified) (3 diffs)
• contactgroup.h (modified) (1 diff)
• contactlist.cpp (modified) (3 diffs)

trunk/qt4-gui/src/contactlist/contactgroup.cpp

@@ -21 +21 @@
 #include "contactgroup.h"
 
+#include <licq_user.h>
+
 #include "contactbar.h"
 #include "contactuser.h"
@@ -55 +57 @@
   for (int i = 0; i < 3; ++i)
     delete myBars[i];
+}
+
+void ContactGroup::update()
+{
+  GroupList* g = gUserManager.LockGroupList(LOCK_R);
+  myName = QString::fromLocal8Bit((*g)[myGroupId-1]);
+  gUserManager.UnlockGroupList();
+
+  emit dataChanged(this);
 }
 
@@ -198 +209 @@
     return false;
 
-  if (value.toString() == myName)
+  QString newName = value.toString();
+  if (newName == myName)
     return true;
 
-  myName = value.toString();
-  gUserManager.RenameGroup(myGroupId, myName.toLocal8Bit());
-
-  // Daemon doesn't signal when groups change so trigger update from here
-  emit dataChanged(this);
+  // Don't save new name here, daemon will signal us when name has changed
+  gUserManager.RenameGroup(myGroupId, newName.toLocal8Bit());
 
   return true;

trunk/qt4-gui/src/contactlist/contactgroup.h

@@ -56 +56 @@
    */
   virtual ~ContactGroup();
+
+  /**
+   * Group data in daemon has changed and needs to be refetched
+   */
+  void update();
 
   /**

trunk/qt4-gui/src/contactlist/contactlist.cpp

@@ -56 +56 @@
 }
 
-ContactListModel::~ContactListModel()
-{
-  // Delete all users and groups
-  clear();
-
-  // Delete the system groups
-  for (unsigned long i = 0; i < NUM_GROUPS_SYSTEM_ALL; ++i)
-    delete mySystemGroups[i];
-}
-
 ContactGroup* ContactListModel::createGroup(unsigned short id, QString name)
 {
@@ -76 +66 @@
 }
 
+ContactListModel::~ContactListModel()
+{
+  // Delete all users and groups
+  clear();
+
+  // Delete the system groups
+  for (unsigned long i = 0; i < NUM_GROUPS_SYSTEM_ALL; ++i)
+    delete mySystemGroups[i];
+}
+
 void ContactListModel::listUpdated(CICQSignal* sig)
 {
   switch(sig->SubSignal())
   {
-    case LIST_ALL:
+    case LIST_INVALIDATE:
       reloadAll();
       break;
 
-    case LIST_ADD:
+    case LIST_CONTACT_ADDED:
     {
       ICQUser* u = gUserManager.FetchUser(sig->Id(), sig->PPID(), LOCK_R);
@@ -96 +96 @@
       break;
     }
-    case LIST_REMOVE:
+    case LIST_CONTACT_REMOVED:
       removeUser(sig->Id(), sig->PPID());
       break;
+
+    case LIST_GROUP_ADDED:
+    {
+      unsigned short gid = sig->Argument();
+
+      GroupList* g = gUserManager.LockGroupList(LOCK_R);
+      ContactGroup* newGroup = createGroup(gid, QString::fromLocal8Bit((*g)[gid-1]));
+      gUserManager.UnlockGroupList();
+
+      beginInsertRows(QModelIndex(), myUserGroups.size(), myUserGroups.size());
+      myUserGroups.append(newGroup);
+      endInsertRows();
+      break;
+    }
+
+    case LIST_GROUP_REMOVED:
+    {
+      unsigned short gid = sig->Argument();
+
+      for (int i = 0; i < myUserGroups.size(); ++i)
+      {
+        ContactGroup* group = myUserGroups.at(i);
+        if (group->groupId() == gid)
+        {
+          beginRemoveRows(QModelIndex(), i, i);
+          myUserGroups.removeAll(group);
+          endRemoveRows();
+          delete group;
+        }
+      }
+      break;
+    }
+
+    case LIST_GROUP_CHANGED:
+    {
+      unsigned short gid = sig->Argument();
+
+      for (int i = 0; i < myUserGroups.size(); ++i)
+      {
+        ContactGroup* group = myUserGroups.at(i);
+        if (group->groupId() == gid)
+          group->update();
+      }
+      break;
+    }
   }
 }