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

Timestamp:

06/14/08 03:47:03 (6 months ago)

Author:

flynd

Message:

Updated to work with and take advantage of new group handling. Contact list model is now properly updated from signals when groups change.

Location:

trunk/qt4-gui/src/contactlist

Files:

• contactgroup.cpp (modified) (3 diffs)
• contactgroup.h (modified) (4 diffs)
• contactlist.cpp (modified) (4 diffs)
• contactlist.h (modified) (2 diffs)

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

@@ -36 +36 @@
 {
   if (myGroupId != 0)
-  {
-    mySortKey.sprintf("%10i", myGroupId);
-  }
+    mySortKey = myGroupId;
   else
-  {
     // Put "Other Users" last when sorting
-    mySortKey = QString("9999999999");
-  }
-
+    mySortKey = 65535;
+
+  update();
+
+  for (int i = 0; i < 3; ++i)
+    myBars[i] = new ContactBar(static_cast<ContactListModel::SubGroupType>(i), this);
+}
+
+ContactGroup::ContactGroup(const LicqGroup* group)
+  : ContactItem(ContactListModel::GroupItem),
+    myGroupId(group->id()),
+    myName(group->name().c_str()),
+    mySortKey(group->sortIndex()),
+    myEvents(0),
+    myVisibleContacts(0)
+{
   for (int i = 0; i < 3; ++i)
     myBars[i] = new ContactBar(static_cast<ContactListModel::SubGroupType>(i), this);
@@ -61 +71 @@
 void ContactGroup::update()
 {
-  GroupList* g = gUserManager.LockGroupList(LOCK_R);
-  myName = QString::fromLocal8Bit((*g)[myGroupId-1]);
-  gUserManager.UnlockGroupList();
-
-  emit dataChanged(this);
+  // System groups and "Other users" aren't present in daemon group list
+  if (myGroupId == 0 || myGroupId >= ContactListModel::SystemGroupOffset)
+    return;
+
+  LicqGroup* g = gUserManager.FetchGroup(myGroupId, LOCK_R);
+  if (g == NULL)
+    return;
+
+  myName = QString::fromLocal8Bit(g->name().c_str());
+  mySortKey = g->sortIndex();
+  gUserManager.DropGroup(g);
+
+  emit dataChanged(this);
+}
+
+void ContactGroup::updateSortKey()
+{
+  // System groups and "Other users" aren't present in daemon group list
+  if (myGroupId == 0 || myGroupId >= ContactListModel::SystemGroupOffset)
+    return;
+
+  LicqGroup* g = gUserManager.FetchGroup(myGroupId, LOCK_R);
+  if (g == NULL)
+    return;
+
+  mySortKey = g->sortIndex();
+  gUserManager.DropGroup(g);
 }
 
@@ -214 +246 @@
 
   // Don't save new name here, daemon will signal us when name has changed
-  gUserManager.RenameGroup(myGroupId, newName.toLocal8Bit());
+  gUserManager.RenameGroup(myGroupId, newName.toLocal8Bit().data());
 
   return true;

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

@@ -29 +29 @@
 #include "contactlist.h"
 
+class LicqGroup;
+
 namespace LicqQtGui
 {
@@ -50 +52 @@
    * @param name Group name
    */
-  ContactGroup(unsigned short id, QString name);
+  ContactGroup(unsigned short id, QString name = QString());
+
+  /**
+   * Constructor, creates an empty group
+   *
+   * @param group Group object from daemon
+   */
+  ContactGroup(const LicqGroup* group);
 
   /**
@@ -157 +166 @@
   virtual bool setData(const QVariant& value, int role = ContactListModel::NameRole);
 
+  /**
+   * Update sort key for this group from daemon
+   */
+  void updateSortKey();
+
 signals:
   /**
@@ -171 +185 @@
   unsigned short myGroupId;
   QString myName;
-  QString mySortKey;
+  unsigned short mySortKey;
   int myEvents;
   QList<ContactUser*> myUsers;

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

@@ -103 +103 @@
     {
       unsigned short gid = sig->Argument();
-
-      GroupList* g = gUserManager.LockGroupList(LOCK_R);
-      ContactGroup* newGroup = createGroup(gid, QString::fromLocal8Bit((*g)[gid-1]));
-      gUserManager.UnlockGroupList();
+      ContactGroup* newGroup = createGroup(gid);
 
       beginInsertRows(QModelIndex(), myUserGroups.size(), myUserGroups.size());
@@ -144 +141 @@
       break;
     }
+
+    case LIST_GROUP_REORDERED:
+    {
+      // Get new sort keys for all groups
+      for (int i = 0; i < myUserGroups.size(); ++i)
+        myUserGroups.at(i)->updateSortKey();
+
+      // Send one changed signal for all groups
+      emit dataChanged(createIndex(0, 0, myUserGroups.at(0)),
+          createIndex(myUserGroups.size() + NUM_GROUPS_SYSTEM_ALL - 1, myColumnCount - 1,
+          mySystemGroups[NUM_GROUPS_SYSTEM_ALL-1]));
+
+      break;
+    }
   }
 }
@@ -250 +261 @@
 
   // Add all groups
-  GroupList* g = gUserManager.LockGroupList(LOCK_R);
-  beginInsertRows(QModelIndex(), 0, g->size());
+  beginInsertRows(QModelIndex(), 0, gUserManager.NumGroups() + 1);
 
   ContactGroup* newGroup = createGroup(0, tr("Other Users"));
   myUserGroups.append(newGroup);
 
-  for (unsigned short i = 0; i < g->size(); ++i)
-  {
-    newGroup = createGroup(i+1, QString::fromLocal8Bit((*g)[i]));
-    myUserGroups.append(newGroup);
-  }
+  FOR_EACH_GROUP_START(LOCK_R)
+  {
+    ContactGroup* group = new ContactGroup(pGroup);
+    connect(group, SIGNAL(dataChanged(ContactGroup*)),
+        SLOT(groupDataChanged(ContactGroup*)));
+    connect(group, SIGNAL(barDataChanged(ContactBar*, int)),
+        SLOT(barDataChanged(ContactBar*, int)));
+    myUserGroups.append(group);
+  }
+  FOR_EACH_GROUP_END
 
   endInsertRows();
-  gUserManager.UnlockGroupList();
 
   // Add all users
@@ -307 +321 @@
     unsigned short gid = group->groupId();
     bool shouldBeMember = (gid != 0 && licqUser->GetInGroup(GROUPS_USER, gid)) ||
-        (gid == 0 && licqUser->GetGroups(GROUPS_USER) == 0 && !licqUser->IgnoreList());
+        (gid == 0 && licqUser->GetGroups().empty() && !licqUser->IgnoreList());
     updateUserGroup(user, group, i, shouldBeMember);
   }

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

@@ -74 +74 @@
     ItemTypeRole = Qt::UserRole,        // Type of item (one of enum ItemType)
     NameRole,                           // Item name (alias for UserItems)
-    SortPrefixRole,                     // Primary sort index
-    SortRole,                           // Secondary sort index
+    SortPrefixRole,                     // Primary sort index (UserItems only)
+    SortRole,                           // Sort index (secondary index for UserItems, only index for GroupItems)
     UnreadEventsRole,                   // Number of unread events
     EventSubCommandRole,                // Type of event (UserItems only)
@@ -389 +389 @@
    *
    * @param id Id for the new group
-   * @param name Name for the new group
+   * @param name Name for the new group (only for non standard groups)
    * @return The created group
    */
-  ContactGroup* createGroup(unsigned short id, QString name);
+  ContactGroup* createGroup(unsigned short id, QString name = QString());
 
   /**