Changeset 6258 for branches/qt-gui_group/src/mainwin.cpp

Timestamp:

06/11/08 08:21:55 (7 months ago)

Author:

eugene

Message:

Applied the latest version of flynd's qt-gui patch.

Files:

• branches/qt-gui_group/src/mainwin.cpp (modified) (14 diffs)

branches/qt-gui_group/src/mainwin.cpp

@@ -1484 +1484 @@
       if (m_bThreadView && m_nGroupType == GROUPS_USER && m_nCurrentGroup == 0)
       {
-        CUserViewItem* i = userView->firstChild();
-
-        while (i)
+        for (CUserViewItem* i = userView->firstChild(); i != NULL; i = i->nextSibling())
         {
-          if (u->GetInGroup(GROUPS_USER, i->GroupId()))
+          unsigned short groupId = i->GroupId();
+
+          // Should user be shown in this group
+          bool showInGroup = show_user(u) &
+              ((groupId != 0 && u->GetInGroup(GROUPS_USER, groupId)) ||
+              (groupId == 0 && u->GetGroups().empty() && !u->IgnoreList()));
+
+
+          // Remove old user item if present
+          for (CUserViewItem* it = i->firstChild(); it != NULL; it = it->nextSibling())
           {
-            CUserViewItem* it = i->firstChild();
-
-            while (it)
+            char* szRealId = 0;
+            ICQUser::MakeRealId(it->ItemId(), it->ItemPPID(), szRealId);
+            bool equal = strcasecmp(szRealId, szId) == 0 && it->ItemPPID() == nPPID;
+            delete [] szRealId;
+            if (equal)
             {
-              char *szRealId = 0;
-              ICQUser::MakeRealId(it->ItemId(), it->ItemPPID(), szRealId);
-              if(strcasecmp(szRealId, szId) == 0 && it->ItemPPID() == nPPID)
-              {
-                delete it;
-                delete [] szRealId;
-                if (show_user(u))
-                  (void) new CUserViewItem(u, i);
-                break;
-              }
-              delete [] szRealId;
-              it = it->nextSibling();
-            }
-            if (it == NULL)
-            {
-              if ( show_user(u) &
-                   ((i->GroupId() != 0 && u->GetInGroup(GROUPS_USER, i->GroupId())) ||
-                    (i->GroupId() == 0 && u->GetGroups(GROUPS_USER) == 0 && !u->IgnoreList())))
-                (void) new CUserViewItem(u, i);
+              delete it;
+              break;
             }
           }
-          i = i->nextSibling();
+
+          // If user should be shown in group, create a new item
+          if (showInGroup)
+            (void) new CUserViewItem(u, i);
         }
       }
@@ -1748 +1743 @@
     case LIST_GROUP_REMOVED:
     case LIST_GROUP_CHANGED:
+    case LIST_GROUP_REORDERED:
       updateGroups();
       updateUserWin();
@@ -1809 +1805 @@
   if (doGroupView)
   {
-    CUserViewItem* gi = new CUserViewItem(0, tr("Other Users").local8Bit(), userView);
+    CUserViewItem* gi = new CUserViewItem(0, tr("Other Users").local8Bit(), 65535, userView);
     gi->setOpen(m_nGroupStates & 1);
-    GroupList *g = gUserManager.LockGroupList(LOCK_R);
-    for (unsigned short i = 0; i < g->size(); i++)
-    {
-      gi = new CUserViewItem(i+1, (*g)[i], userView);
+    int i = 1;
+    FOR_EACH_GROUP_START_SORTED(LOCK_R)
+    {
+      gi = new CUserViewItem(pGroup->id(), pGroup->name().c_str(), pGroup->sortIndex(), userView);
       gi->setOpen(m_nGroupStates & (1<<QMIN(i+1, 31)));
-    }
-    gUserManager.UnlockGroupList();
+      ++i;
+    }
+    FOR_EACH_GROUP_END
   }
   FOR_EACH_USER_START(LOCK_R)
@@ -1835 +1832 @@
       {
         if((gi->GroupId() != 0 && pUser->GetInGroup(GROUPS_USER, gi->GroupId())) ||
-           (gi->GroupId() == 0 && pUser->GetGroups(GROUPS_USER) == 0 && !pUser->IgnoreList()))
+           (gi->GroupId() == 0 && pUser->GetGroups().empty() && !pUser->IgnoreList()))
           (void) new CUserViewItem(pUser, gi);
       }
@@ -1924 +1921 @@
 void CMainWindow::setCurrentGroup(int index)
 {
-  m_nCurrentGroup = index;
-  m_nGroupType = GROUPS_USER;
   unsigned short nNumGroups = gUserManager.NumGroups();
-  if (m_nCurrentGroup > nNumGroups)
-  {
-    m_nCurrentGroup -= nNumGroups;
+  if (index > nNumGroups)
+  {
+    m_nCurrentGroup = index - nNumGroups;
     m_nGroupType = GROUPS_SYSTEM;
+  }
+  else
+  {
+    m_nCurrentGroup = myGroupIds[index];
+    m_nGroupType = GROUPS_USER;
   }
   // Update the combo box
@@ -1959 +1959 @@
   mnuGroup->clear();
   mnuServerGroup->clear();
+  myGroupIds.clear();
 
   QString group = Strings::getSystemGroupName(GROUP_ALL_USERS);
@@ -1964 +1965 @@
   mnuUserGroups->insertItem(group);
   mnuUserGroups->insertSeparator();
+  myGroupIds.push_back(0);
 
   // take care of this first
@@ -1969 +1971 @@
   mnuGroup->insertSeparator();
 
-  GroupList *g = gUserManager.LockGroupList(LOCK_R);
-  for (unsigned short i = 0; i < g->size(); i++)
-  {
-    cmbUserGroups->insertItem(QString::fromLocal8Bit((*g)[i]));
-    mnuUserGroups->insertItem(QString::fromLocal8Bit((*g)[i]));
-    mnuGroup->insertItem(QString::fromLocal8Bit((*g)[i]), i+1);
-    mnuServerGroup->insertItem(QString::fromLocal8Bit((*g)[i]), i+1);
-  }
-  gUserManager.UnlockGroupList();
+  unsigned short i = 0;
+  FOR_EACH_GROUP_START_SORTED(LOCK_R)
+  {
+    myGroupIds.push_back(pGroup->id());
+    QString name = QString::fromLocal8Bit(pGroup->name().c_str());
+    cmbUserGroups->insertItem(name);
+    mnuUserGroups->insertItem(name);
+    mnuGroup->insertItem(name, i+1);
+    mnuServerGroup->insertItem(name, i+1);
+    ++i;
+  }
+  FOR_EACH_GROUP_END
   mnuUserGroups->insertSeparator();
   mnuGroup->insertSeparator();
@@ -1997 +2002 @@
   }
 
-  int index = m_nCurrentGroup;
+  unsigned short index = 0;
   if (m_nGroupType == GROUPS_SYSTEM)
-    index += gUserManager.NumGroups();
+    index = m_nCurrentGroup + gUserManager.NumGroups();
+  else
+    for (unsigned short i = 0; i < myGroupIds.size(); ++i)
+      if (myGroupIds[i] == m_nCurrentGroup)
+        index = i;
   setCurrentGroup(index);
 }
@@ -3270 +3279 @@
   mnuGroup->setItemChecked(1000+GROUP_NEW_USERS, u->NewUser());
 
-  GroupList *g = gUserManager.LockGroupList(LOCK_R);
-  for (unsigned short i = 0; i < g->size(); i++)
-    mnuGroup->setItemChecked(i+1, u->GetInGroup(GROUPS_USER, i+1));
-  gUserManager.UnlockGroupList();
+  for (unsigned short i = 0; i < myGroupIds.size()-1; i++)
+    mnuGroup->setItemChecked(i+1, u->GetInGroup(GROUPS_USER, myGroupIds[i+1]));
   gUserManager.DropUser(u);
 }
@@ -3284 +3291 @@
     // User groups
     if(mnuGroup->isItemChecked(id))
-      RemoveUserFromGroup(GROUPS_USER, id, m_szUserMenuId, m_nUserMenuPPID, this);
+      RemoveUserFromGroup(GROUPS_USER, myGroupIds[id], m_szUserMenuId, m_nUserMenuPPID, this);
     else {
-      gUserManager.AddUserToGroup(m_szUserMenuId, m_nUserMenuPPID, id);
+      gUserManager.AddUserToGroup(m_szUserMenuId, m_nUserMenuPPID, myGroupIds[id]);
       updateUserWin();
     }
@@ -3357 +3364 @@
       ICQUser *u = gUserManager.FetchUser(szId, nPPID, LOCK_R);
       if (u == NULL) return true;
-      GroupList *g = gUserManager.LockGroupList(LOCK_R);
+      LicqGroup* g = gUserManager.FetchGroup(group, LOCK_R);
+      if (g == NULL)
+      {
+        gUserManager.DropUser(u);
+        return true;
+      }
       QString warning(tr("Are you sure you want to remove\n%1 (%2)\nfrom the '%3' group?")
                          .arg(QString::fromUtf8(u->GetAlias()))
-                         .arg(u->IdString()).arg(QString::fromLocal8Bit( (*g)[group - 1] )) );
-      gUserManager.UnlockGroupList();
+                         .arg(u->IdString()).arg(QString::fromLocal8Bit(g->name().c_str())) );
+      gUserManager.DropGroup(g);
       gUserManager.DropUser(u);
       if (QueryUser(p, warning, tr("Ok"), tr("Cancel")))
@@ -3413 +3425 @@
   if (u == NULL) return;
 
-  GroupList *g = gUserManager.LockGroupList(LOCK_R);
-  for (unsigned int i = 0; i < g->size(); i++)
+  for (unsigned int i = 0; i < myGroupIds.size()-1; i++)
     mnuServerGroup->setItemChecked(i+1, (int)(i+1) == n);
 
-  gUserManager.UnlockGroupList();
   gUserManager.DropUser(u);
 
-  gUserManager.AddUserToGroup(m_szUserMenuId, m_nUserMenuPPID, n);
+  gUserManager.AddUserToGroup(m_szUserMenuId, m_nUserMenuPPID, myGroupIds[n]);
   updateUserWin();
 }
@@ -4737 +4747 @@
 void CMainWindow::showEditGrpDlg()
 {
-  EditGrpDlg *d = new EditGrpDlg;
+  EditGrpDlg *d = new EditGrpDlg(licqSigMan);
   connect (d, SIGNAL(signal_updateGroups()), this, SLOT(updateGroups()));
   d->show();