Changeset 6319

Timestamp:

06/17/08 02:19:46 (2 months ago)

Author:

flynd

Message:

Use new group handling when pressing delete key to remove a user from a group.

Location:

trunk/qt4-gui/src/core

Files:

• licqgui.cpp (modified) (1 diff)
• licqgui.h (modified) (1 diff)
• mainwin.cpp (modified) (2 diffs)

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

@@ -736 +736 @@
     return true;
   }
-  return false;
-}
-
-bool LicqGui::removeUserFromGroup(GroupType gtype, unsigned long group,
-    QString id, unsigned long ppid, QWidget* parent)
-{
-  if (parent == NULL)
-    parent = myMainWindow;
-
-  if (gtype == GROUPS_USER)
-  {
-    if (group == 0)
-      return true;
-    else
-    {
-      ICQUser* u = gUserManager.FetchUser(id.toLatin1(), ppid, LOCK_R);
-      if (u == NULL)
-        return true;
-      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->name().c_str())));
-      gUserManager.DropGroup(g);
-      gUserManager.DropUser(u);
-      if (QueryYesNo(parent, warning))
-      {
-        gUserManager.RemoveUserFromGroup(id.toLatin1(), ppid, group);
-        return true;
-      }
-    }
-  }
-  else if (gtype == GROUPS_SYSTEM)
-  {
-    if (group == 0)
-      return removeUserFromList(id, ppid, parent);
-    ICQUser* u = gUserManager.FetchUser(id.toLatin1(), ppid, LOCK_W);
-    if (u == NULL)
-      return true;
-    u->RemoveFromGroup(GROUPS_SYSTEM, group);
-    gUserManager.DropUser(u);
-
-    // 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;
-  }
-
   return false;
 }

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

@@ -109 +109 @@
 
   /**
-   * Remove a contact from a group
-   *
-   * @param gtype Group type
-   * @param group Group id
-   * @param id Contact id
-   * @param ppid Contact protocol id
-   * @param parent Parent window to use for confirmation box or NULL to use mainwin
-   * @return true if contact was removed from group
-   */
-  bool removeUserFromGroup(GroupType gtype, unsigned long group,
-      QString id, unsigned long ppid, QWidget* parent = NULL);
-
-  /**
    * Show contact info dialog
    *

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

@@ -502 +502 @@
 void MainWindow::removeUserFromGroup()
 {
+  GroupType gtype = Config::ContactList::instance()->groupType();
+  unsigned short gid = Config::ContactList::instance()->groupId();
+
+  // Removing "All users" is the same as removing user from the list
+  if (gtype == GROUPS_SYSTEM && gid == 0)
+  {
+    removeUserFromList();
+    return;
+  }
+
+  // Removing user from "Other users" is not allowed
+  if (gtype == GROUPS_USER && gid == 0)
+    return;
+
+  // Get currently selected user
   QString id;
   unsigned long ppid = 0;
   myUserView->MainWindowSelectedItemUser(id, ppid);
 
-  LicqGui::instance()->removeUserFromGroup(
-      Config::ContactList::instance()->groupType(),
-      Config::ContactList::instance()->groupId(),
-      id, ppid, this);
+  gUserManager.SetUserInGroup(id.toLatin1(), ppid, GROUPS_USER, gid, false);
 }
 
@@ -728 +740 @@
 void MainWindow::setCurrentGroup(int groupId)
 {
+//TODO: This is bugged
   GroupType groupType = GROUPS_USER;
   unsigned short nNumGroups = gUserManager.NumGroups();