Changeset 6318

Timestamp:

06/17/08 02:17:20 (3 months ago)

Author:

flynd

Message:

Don't swap groups All Users and Other Users in some parts of GUI.

Location:

trunk/qt4-gui/src

Files:

• core/licqgui.cpp (modified) (2 diffs)
• core/systemmenu.cpp (modified) (2 diffs)
• views/mmuserview.cpp (modified) (1 diff)
• views/userview.cpp (modified) (1 diff)

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

@@ -748 +748 @@
   {
     if (group == 0)
-      return removeUserFromList(id, ppid, parent);
+      return true;
     else
     {
@@ -775 +775 @@
   {
     if (group == 0)
-      return true;
+      return removeUserFromList(id, ppid, parent);
     ICQUser* u = gUserManager.FetchUser(id.toLatin1(), ppid, LOCK_W);
     if (u == NULL)

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

@@ -390 +390 @@
 {
   int gid = Config::ContactList::instance()->groupId();
-  if (Config::ContactList::instance()->groupType() == GROUPS_SYSTEM || gid == 0)
+  if (Config::ContactList::instance()->groupType() == GROUPS_SYSTEM)
     gid += ContactListModel::SystemGroupOffset;
 
@@ -427 +427 @@
   int id = action->data().toInt();
 
-  if (id == ContactListModel::SystemGroupOffset)
-    Config::ContactList::instance()->setGroup(GROUPS_USER, 0);
-  else if (id < ContactListModel::SystemGroupOffset)
+  if (id < ContactListModel::SystemGroupOffset)
     Config::ContactList::instance()->setGroup(GROUPS_USER, id);
   else

trunk/qt4-gui/src/views/mmuserview.cpp

@@ -119 +119 @@
   unsigned long groupId = Config::ContactList::instance()->groupId();
 
-  // User group 0 in mainwin means all users but that is system group 0 in model
-  if (groupType == GROUPS_USER && groupId == GROUP_ALL_USERS)
-    groupType = GROUPS_SYSTEM;
-
   dynamic_cast<MultiContactProxy*>(myListProxy)->addGroup(groupType, groupId);
 

trunk/qt4-gui/src/views/userview.cpp

@@ -87 +87 @@
 
   QModelIndex newRoot = QModelIndex();
-
-  // All Users group is considered to be a System Group
-  if (groupId == GROUP_ALL_USERS && groupType != GROUPS_SYSTEM)
-    groupType = GROUPS_SYSTEM;
 
   if (threadView && groupId == GROUP_ALL_USERS)