Changeset 6477 for trunk/qt4-gui/src

Timestamp:

08/07/08 04:41:10 (4 months ago)

Author:

flynd

Message:

Only update groups that have actually changed. Set server group before local group so we never locally remove the server group from a user.

Location:

trunk/qt4-gui/src/userdlg

Files:

• modes.cpp (modified) (4 diffs)
• modes.h (modified) (2 diffs)

trunk/qt4-gui/src/userdlg/modes.cpp

@@ -136 +136 @@
   mySysGroupLayout = new QVBoxLayout(mySysGroupBox);
 
-  myOnlineNotifyCheck = new QCheckBox(tr("Online notify"));
-  myOnlineNotifyCheck->setToolTip(tr("Notify when this contact comes online."));
-  mySysGroupLayout->addWidget(myOnlineNotifyCheck);
-
-  myVisibleListCheck = new QCheckBox(tr("Visible List"));
-  myVisibleListCheck->setToolTip(tr("Contact will see you online even if you're invisible."));
-  mySysGroupLayout->addWidget(myVisibleListCheck);
-
-  myInvisibleListCheck = new QCheckBox(tr("Invisible List"));
-  myInvisibleListCheck->setToolTip(tr("Contact will always see you as offline."));
-  mySysGroupLayout->addWidget(myInvisibleListCheck);
-
-  myIgnoreListCheck = new QCheckBox(tr("Ignore List"));
-  myIgnoreListCheck->setToolTip(tr("Ignore any events from this contact."));
-  mySysGroupLayout->addWidget(myIgnoreListCheck);
-
-  myNewUsersCheck = new QCheckBox(tr("New Users"));
-  myNewUsersCheck->setToolTip(tr("Contact was recently added to the list."));
-  mySysGroupLayout->addWidget(myNewUsersCheck);
+  mySystemGroupCheck[GROUP_ONLINE_NOTIFY] = new QCheckBox(tr("Online notify"));
+  mySystemGroupCheck[GROUP_ONLINE_NOTIFY]->setToolTip(tr("Notify when this contact comes online."));
+  mySysGroupLayout->addWidget(mySystemGroupCheck[GROUP_ONLINE_NOTIFY]);
+
+  mySystemGroupCheck[GROUP_VISIBLE_LIST] = new QCheckBox(tr("Visible List"));
+  mySystemGroupCheck[GROUP_VISIBLE_LIST]->setToolTip(tr("Contact will see you online even if you're invisible."));
+  mySysGroupLayout->addWidget(mySystemGroupCheck[GROUP_VISIBLE_LIST]);
+
+  mySystemGroupCheck[GROUP_INVISIBLE_LIST] = new QCheckBox(tr("Invisible List"));
+  mySystemGroupCheck[GROUP_INVISIBLE_LIST]->setToolTip(tr("Contact will always see you as offline."));
+  mySysGroupLayout->addWidget(mySystemGroupCheck[GROUP_INVISIBLE_LIST]);
+
+  mySystemGroupCheck[GROUP_IGNORE_LIST] = new QCheckBox(tr("Ignore List"));
+  mySystemGroupCheck[GROUP_IGNORE_LIST]->setToolTip(tr("Ignore any events from this contact."));
+  mySysGroupLayout->addWidget(mySystemGroupCheck[GROUP_IGNORE_LIST]);
+
+  mySystemGroupCheck[GROUP_NEW_USERS] = new QCheckBox(tr("New Users"));
+  mySystemGroupCheck[GROUP_NEW_USERS]->setToolTip(tr("Contact was recently added to the list."));
+  mySysGroupLayout->addWidget(mySystemGroupCheck[GROUP_NEW_USERS]);
 
   mySysGroupLayout->addStretch(1);
@@ -188 +188 @@
 
   myPageGroupsLayout->addWidget(myGroupsBox);
-  myPageGroupsLayout->addStretch(1);
 
   return w;
@@ -218 +217 @@
   myStatusDndRadio->setChecked(statusToUser == ICQ_STATUS_DND);
 
-  myOnlineNotifyCheck->setChecked(user->OnlineNotify());
-  myVisibleListCheck->setChecked(user->VisibleList());
-  myInvisibleListCheck->setChecked(user->InvisibleList());
-  myIgnoreListCheck->setChecked(user->IgnoreList());
-  myNewUsersCheck->setChecked(user->NewUser());
+  for (unsigned short i = 1; i < NUM_GROUPS_SYSTEM_ALL; ++i)
+    mySystemGroupCheck[i]->setChecked(user->GetInGroup(GROUPS_SYSTEM, i));
 
   unsigned int ppid = user->PPID();
@@ -329 +325 @@
     return;
 
-  // Set user groups (SetUserInGroup will take lock so must be called here)
+  const ICQUser* u = gUserManager.FetchUser(id.toLatin1(), ppid, LOCK_R);
+  if (u == NULL)
+    return;
+
+  // Get current group memberships so we only set those that have actually changed
+  int serverGroup = 0;
+  if (u->GetSID() != 0)
+    serverGroup = gUserManager.GetGroupFromID(u->GetGSID());
+  const UserGroupList& userGroups = u->GetGroups();
+  unsigned long systemGroups = u->GetSystemGroups();
+
+  gUserManager.DropUser(u);
+
+  // First set server group
   for (int i = 0; i < myGroupsTable->rowCount(); ++i)
   {
     unsigned short gid = myGroupsTable->item(i, 0)->data(Qt::UserRole).toUInt();
 
+    if (dynamic_cast<QRadioButton*>(myGroupsTable->cellWidget(i, 2))->isChecked())
+    {
+      if (gid != serverGroup)
+        gUserManager.SetUserInGroup(id.toLatin1().data(), ppid, GROUPS_USER, gid, true, true);
+    }
+  }
+
+  // Set local user groups
+  for (int i = 0; i < myGroupsTable->rowCount(); ++i)
+  {
+    unsigned short gid = myGroupsTable->item(i, 0)->data(Qt::UserRole).toUInt();
+
     bool inLocal = dynamic_cast<QCheckBox*>(myGroupsTable->cellWidget(i, 1))->isChecked();
-    bool inServer = dynamic_cast<QRadioButton*>(myGroupsTable->cellWidget(i, 2))->isChecked();
-    gUserManager.SetUserInGroup(id.toLatin1().data(), ppid, GROUPS_USER, gid, inLocal | inServer, inServer);
+    if ((userGroups.count(gid) > 0) != inLocal)
+      gUserManager.SetUserInGroup(id.toLatin1().data(), ppid, GROUPS_USER, gid, inLocal, false);
   }
 
   // Set system groups
-  gUserManager.SetUserInGroup(id.toLatin1().data(), ppid, GROUPS_SYSTEM,
-      GROUP_ONLINE_NOTIFY, myOnlineNotifyCheck->isChecked(), true);
-  gUserManager.SetUserInGroup(id.toLatin1().data(), ppid, GROUPS_SYSTEM,
-      GROUP_VISIBLE_LIST, myVisibleListCheck->isChecked(), true);
-  gUserManager.SetUserInGroup(id.toLatin1().data(), ppid, GROUPS_SYSTEM,
-      GROUP_INVISIBLE_LIST, myInvisibleListCheck->isChecked(), true);
-  gUserManager.SetUserInGroup(id.toLatin1().data(), ppid, GROUPS_SYSTEM,
-      GROUP_IGNORE_LIST, myIgnoreListCheck->isChecked(), true);
-  gUserManager.SetUserInGroup(id.toLatin1().data(), ppid, GROUPS_SYSTEM,
-      GROUP_NEW_USERS, myNewUsersCheck->isChecked(), true);
+  for (unsigned short i = 1; i < NUM_GROUPS_SYSTEM_ALL; ++i)
+  {
+    bool inGroup = mySystemGroupCheck[i]->isChecked();
+    if ((systemGroups & (1L << (i - 1))) != inGroup)
+      gUserManager.SetUserInGroup(id.toLatin1().data(), ppid, GROUPS_SYSTEM, i, inGroup, true);
+  }
 }
 

trunk/qt4-gui/src/userdlg/modes.h

@@ -25 +25 @@
 
 #include <QObject>
+
+#include <licq_user.h>
 
 class QCheckBox;
@@ -112 +114 @@
   QGroupBox* mySysGroupBox;
   QVBoxLayout* mySysGroupLayout;
-  QCheckBox* myOnlineNotifyCheck;
-  QCheckBox* myVisibleListCheck;
-  QCheckBox* myInvisibleListCheck;
-  QCheckBox* myIgnoreListCheck;
-  QCheckBox* myNewUsersCheck;
+  QCheckBox* mySystemGroupCheck[NUM_GROUPS_SYSTEM_ALL];
 
   // Widgets for groups page