Changeset 5601

Timestamp:

10/11/07 17:53:03 (14 months ago)

Author:

eugene

Message:

• Made notice strings translatable;
• take the usereventcommon private PPID instead of a constant one to generate the real user id;
• tiny coding style update;
• made history view scroll to the end upon adding a notice;
• revised the convo(Join|Leave) logic, which must fix #1392.

Location:

branches/qt-gui_qt4/src

Files:

• historyview.cpp (modified) (1 diff)
• mainwin.cpp (modified) (2 diffs)
• userevents/usersendcommon.cpp (modified) (3 diffs)

branches/qt-gui_qt4/src/historyview.cpp

@@ -488 +488 @@
 
   internalAddMsg(s);
-}
+  GotoEnd();
+}

branches/qt-gui_qt4/src/mainwin.cpp

@@ -1426 +1426 @@
 }
 
-void MainWindow::slot_socket(QString id, unsigned long ppid, unsigned long nConvoId)
-{
-  // Add the user to an ongoing conversation
+void MainWindow::slot_socket(QString id, unsigned long ppid, unsigned long convoId)
+{
   for (int i = 0; i < licqUserSend.size(); ++i)
   {
@@ -1434 +1433 @@
     if (item->id() == id && item->ppid() == ppid)
     {
-      item->setConvoId(nConvoId);
-      break;
-    }
-  }
-}
-
-void MainWindow::slot_convoJoin(QString id, unsigned long /* ppid */, unsigned long nConvoId)
-{
-  // Add the user to an ongoing conversation
+      item->setConvoId(convoId);
+      break;
+    }
+  }
+}
+
+void MainWindow::slot_convoJoin(QString id, unsigned long ppid, unsigned long convoId)
+{
   for (int i = 0; i < licqUserSend.size(); ++i)
   {
     UserSendCommon* item = licqUserSend.at(i);
-    if (item->convoId() == nConvoId)
-    {
-      item->convoJoin(id, nConvoId);
-      return;
-    }
-  }
-
-  // No conversation shown, so make one
-
-}
-
-void MainWindow::slot_convoLeave(QString id, unsigned long /* ppid */, unsigned long nConvoId)
-{
-  // Add the user to an ongoing conversation
+    if (item->ppid() == ppid && item->convoId() == convoId)
+    {
+      item->convoJoin(id, convoId);
+      break;
+    }
+  }
+}
+
+void MainWindow::slot_convoLeave(QString id, unsigned long ppid, unsigned long convoId)
+{
   for (int i = 0; i < licqUserSend.size(); ++i)
   {
     UserSendCommon* item = licqUserSend.at(i);
-    if (item->convoId() == nConvoId)
-    {
-      item->convoLeave(id, nConvoId);
-      return;
+    if (item->ppid() == ppid && item->convoId() == convoId &&
+        item->isUserInConvo(id))
+    {
+      item->convoLeave(id, convoId);
+      break;
     }
   }

branches/qt-gui_qt4/src/userevents/usersendcommon.cpp

@@ -509 +509 @@
       userName = id;
 
-    QString strMsg = QString("%1 has joined the conversation.").arg(userName);
-    mleHistory->addNotice(QDateTime::currentDateTime(), strMsg);
+    mleHistory->addNotice(QDateTime::currentDateTime(),
+        tr("%1 has joined the conversation.").arg(userName));
   }
 
@@ -516 +516 @@
   {
     char* realId;
-    //XXX The PPID?
-    ICQUser::MakeRealId(id.toLatin1(), LICQ_PPID, realId);
+    ICQUser::MakeRealId(id.toLatin1(), myPpid, realId);
     myUsers.push_back(realId);
     delete [] realId;
@@ -543 +542 @@
       userName = id;
 
-    QString strMsg = QString("%1 has left the conversation.").arg(userName);
-    mleHistory->addNotice(QDateTime::currentDateTime(), strMsg);
+    mleHistory->addNotice(QDateTime::currentDateTime(),
+        tr("%1 has left the conversation.").arg(userName));
 
     // Remove the typing notification if active