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

Timestamp:

06/14/08 23:21:57 (6 months ago)

Author:

flynd

Message:

dataChanged signal cannot be sent between beginInsertRow and endInsertRow. Revised signalling when adding and removing users in groups to fix this. This fixes the empty rows sometimes seen first in groups after users have been added.

Location:

trunk/qt4-gui/src/contactlist

Files:

• contactgroup.cpp (modified) (4 diffs)
• contactgroup.h (modified) (1 diff)
• contactlist.cpp (modified) (11 diffs)
• contactlist.h (modified) (2 diffs)

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

@@ -133 +133 @@
 void ContactGroup::addUser(ContactUser* user, ContactListModel::SubGroupType subGroup)
 {
+  // Signal that we are about to add a row
+  emit beginInsert(this, rowCount());
+
   myUsers.append(user);
   if (user->visibility())
@@ -139 +142 @@
   myEvents += user->numEvents();
   myBars[subGroup]->updateNumEvents(user->numEvents());
+
+  // Signal that we're done adding
+  emit endInsert();
+
+  // Update group and bar as counters may have changed
   emit barDataChanged(myBars[subGroup], subGroup);
-
   emit dataChanged(this);
 }
@@ -146 +153 @@
 void ContactGroup::removeUser(ContactUser* user, ContactListModel::SubGroupType subGroup)
 {
+  // Signal that we are about to remove a row
+  emit beginRemove(this, indexOf(user));
+
   myUsers.removeAll(user);
   if (user->visibility())
@@ -152 +162 @@
   myEvents -= user->numEvents();
   myBars[subGroup]->updateNumEvents(-user->numEvents());
+
+  // Signal that we're done removing
+  emit endRemove();
+
+  // Update group and bar as counters may have changed
   emit barDataChanged(myBars[subGroup], subGroup);
-
   emit dataChanged(this);
 }

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

@@ -181 +181 @@
    */
   void barDataChanged(ContactBar* bar, int row);
+
+  /**
+   * Signal emitted before a user is added
+   *
+   * @param group The affected group (always sent as this)
+   * @param row Row number for the new user
+   */
+  void beginInsert(ContactGroup* group, int row);
+
+  /**
+   * Signal emitted after a user has been added
+   */
+  void endInsert();
+
+  /**
+   * Signal emitted before a user is removed
+   *
+   * @param group The affected group (always sent as this)
+   * @param row Row number for the user to be removed
+   */
+  void beginRemove(ContactGroup* gorup, int row);
+
+  /**
+   * Segnal emitted after a user has been removed
+   */
+  void endRemove();
 
 private:

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

@@ -63 +63 @@
   connect(group, SIGNAL(barDataChanged(ContactBar*, int)),
       SLOT(barDataChanged(ContactBar*, int)));
+  connect(group, SIGNAL(beginInsert(ContactGroup*, int)),
+      SLOT(groupBeginInsert(ContactGroup*, int)));
+  connect(group, SIGNAL(endInsert()), SLOT(groupEndInsert()));
+  connect(group, SIGNAL(beginRemove(ContactGroup*, int)),
+      SLOT(groupBeginRemove(ContactGroup*, int)));
+  connect(group, SIGNAL(endRemove()), SLOT(groupEndRemove()));
   return group;
 }
@@ -236 +242 @@
     return;
 
-  int groupRow = (group->groupId() < SystemGroupOffset
-      ? myUserGroups.indexOf(group)
-      : myUserGroups.size() + group->groupId() - SystemGroupOffset);
-
-  emit dataChanged(createIndex(groupRow, 0, group), createIndex(groupRow, myColumnCount - 1, group));
+  int row = groupRow(group);
+  emit dataChanged(createIndex(row, 0, group), createIndex(row, myColumnCount - 1, group));
 }
 
@@ -249 +252 @@
 
   emit dataChanged(createIndex(row, 0, bar), createIndex(row, myColumnCount - 1, bar));
+}
+
+void ContactListModel::groupBeginInsert(ContactGroup* group, int row)
+{
+  beginInsertRows(createIndex(groupRow(group), 0, group), row, row);
+}
+
+void ContactListModel::groupEndInsert()
+{
+  endInsertRows();
+}
+
+void ContactListModel::groupBeginRemove(ContactGroup* group, int row)
+{
+  beginRemoveRows(createIndex(groupRow(group), 0, group), row, row);
+}
+
+void ContactListModel::groupEndRemove()
+{
+  endRemoveRows();
 }
 
@@ -261 +284 @@
 
   // Add all groups
-  beginInsertRows(QModelIndex(), 0, gUserManager.NumGroups() + 1);
-
   ContactGroup* newGroup = createGroup(0, tr("Other Users"));
   myUserGroups.append(newGroup);
@@ -277 +298 @@
   FOR_EACH_GROUP_END
 
-  endInsertRows();
-
   // Add all users
   FOR_EACH_USER_START(LOCK_R)
@@ -299 +318 @@
   }
   return 0;
+}
+
+int ContactListModel::groupRow(ContactGroup* group) const
+{
+  unsigned short groupId = group->groupId();
+
+  if (groupId < SystemGroupOffset)
+    return myUserGroups.indexOf(group);
+  else if (groupId <= SystemGroupOffset + NUM_GROUPS_SYSTEM_ALL)
+    return myUserGroups.size() + groupId - SystemGroupOffset;
+  else
+    return -1;
 }
 
@@ -322 +353 @@
     bool shouldBeMember = (gid != 0 && licqUser->GetInGroup(GROUPS_USER, gid)) ||
         (gid == 0 && licqUser->GetGroups().empty() && !licqUser->IgnoreList());
-    updateUserGroup(user, group, i, shouldBeMember);
+    updateUserGroup(user, group, shouldBeMember);
   }
 
@@ -328 +359 @@
   for (unsigned long i = 0; i < NUM_GROUPS_SYSTEM_ALL; ++i)
   {
-    updateUserGroup(user, mySystemGroups[i], myUserGroups.size()+i, licqUser->GetInGroup(GROUPS_SYSTEM, i));
-  }
-}
-
-void ContactListModel::updateUserGroup(ContactUserData* user, ContactGroup* group, int groupRow, bool shouldBeMember)
+    updateUserGroup(user, mySystemGroups[i], licqUser->GetInGroup(GROUPS_SYSTEM, i));
+  }
+}
+
+void ContactListModel::updateUserGroup(ContactUserData* user, ContactGroup* group, bool shouldBeMember)
 {
   ContactUser* member = group->user(user);
@@ -340 +371 @@
     return;
 
+  // Adding or removing the user is enough here, signals will be sent from group
   if (shouldBeMember)
-  {
-    // Add user to group
-    beginInsertRows(createIndex(groupRow, 0, group), group->rowCount(), group->rowCount());
     new ContactUser(user, group);
-    endInsertRows();
-  }
   else
-  {
-    // Remove user from the group
-    int index = group->indexOf(member);
-    beginRemoveRows(createIndex(groupRow, 0, group), index, index);
     delete member;
-    endRemoveRows();
-  }
 }
 
@@ -367 +388 @@
     ContactGroup* group = u->group();
     int pos = group->indexOf(u);
-    int groupRow = (group->groupId() < SystemGroupOffset ? myUserGroups.indexOf(group) : myUserGroups.size() + group->groupId() - SystemGroupOffset);
-    beginRemoveRows(createIndex(groupRow, 0, group), pos, pos);
+    beginRemoveRows(createIndex(groupRow(group), 0, group), pos, pos);
     delete u;
     endRemoveRows();
@@ -436 +456 @@
       return QModelIndex();
   }
-  int groupRow = (group->groupId() < SystemGroupOffset ? myUserGroups.indexOf(group) : myUserGroups.size() + group->groupId() - SystemGroupOffset);
-  return createIndex(groupRow, 0, group);
+  return createIndex(groupRow(group), 0, group);
 }
 

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

@@ -376 +376 @@
 
   /**
+   * A group is about to add a user
+   * Will send beginInsertRow signal for the user
+   *
+   * @param group The group that's adding the user
+   * @param row The row the new user will have in the group
+   */
+  void groupBeginInsert(ContactGroup* group, int row);
+
+  /**
+   * A group has finished adding a user
+   * Will send endInsertRow signal
+   */
+  void groupEndInsert();
+
+  /**
+   * A group is about to remove a user
+   * Will send beginRemoveRow signal for the user
+   *
+   * @param group The group that's removing the user
+   * @param row The row of the user about to be removed
+   */
+  void groupBeginRemove(ContactGroup* group, int row);
+
+  /**
+   * A group has finished removing a user
+   * Will send endRemoveRow signal
+   */
+  void groupEndRemove();
+
+  /**
    * Update the user membership in all groups
    * This is triggered by the user data object when its group membership (may) have changed
@@ -408 +438 @@
    * @param user The user to update
    * @param group The group to check
-   * @param groupRow The row index of the group
    * @param shouldBeMember True to add the user if missing or false to remove if member
    */
-  void updateUserGroup(ContactUserData* user, ContactGroup* group, int groupRow, bool shouldBeMember);
+  void updateUserGroup(ContactUserData* user, ContactGroup* group, bool shouldBeMember);
+
+  /**
+   * Get model row for a group
+   *
+   * @param group A group object
+   * @return Row in model or -1 if not found
+   */
+  int groupRow(ContactGroup* group) const;
 
   QList<ContactGroup*> myUserGroups;