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

Timestamp:

05/25/08 06:25:18 (6 months ago)

Author:

flynd

Message:

Use new group subsignals from daemon. Removed some workarounds no longer needed.

Location:

trunk/qt4-gui/src/core

Files:

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

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

@@ -89 +89 @@
     delete a;
 
-  ContactListModel* list = LicqGui::instance()->contactList();
-  int groupCount = list->rowCount(QModelIndex());
+  GroupList* g = gUserManager.LockGroupList(LOCK_R);
+  for (unsigned int i = 0; i < g->size(); ++i)
+  {
+    QString name = QString::fromLocal8Bit((*g)[i]);
 
-  for (int i = 0; i < groupCount; ++i)
-  {
-    QModelIndex groupIndex = list->index(i, 0, QModelIndex());
-    unsigned int groupId = groupIndex.data(ContactListModel::GroupIdRole).toUInt();
+    a = myUserGroupActions->addAction(name);
+    a->setData(i + 1);
 
-    // Don't add system groups or other users group
-    if (groupId == 0 || groupId >= ContactListModel::SystemGroupOffset)
-      continue;
-
-    a = myUserGroupActions->addAction(groupIndex.data(ContactListModel::NameRole).toString());
-    a->setData(groupId);
+    myGroupsMenu->insertAction(myGroupSeparator, a);
   }
+  gUserManager.UnlockGroupList();
 
   // Add groups to menu
@@ -139 +135 @@
   // Model uses group+1 so substract one before sending to daemon
   gUserManager.SwapGroups(myGroupId, myGroupId - 1);
-
-  // Daemon doesn't notify us when groups change so notify model from here
-  LicqGui::instance()->contactList()->reloadAll();
-  LicqGui::instance()->mainWindow()->updateGroups();
 }
 
@@ -149 +141 @@
   // Model uses group+1 so substract one before sending to daemon
   gUserManager.SwapGroups(myGroupId, myGroupId + 1);
-
-  // Daemon doesn't notify us when groups change so notify model from here
-  LicqGui::instance()->contactList()->reloadAll();
-  LicqGui::instance()->mainWindow()->updateGroups();
 }
 
@@ -165 +153 @@
 
   gUserManager.RemoveGroup(myGroupId);
-
-  // Daemon doesn't notify us when groups change so notify model from here
-  LicqGui::instance()->contactList()->reloadAll();
-  LicqGui::instance()->mainWindow()->updateGroups();
 }
 

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

@@ -1389 +1389 @@
   switch (sig->SubSignal())
   {
-    case LIST_ALL:
-      // Handled by ContactListModel
-      break;
-
     case LIST_ADD:
     {
@@ -1459 +1455 @@
     }
 
+    case LIST_ALL:
+    case LIST_GROUP_ADDED:
+    case LIST_GROUP_REMOVED:
+    case LIST_GROUP_CHANGED:
+      myMainWindow->updateGroups();
+      myUserMenu->updateGroups();
+      myGroupMenu->updateGroups();
+      break;
   }
 }

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

@@ -765 +765 @@
   if (!initial)
   {
-    // Daemon does not send an update when groups change so tell contactList it
-    // needs to update
-    LicqGui::instance()->contactList()->reloadAll();
-
     // update group list in user and system menus
-    LicqGui::instance()->userMenu()->updateGroups();
     mySystemMenu->updateGroups();
   }