Changeset 6284

Timestamp:

06/14/08 03:48:20 (6 months ago)

Author:

flynd

Message:

Updated to work with new group handling. Contact list is now updated when groups are changed from other plugins.

Location:

trunk/qt-gui/src

Files:

• editgrp.cpp (modified) (6 diffs)
• editgrp.h (modified) (5 diffs)
• mainwin.cpp (modified) (17 diffs)
• mainwin.h (modified) (2 diffs)
• userbox.cpp (modified) (2 diffs)
• userbox.h (modified) (1 diff)

trunk/qt-gui/src/editgrp.cpp

@@ -30 +30 @@
 #include <qtoolbutton.h>
 
+#include <licq_events.h>
+#include <licq_user.h>
+
 #include "editgrp.h"
 #include "ewidgets.h"
 #include "gui-strings.h"
 #include "licq_user.h"
-
-EditGrpDlg::EditGrpDlg(QWidget *parent)
+#include "sigman.h"
+
+EditGrpDlg::EditGrpDlg(CSignalManager* signalManager, QWidget *parent)
   : QWidget(parent, "EditGroupDialog")
 {
@@ -99 +103 @@
 
   RefreshList();
+  connect(signalManager, SIGNAL(signal_updatedList(CICQSignal*)),
+      this, SLOT(listUpdated(CICQSignal*)));
 
   connect(btnAdd, SIGNAL(clicked()), this, SLOT(slot_add()));
@@ -107 +113 @@
   connect(btnNewUser, SIGNAL(clicked()), this, SLOT(slot_newuser()));
   connect(btnEdit, SIGNAL(clicked()), this, SLOT(slot_edit()));
-  connect(btnDone, SIGNAL(clicked()), this, SLOT(slot_done()));
+  connect(btnDone, SIGNAL(clicked()), this, SLOT(close()));
   connect(edtName, SIGNAL(returnPressed()), this, SLOT(slot_editok()));
   connect(btnSave, SIGNAL(clicked()), this, SLOT(slot_editok()));
 }
 
+unsigned short EditGrpDlg::currentGroupId() const
+{
+  if (lstGroups->currentItem() == -1)
+    return 0;
+
+  return myGroupIds[lstGroups->currentItem()];
+}
+
+void EditGrpDlg::setCurrentGroupId(unsigned short groupId)
+{
+  for (unsigned i = 0; i < lstGroups->count(); ++i)
+    if (myGroupIds[i] == groupId)
+    {
+      lstGroups->setCurrentItem(i);
+      break;
+    }
+}
 
 void EditGrpDlg::RefreshList()
 {
+  unsigned short groupId = currentGroupId();
   lstGroups->clear();
+  myGroupIds.clear();
 
   const QString allUsers = Strings::getSystemGroupName(GROUP_ALL_USERS);
 
   lstGroups->insertItem(allUsers);
+  myGroupIds.push_back(0);
+
   if (gUserManager.DefaultGroup() == GROUP_ALL_USERS)
     nfoDefault->setText(allUsers);
@@ -125 +152 @@
     nfoNewUser->setText(allUsers);
 
-  GroupList *g = gUserManager.LockGroupList(LOCK_R);
-  for (unsigned short i = 0; i < g->size(); i++)
+  FOR_EACH_GROUP_START_SORTED(LOCK_R)
   {
-    lstGroups->insertItem(QString::fromLocal8Bit((*g)[i]));
-    if (i + 1 == gUserManager.DefaultGroup())
-      nfoDefault->setText(QString::fromLocal8Bit((*g)[i]));
-    if (i + 1== gUserManager.NewUserGroup())
-      nfoNewUser->setText(QString::fromLocal8Bit((*g)[i]));
+    QString name = QString::fromLocal8Bit(pGroup->name().c_str());
+    lstGroups->insertItem(name);
+    myGroupIds.push_back(pGroup->id());
+
+    if (gUserManager.DefaultGroup() == pGroup->id())
+      nfoDefault->setText(name);
+
+    if (gUserManager.NewUserGroup() == pGroup->id())
+      nfoNewUser->setText(name);
   }
-  gUserManager.UnlockGroupList();
+  FOR_EACH_GROUP_END
+
+  setCurrentGroupId(groupId);
+}
+
+void EditGrpDlg::listUpdated(CICQSignal* sig)
+{
+  switch (sig->SubSignal())
+  {
+    case LIST_GROUP_ADDED:
+    case LIST_GROUP_REMOVED:
+    case LIST_GROUP_CHANGED:
+    case LIST_GROUP_REORDERED:
+
+    case LIST_INVALIDATE:
+      if (btnSave->isEnabled())
+        slot_editcancel();
+      RefreshList();
+      break;
+  }
 }
 
 void EditGrpDlg::slot_add()
 {
-  gUserManager.AddGroup(strdup(tr("noname").local8Bit()));
-  RefreshList();
-  lstGroups->setCurrentItem(lstGroups->count()-1);
-  slot_edit();
-}
-
-
-void EditGrpDlg::slot_remove()
-{
-  int n = lstGroups->currentItem();
-  // don't allow the default group #0 "All Users" to be deleted
-  // don't try to delete if there is no current Item (currentItem() == -1)
-  if (n < 1) return;
-
-  GroupList *g = gUserManager.LockGroupList(LOCK_R);
-  QString warning(tr("Are you sure you want to remove\n"
-                     "the group '%1'?").arg(QString::fromLocal8Bit((*g)[n-1])));
-  gUserManager.UnlockGroupList();
-
-  if(QueryUser(this, warning, tr("Ok"), tr("Cancel"))) {
-    gUserManager.RemoveGroup(n);
-    RefreshList();
-    lstGroups->setCurrentItem(n - 1);
-  }
-}
-
-
-void EditGrpDlg::slot_up()
-{
-  int n = lstGroups->currentItem() - 1;
-  if (n <= 0) return;
-  gUserManager.SwapGroups(n + 1, n);
-  RefreshList();
-  lstGroups->setCurrentItem(n);
-}
-
-
-void EditGrpDlg::slot_down()
-{
-  int n = lstGroups->currentItem() - 1;
-  if (n < 0 /* || n == max */) return;
-  gUserManager.SwapGroups(n + 1, n + 2);
-  RefreshList();
-  if (n + 2 >= int(lstGroups->count()))
-    lstGroups->setCurrentItem(lstGroups->count() - 1);
-  else
-    lstGroups->setCurrentItem(n + 2);
-}
-
-
-void EditGrpDlg::slot_default()
-{
-  int n = lstGroups->currentItem();
-  if (n == -1) return;
-  gUserManager.SetDefaultGroup(n);
-  RefreshList();
-  lstGroups->setCurrentItem(n);
-}
-
-void EditGrpDlg::slot_newuser()
-{
-  int n = lstGroups->currentItem();
-  if (n == -1 ) return;
-  gUserManager.SetNewUserGroup(n);
-  RefreshList();
-  lstGroups->setCurrentItem(n);
-}
-
-void EditGrpDlg::slot_edit()
-{
-  int n = lstGroups->currentItem() - 1;
-  if (n < 0) return;
+  // Don't add group until user has had a chance to set a name for it
+  myEditGroupId = 0;
+  lstGroups->setCurrentItem(-1);
+
   btnSave->setEnabled(true);
   btnDone->setEnabled(false);
   edtName->setEnabled(true);
-  GroupList *g = gUserManager.LockGroupList(LOCK_R);
-  edtName->setText(QString::fromLocal8Bit((*g)[n]));
+  edtName->setText(tr("noname"));
   edtName->setFocus();
-  gUserManager.UnlockGroupList();
-  m_nEditGrp = n + 1;
   btnEdit->setText(tr("Cancel"));
   disconnect(btnEdit, SIGNAL(clicked()), this, SLOT(slot_edit()));
   connect(btnEdit, SIGNAL(clicked()), this, SLOT(slot_editcancel()));
   lstGroups->setEnabled(false);
-}
-
+  btnSave->setDefault(true);
+}
+
+void EditGrpDlg::slot_remove()
+{
+  unsigned short groupId = currentGroupId();
+  if (groupId == 0)
+    return;
+
+  QString warning(tr("Are you sure you want to remove\n"
+                     "the group '%1'?").arg(lstGroups->currentText()));
+
+  if(QueryUser(this, warning, tr("Ok"), tr("Cancel"))) {
+    gUserManager.RemoveGroup(groupId);
+    RefreshList();
+  }
+}
+
+void EditGrpDlg::moveGroup(int delta)
+{
+  unsigned short groupId = currentGroupId();
+  if (groupId == 0)
+    return;
+
+  LicqGroup* group = gUserManager.FetchGroup(groupId, LOCK_R);
+  if (group == NULL)
+    return;
+  unsigned short oldSortIndex = group->sortIndex();
+  gUserManager.DropGroup(group);
+
+  if (delta + oldSortIndex < 0)
+    return;
+
+  gUserManager.ModifyGroupSorting(groupId, oldSortIndex + delta);
+  RefreshList();
+}
+
+void EditGrpDlg::slot_up()
+{
+  moveGroup(-1);
+}
+
+void EditGrpDlg::slot_down()
+{
+  moveGroup(1);
+}
+
+void EditGrpDlg::slot_default()
+{
+  gUserManager.SetDefaultGroup(currentGroupId());
+  RefreshList();
+}
+
+void EditGrpDlg::slot_newuser()
+{
+  gUserManager.SetNewUserGroup(currentGroupId());
+  RefreshList();
+}
+
+void EditGrpDlg::slot_edit()
+{
+  myEditGroupId = currentGroupId();
+  if (myEditGroupId == 0)
+    return;
+
+  btnSave->setEnabled(true);
+  btnDone->setEnabled(false);
+  edtName->setEnabled(true);
+  edtName->setText(lstGroups->currentText());
+  edtName->setFocus();
+  btnEdit->setText(tr("Cancel"));
+  disconnect(btnEdit, SIGNAL(clicked()), this, SLOT(slot_edit()));
+  connect(btnEdit, SIGNAL(clicked()), this, SLOT(slot_editcancel()));
+  lstGroups->setEnabled(false);
+  btnSave->setDefault(true);
+}
 
 void EditGrpDlg::slot_editok()
 {
-  int n = lstGroups->currentItem();
-  gUserManager.RenameGroup(m_nEditGrp, edtName->text().local8Bit());
-  RefreshList();
-
+  if (myEditGroupId == 0)
+    myEditGroupId = gUserManager.AddGroup(edtName->text().local8Bit().data());
+  else
+    gUserManager.RenameGroup(myEditGroupId, edtName->text().local8Bit().data());
+  RefreshList();
+  setCurrentGroupId(myEditGroupId);
+
+  btnSave->setDefault(false);
   lstGroups->setEnabled(true);
   btnEdit->setText(tr("Edit Name"));
@@ -240 +296 @@
   disconnect(btnEdit, SIGNAL(clicked()), this, SLOT(slot_editok()));
   connect(btnEdit, SIGNAL(clicked()), this, SLOT(slot_edit()));
-  lstGroups->setCurrentItem(n);
-}
-
+}
 
 void EditGrpDlg::slot_editcancel()
 {
+  btnSave->setDefault(false);
   lstGroups->setEnabled(true);
   btnEdit->setText(tr("Edit Name"));
@@ -256 +311 @@
 }
 
-
-void EditGrpDlg::slot_done()
-{
-  emit(signal_updateGroups());
-  close(true);
-}
-
-
 #include "editgrp.moc"

trunk/qt-gui/src/editgrp.h

@@ -21 +21 @@
 #define EDITGRP_H
 
+#include <qvaluelist.h>
 #include <qwidget.h>
-#include "licqdialog.h"
 
 class QListBox;
@@ -30 +30 @@
 
 class CInfoField;
+class CSignalManager;
 
 class EditGrpDlg : public QWidget
@@ -35 +36 @@
   Q_OBJECT
 public:
-  EditGrpDlg (QWidget *parent = 0);
+  EditGrpDlg(CSignalManager* signalManager, QWidget *parent = 0);
 protected:
   QListBox *lstGroups;
@@ -44 +45 @@
   QLineEdit *edtName;
   CInfoField *nfoDefault, *nfoNewUser;
-
-  unsigned short m_nEditGrp;
 
   void RefreshList();
@@ -59 +58 @@
   void slot_default();
   void slot_newuser();
-  void slot_done();
 signals:
   void signal_updateGroups();
+
+private slots:
+  void listUpdated(CICQSignal* sig);
+
+private:
+  unsigned short currentGroupId() const;
+  void setCurrentGroupId(unsigned short groupId);
+  void moveGroup(int delta);
+
+  QValueList<unsigned short> myGroupIds;
+  unsigned short myEditGroupId;
 };
 
-
 #endif

trunk/qt-gui/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);
-      gi->setOpen(m_nGroupStates & (1<<QMIN(i+1, 31)));
-    }
-    gUserManager.UnlockGroupList();
+    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(pGroup->id(), 31)));
+      ++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);
 }
@@ -3282 +3289 @@
   bool add = mnuGroup->isItemChecked(id);
   GroupType gtype = (id < 1000 ? GROUPS_USER : GROUPS_SYSTEM);
-  unsigned short groupId = (id < 1000 ? id : id - 1000);
+  unsigned short groupId = (id < 1000 ? myGroupIds[id] : id - 1000);
 
   if (gtype == GROUPS_SYSTEM && groupId == GROUP_IGNORE_LIST && add)
@@ -3302 +3309 @@
     RemoveUserFromGroup(gtype, groupId, m_szUserMenuId, m_nUserMenuPPID, this);
   else
-  {
     gUserManager.SetUserInGroup(m_szUserMenuId, m_nUserMenuPPID,
         gtype, groupId, true, false);
-    updateUserWin();
-  }
 }
 
@@ -3326 +3330 @@
     gUserManager.DropUser(u);
 
-    GroupList* g = gUserManager.LockGroupList(LOCK_R);
+    LicqGroup* g = gUserManager.FetchGroup(group, LOCK_R);
     if (g == NULL)
       return true;
-    QString groupName = QString::fromLocal8Bit((*g)[group - 1]);
-    gUserManager.UnlockGroupList();
+    QString groupName = QString::fromLocal8Bit(g->name().c_str());
+    gUserManager.DropGroup(g);
 
     QString warning(tr("Are you sure you want to remove\n%1 (%2)\nfrom the '%3' group?")
@@ -3340 +3344 @@
 
   gUserManager.SetUserInGroup(id, ppid, gtype, group, false);
-  updateUserWin();
   return true;
 }
@@ -3352 +3355 @@
   for (uint index = 0; index < mnuServerGroup->count(); index++)
   {
-    const int id = mnuServerGroup->idAt(index);
-    const QCString text = mnuServerGroup->text(id).local8Bit();
+    int id = mnuServerGroup->idAt(index);
 
     bool checked = false;
-    if (u->GetSID() && (u->GetGSID() == gUserManager.GetIDFromGroup(text.data())))
+    if (u->GetSID() && (u->GetGSID() == gUserManager.GetIDFromGroup(myGroupIds[id])))
       checked = true;
 
@@ -3372 +3374 @@
   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.SetUserInGroup(m_szUserMenuId, m_nUserMenuPPID, GROUPS_USER,
       n, true, true);
-  updateUserWin();
 }
 
@@ -4697 +4696 @@
 void CMainWindow::showEditGrpDlg()
 {
-  EditGrpDlg *d = new EditGrpDlg;
+  EditGrpDlg *d = new EditGrpDlg(licqSigMan);
   connect (d, SIGNAL(signal_updateGroups()), this, SLOT(updateGroups()));
   d->show();

trunk/qt-gui/src/mainwin.h

@@ -36 +36 @@
 #include <qbitmap.h>
 #include <qdialog.h>
+#include <qvaluelist.h>
 #include <vector>
 
@@ -439 +440 @@
   };
 
+  QValueList<unsigned short> myGroupIds;
 
 };

trunk/qt-gui/src/userbox.cpp

@@ -134 +134 @@
 }
 
-CUserViewItem::CUserViewItem(unsigned short Id, const char* name, QListView* lv)
+CUserViewItem::CUserViewItem(unsigned short Id, const char* name, unsigned short sortKey, QListView* lv)
   : QListViewItem(lv),
     m_nGroupId(Id),
@@ -158 +158 @@
   m_bNotInList = true;
   m_pUserIcon = 0;
-  // Other users group is sorted at the end
-  if (m_nGroupId)
-  {
-    QString strTemp = QString("%1").arg((int)m_nGroupId);
-    while (strTemp.length() < 10)
-      strTemp = "0" + strTemp;
-    m_sSortKey = strTemp;
-  }
-  else
-    m_sSortKey = QString("9999999999");
+
+  QString strTemp = QString("%1").arg((int)sortKey);
+  while (strTemp.length() < 10)
+    strTemp = "0" + strTemp;
+  m_sSortKey = strTemp;
+
   m_sPrefix = "1";
   setPixmap(0, gMainWindow->pmCollapsed);
   setText(1, QString::fromLocal8Bit(name));
-
 }
 

trunk/qt-gui/src/userbox.h

@@ -71 +71 @@
   CUserViewItem (ICQUser *, CUserViewItem* item);