Changeset 6200

Timestamp:

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

Author:

flynd

Message:

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

Location:

trunk/qt4-gui/src

Files:

• contactlist/contactgroup.cpp (modified) (3 diffs)
• contactlist/contactgroup.h (modified) (1 diff)
• contactlist/contactlist.cpp (modified) (3 diffs)
• core/groupmenu.cpp (modified) (4 diffs)
• core/licqgui.cpp (modified) (2 diffs)
• core/mainwin.cpp (modified) (1 diff)
• dialogs/editgrpdlg.cpp (modified) (2 diffs)
• dialogs/editgrpdlg.h (modified) (1 diff)

trunk/qt4-gui/src/contactlist/contactgroup.cpp

@@ -21 +21 @@
 #include "contactgroup.h"
 
+#include <licq_user.h>
+
 #include "contactbar.h"
 #include "contactuser.h"
@@ -55 +57 @@
   for (int i = 0; i < 3; ++i)
     delete myBars[i];
+}
+
+void ContactGroup::update()
+{
+  GroupList* g = gUserManager.LockGroupList(LOCK_R);
+  myName = QString::fromLocal8Bit((*g)[myGroupId-1]);
+  gUserManager.UnlockGroupList();
+
+  emit dataChanged(this);
 }
 
@@ -198 +209 @@
     return false;
 
-  if (value.toString() == myName)
+  QString newName = value.toString();
+  if (newName == myName)
     return true;
 
-  myName = value.toString();
-  gUserManager.RenameGroup(myGroupId, myName.toLocal8Bit());
-
-  // Daemon doesn't signal when groups change so trigger update from here
-  emit dataChanged(this);
+  // Don't save new name here, daemon will signal us when name has changed
+  gUserManager.RenameGroup(myGroupId, newName.toLocal8Bit());
 
   return true;

trunk/qt4-gui/src/contactlist/contactgroup.h

@@ -56 +56 @@
    */
   virtual ~ContactGroup();
+
+  /**
+   * Group data in daemon has changed and needs to be refetched
+   */
+  void update();
 
   /**

trunk/qt4-gui/src/contactlist/contactlist.cpp

@@ -56 +56 @@
 }
 
-ContactListModel::~ContactListModel()
-{
-  // Delete all users and groups
-  clear();
-
-  // Delete the system groups
-  for (unsigned long i = 0; i < NUM_GROUPS_SYSTEM_ALL; ++i)
-    delete mySystemGroups[i];
-}
-
 ContactGroup* ContactListModel::createGroup(unsigned short id, QString name)
 {
@@ -76 +66 @@
 }
 
+ContactListModel::~ContactListModel()
+{
+  // Delete all users and groups
+  clear();
+
+  // Delete the system groups
+  for (unsigned long i = 0; i < NUM_GROUPS_SYSTEM_ALL; ++i)
+    delete mySystemGroups[i];
+}
+
 void ContactListModel::listUpdated(CICQSignal* sig)
 {
   switch(sig->SubSignal())
   {
-    case LIST_ALL:
+    case LIST_INVALIDATE:
       reloadAll();
       break;
 
-    case LIST_ADD:
+    case LIST_CONTACT_ADDED:
     {
       ICQUser* u = gUserManager.FetchUser(sig->Id(), sig->PPID(), LOCK_R);
@@ -96 +96 @@
       break;
     }
-    case LIST_REMOVE:
+    case LIST_CONTACT_REMOVED:
       removeUser(sig->Id(), sig->PPID());
       break;
+
+    case LIST_GROUP_ADDED:
+    {
+      unsigned short gid = sig->Argument();
+
+      GroupList* g = gUserManager.LockGroupList(LOCK_R);
+      ContactGroup* newGroup = createGroup(gid, QString::fromLocal8Bit((*g)[gid-1]));
+      gUserManager.UnlockGroupList();
+
+      beginInsertRows(QModelIndex(), myUserGroups.size(), myUserGroups.size());
+      myUserGroups.append(newGroup);
+      endInsertRows();
+      break;
+    }
+
+    case LIST_GROUP_REMOVED:
+    {
+      unsigned short gid = sig->Argument();
+
+      for (int i = 0; i < myUserGroups.size(); ++i)
+      {
+        ContactGroup* group = myUserGroups.at(i);
+        if (group->groupId() == gid)
+        {
+          beginRemoveRows(QModelIndex(), i, i);
+          myUserGroups.removeAll(group);
+          endRemoveRows();
+          delete group;
+        }
+      }
+      break;
+    }
+
+    case LIST_GROUP_CHANGED:
+    {
+      unsigned short gid = sig->Argument();
+
+      for (int i = 0; i < myUserGroups.size(); ++i)
+      {
+        ContactGroup* group = myUserGroups.at(i);
+        if (group->groupId() == gid)
+          group->update();
+      }
+      break;
+    }
   }
 }

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

trunk/qt4-gui/src/dialogs/editgrpdlg.cpp

@@ -115 +115 @@
   connect(btnNewUser, SIGNAL(clicked()), SLOT(slot_newuser()));
   connect(btnEdit, SIGNAL(clicked()), SLOT(slot_edit()));
-  connect(btnDone, SIGNAL(clicked()), SLOT(slot_done()));
+  connect(btnDone, SIGNAL(clicked()), SLOT(close()));
   connect(edtName, SIGNAL(returnPressed()), SLOT(slot_editok()));
   connect(btnSave, SIGNAL(clicked()), SLOT(slot_editok()));
@@ -269 +269 @@
   connect(btnEdit, SIGNAL(clicked()), SLOT(slot_edit()));
 }
-
-
-void EditGrpDlg::slot_done()
-{
-  // Daemon doesn't notify when groups change so tell mainwin to update
-  gMainWindow->updateGroups();
-
-  close();
-}

trunk/qt4-gui/src/dialogs/editgrpdlg.h

@@ -70 +70 @@
   void slot_default();
   void slot_newuser();
-  void slot_done();
 };