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

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/core

Files:

• groupmenu.cpp (modified) (4 diffs)
• groupmenu.h (modified) (1 diff)
• licqgui.cpp (modified) (1 diff)
• mainwin.cpp (modified) (1 diff)
• systemmenu.cpp (modified) (1 diff)
• usermenu.cpp (modified) (4 diffs)

trunk/qt4-gui/src/core/groupmenu.cpp

@@ -89 +89 @@
     delete a;
 
-  GroupList* g = gUserManager.LockGroupList(LOCK_R);
-  for (unsigned int i = 0; i < g->size(); ++i)
+  FOR_EACH_GROUP_START_SORTED(LOCK_R)
   {
-    QString name = QString::fromLocal8Bit((*g)[i]);
+    QString name = QString::fromLocal8Bit(pGroup->name().c_str());
 
     a = myUserGroupActions->addAction(name);
-    a->setData(i + 1);
+    a->setData(pGroup->id());
 
     myGroupsMenu->insertAction(myGroupSeparator, a);
   }
-  gUserManager.UnlockGroupList();
+  FOR_EACH_GROUP_END
 
   // Add groups to menu
@@ -118 +117 @@
   myMoveDownAction->setEnabled(!special && myGroupId < gUserManager.NumGroups());
   myRemoveGroupAction->setEnabled(!special);
+
+  mySortIndex = 0;
+  if (!special)
+  {
+    LicqGroup* group = gUserManager.FetchGroup(myGroupId, LOCK_R);
+    if (group != NULL)
+    {
+      mySortIndex = group->sortIndex();
+      myGroupName = QString::fromLocal8Bit(group->name().c_str());
+      gUserManager.DropGroup(group);
+    }
+  }
 }
 
@@ -133 +144 @@
 void GroupMenu::moveGroupUp()
 {
-  // Model uses group+1 so substract one before sending to daemon
-  gUserManager.SwapGroups(myGroupId, myGroupId - 1);
+  if (mySortIndex == 0)
+    return;
+
+  gUserManager.ModifyGroupSorting(myGroupId, mySortIndex - 1);
 }
 
 void GroupMenu::moveGroupDown()
 {
-  // Model uses group+1 so substract one before sending to daemon
-  gUserManager.SwapGroups(myGroupId, myGroupId + 1);
+  gUserManager.ModifyGroupSorting(myGroupId, mySortIndex + 1);
 }
 
 void GroupMenu::removeGroup()
 {
-  GroupList* g = gUserManager.LockGroupList(LOCK_R);
   QString warning(tr("Are you sure you want to remove the group '%1'?")
-      .arg(QString::fromLocal8Bit((*g)[myGroupId-1])));
-  gUserManager.UnlockGroupList();
+      .arg(myGroupName));
   if (!QueryYesNo(this, warning))
     return;
@@ -177 +187 @@
     gUserManager.SetUserInGroup(id.toLatin1(), ppid, gtype, gid, true,
         gtype == GROUPS_SYSTEM);
-
-    // Daemon doesn't notify us when group memberships change so notify model from here
-    LicqGui::instance()->contactList()->updateUser(id, ppid);
   }
 }

trunk/qt4-gui/src/core/groupmenu.h

@@ -102 +102 @@
   // Current group
   unsigned int myGroupId;
+  unsigned short mySortIndex;
+  QString myGroupName;
 
   // Actions not in any sub menu

trunk/qt4-gui/src/core/licqgui.cpp

@@ -754 +754 @@
       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 (QueryYesNo(parent, warning))
       {
         gUserManager.RemoveUserFromGroup(id.toLatin1(), ppid, group);
-
-        // The daemon does not send an update when group membership changes
-        // so tell the contactList it needs to update
-        myContactList->updateUser(id, ppid);
         return true;
       }

trunk/qt4-gui/src/core/mainwin.cpp

@@ -773 +773 @@
   myUserGroupsBox->addItem(LicqStrings::getSystemGroupName(GROUP_ALL_USERS));
 
-  GroupList* g = gUserManager.LockGroupList(LOCK_R);
-  for (unsigned short i = 0; i < g->size(); i++)
-  {
-    myUserGroupsBox->addItem(QString::fromLocal8Bit((*g)[i]));
-  }
-  gUserManager.UnlockGroupList();
+  FOR_EACH_GROUP_START_SORTED(LOCK_R)
+  {
+    myUserGroupsBox->addItem(QString::fromLocal8Bit(pGroup->name().c_str()));
+  }
+  FOR_EACH_GROUP_END
 
   for (unsigned short i = 1; i < NUM_GROUPS_SYSTEM_ALL; i++)

trunk/qt4-gui/src/core/systemmenu.cpp

@@ -302 +302 @@
       delete a;
 
-  GroupList* g = gUserManager.LockGroupList(LOCK_R);
-  for (unsigned int i = 0; i < g->size(); ++i)
+  FOR_EACH_GROUP_START_SORTED(LOCK_R)
   {
-    QString name = QString::fromLocal8Bit((*g)[i]);
+    QString name = QString::fromLocal8Bit(pGroup->name().c_str());
 
     a = myUserGroupActions->addAction(name);
-    a->setData(i + 1);
+    a->setData(pGroup->id());
     a->setCheckable(true);
 
     myGroupMenu->insertAction(myGroupSeparator, a);
   }
-  gUserManager.UnlockGroupList();
+  FOR_EACH_GROUP_END
 }
 

trunk/qt4-gui/src/core/usermenu.cpp

@@ -206 +206 @@
     delete a;
 
-  GroupList* g = gUserManager.LockGroupList(LOCK_R);
-  for (unsigned int i = 0; i < g->size(); ++i)
-  {
-    QString name = QString::fromLocal8Bit((*g)[i]);
+  FOR_EACH_GROUP_START_SORTED(LOCK_R)
+  {
+    QString name = QString::fromLocal8Bit(pGroup->name().c_str());
 
     a = myUserGroupActions->addAction(name);
-    a->setData(i + 1);
+    a->setData(pGroup->id());
     a->setCheckable(true);
 
     a = myServerGroupActions->addAction(name);
-    a->setData(i + 1);
+    a->setData(pGroup->id());
     a->setCheckable(true);
   }
-  gUserManager.UnlockGroupList();
+  FOR_EACH_GROUP_END
 
   // Add groups to menu
@@ -552 +551 @@
   gUserManager.SetUserInGroup(myId.toLatin1(), myPpid, GROUPS_USER, gid,
       action->isChecked(), false);
-
-  // The daemon does not send an update when group membership changes
-  // so tell the contactList it needs to update
-  LicqGui::instance()->contactList()->updateUser(myId, myPpid);
 }
 
@@ -578 +573 @@
   gUserManager.SetUserInGroup(myId.toLatin1(), myPpid, GROUPS_SYSTEM, gid,
       action->isChecked(), true);
-
-  // The daemon does not send an update when group membership changes
-  // so tell the contactList it needs to update
-  LicqGui::instance()->contactList()->updateUser(myId, myPpid);
 }
 
@@ -588 +579 @@
   unsigned int gid = action->data().toUInt();
   gUserManager.SetUserInGroup(myId.toLatin1(), myPpid, GROUPS_USER, gid, true, true);
-
-  // The daemon does not send an update when group membership changes
-  // so tell the contactList it needs to update
-  LicqGui::instance()->contactList()->updateUser(myId, myPpid);
-}
+}