Changeset 6182 for trunk/qt4-gui/src/userevents

Timestamp:

05/05/08 21:32:10 (7 months ago)

Author:

eugene

Message:

Made tab replacement avoid flickering by inserting a new tab after the replaced tab. This also fixes the glitch when focus is moved forward upon message type changing. Somewhat simplified tab label updating.

Location:

trunk/qt4-gui/src/userevents

Files:

• usereventtabdlg.cpp (modified) (4 diffs)
• usereventtabdlg.h (modified) (1 diff)
• usersendcommon.cpp (modified) (1 diff)

trunk/qt4-gui/src/userevents/usereventtabdlg.cpp

@@ -73 +73 @@
 void UserEventTabDlg::addTab(UserEventCommon* tab, int index)
 {
-  QString label;
   ICQUser* u = gUserManager.FetchUser(tab->id().toLatin1(), tab->ppid(), LOCK_R);
   if (u == NULL)
     return;
 
-  label = QString::fromUtf8(u->GetAlias());
-  index = myTabs->insertTab(index, tab, label);
-  updateTabLabel(u);
+  index = myTabs->insertTab(index, tab, QString::fromUtf8(u->GetAlias()));
+  updateTabLabel(tab, u);
   gUserManager.DropUser(u);
 }
@@ -92 +90 @@
 void UserEventTabDlg::replaceTab(QWidget* oldTab, UserEventCommon* newTab)
 {
-  addTab(newTab, myTabs->indexOf(oldTab));
+  addTab(newTab, myTabs->indexOf(oldTab) + 1);
   removeTab(oldTab);
 }
@@ -134 +132 @@
 void UserEventTabDlg::updateTabLabel(ICQUser* u)
 {
-  if (u == 0)
+  if (u == NULL)
     return;
 
@@ -141 +139 @@
     UserEventCommon* tab = dynamic_cast<UserEventCommon*>(myTabs->widget(index));
 
-    if (tab->ppid() == u->PPID() && tab->isUserInConvo(u->IdString()))
-    {
-      QIcon icon;
-
-      if (u->NewMessages() > 0) // use an event icon
+    if (tab->ppid() == u->PPID() &&
+        tab->isUserInConvo(u->IdString()))
+      updateTabLabel(tab, u);
+  }
+}
+
+void UserEventTabDlg::updateTabLabel(UserEventCommon* tab, ICQUser* u)
+{
+  if (tab == NULL)
+    return;
+
+  bool fetched = false;
+  if (u == NULL)
+  {
+    u = gUserManager.FetchUser(tab->id().toLatin1(), tab->ppid(), LOCK_R);
+    if (u == NULL)
+      return;
+    fetched = true;
+  }
+
+  QIcon icon;
+
+  if (u->NewMessages() > 0) // use an event icon
+  {
+    unsigned short SubCommand = ICQ_CMDxSUB_MSG;
+    for (unsigned short i = 0; i < u->NewMessages(); i++)
+      switch (u->EventPeek(i)->SubCommand())
       {
-        unsigned short SubCommand = ICQ_CMDxSUB_MSG;
-        for (unsigned short i = 0; i < u->NewMessages(); i++)
-          switch (u->EventPeek(i)->SubCommand())
-          {
-            case ICQ_CMDxSUB_FILE:
-              SubCommand = ICQ_CMDxSUB_FILE;
-              break;
-            case ICQ_CMDxSUB_CHAT:
-              if (SubCommand != ICQ_CMDxSUB_FILE)
-                SubCommand = ICQ_CMDxSUB_CHAT;
-              break;
-            case ICQ_CMDxSUB_URL:
-              if (SubCommand != ICQ_CMDxSUB_FILE &&
-                  SubCommand != ICQ_CMDxSUB_CHAT)
-                SubCommand = ICQ_CMDxSUB_URL;
-              break;
-            case ICQ_CMDxSUB_CONTACTxLIST:
-              if (SubCommand != ICQ_CMDxSUB_FILE &&
-                  SubCommand != ICQ_CMDxSUB_CHAT &&
-                  SubCommand != ICQ_CMDxSUB_URL)
-                SubCommand = ICQ_CMDxSUB_CONTACTxLIST;
-              break;
-          }
-
-        icon = IconManager::instance()->iconForEvent(SubCommand);
-        myTabs->setTabColor(tab, QColor("blue"));
-
-        // to clear it..
-        tab->setTyping(u->GetTyping());
+    case ICQ_CMDxSUB_FILE:
+      SubCommand = ICQ_CMDxSUB_FILE;
+      break;
+    case ICQ_CMDxSUB_CHAT:
+      if (SubCommand != ICQ_CMDxSUB_FILE)
+        SubCommand = ICQ_CMDxSUB_CHAT;
+      break;
+    case ICQ_CMDxSUB_URL:
+      if (SubCommand != ICQ_CMDxSUB_FILE &&
+          SubCommand != ICQ_CMDxSUB_CHAT)
+        SubCommand = ICQ_CMDxSUB_URL;
+      break;
+    case ICQ_CMDxSUB_CONTACTxLIST:
+      if (SubCommand != ICQ_CMDxSUB_FILE &&
+          SubCommand != ICQ_CMDxSUB_CHAT &&
+          SubCommand != ICQ_CMDxSUB_URL)
+        SubCommand = ICQ_CMDxSUB_CONTACTxLIST;
+      break;
       }
-      else // use status icon
-      {
-        icon = IconManager::instance()->iconForStatus(u->StatusFull(), u->IdString(), u->PPID());
-
-        if (u->GetTyping() == ICQ_TYPING_ACTIVE)
-          myTabs->setTabColor(tab, Config::Chat::instance()->tabTypingColor());
-        else
-          myTabs->setTabColor(tab, QColor("black"));
-      }
-
-      myTabs->setTabIcon(index, icon);
-      if (myTabs->currentIndex() == index)
-        setWindowIcon(icon);
-
-      break;
-    }
-  }
+
+    icon = IconManager::instance()->iconForEvent(SubCommand);
+    myTabs->setTabColor(tab, QColor("blue"));
+
+    // to clear it..
+    tab->setTyping(u->GetTyping());
+  }
+  else // use status icon
+  {
+    icon = IconManager::instance()->iconForStatus(u->StatusFull(), u->IdString(), u->PPID());
+
+    if (u->GetTyping() == ICQ_TYPING_ACTIVE)
+      myTabs->setTabColor(tab, Config::Chat::instance()->tabTypingColor());
+    else
+      myTabs->setTabColor(tab, QColor("black"));
+  }
+
+  if (fetched)
+    gUserManager.DropUser(u);
+
+  int index = myTabs->indexOf(tab);
+  myTabs->setTabIcon(index, icon);
+  if (myTabs->currentIndex() == index)
+    setWindowIcon(icon);
 }
 

trunk/qt4-gui/src/userevents/usereventtabdlg.h

@@ -48 +48 @@
   void updateConvoLabel(UserEventCommon* tab);
   void updateTabLabel(ICQUser* u);
+  void updateTabLabel(UserEventCommon* tab, ICQUser* u = NULL);
   void setTyping(ICQUser* u, int convoId);
 

trunk/qt4-gui/src/userevents/usersendcommon.cpp

@@ -748 +748 @@
     }
     else
-      LicqGui::instance()->userEventTabDlg()->replaceTab(this, e);
+      tabDlg->replaceTab(this, e);
   }
 }