Changeset 6319 for trunk/qt4-gui/src/core/mainwin.cpp

Timestamp:

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

Author:

flynd

Message:

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

Files:

• trunk/qt4-gui/src/core/mainwin.cpp (modified) (2 diffs)

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();