Changeset 6186

Timestamp:

05/06/08 04:56:15 (7 months ago)

Author:

flynd

Message:

Add sent and recieved messages to history dialog. Currently the message view is not updated automatically, only the calendar view.

Location:

trunk/qt4-gui/src/dialogs

Files:

• historydlg.cpp (modified) (3 diffs)
• historydlg.h (modified) (2 diffs)

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

@@ -35 +35 @@
 #include <QVBoxLayout>
 
+#include <licq_events.h>
+#include <licq_message.h>
 #include <licq_user.h>
 
 #include "config/chat.h"
 #include "core/licqgui.h"
+#include "core/signalmanager.h"
 #include "core/usermenu.h"
 #include "helpers/eventdesc.h"
@@ -252 +255 @@
   myCalendar->setSelectedDate(lastDate);
   calenderClicked();
+
+  // Catch sent messages and add them to history
+  connect(LicqGui::instance(), SIGNAL(eventSent(const ICQEvent*)),
+      SLOT(eventSent(const ICQEvent*)));
+
+  // Catch received messages so we can add them to history
+  connect(LicqGui::instance()->signalManager(), SIGNAL(updatedUser(CICQSignal*)), SLOT(updatedUser(CICQSignal*)));
 }
 
@@ -257 +267 @@
 {
   ICQUser::ClearHistory(myHistoryList);
+}
+
+void HistoryDlg::updatedUser(CICQSignal* signal)
+{
+  if (signal->Id() != myId || signal->PPID() != myPpid)
+    return;
+
+  if (signal->SubSignal() == USER_EVENTS)
+  {
+    ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), myPpid, LOCK_R);
+    if (u == NULL)
+      return;
+
+    const CUserEvent* event = u->EventPeekId(signal->Argument());
+    gUserManager.DropUser(u);
+
+    if (event != NULL && signal->Argument() > 0 && signal->Argument() > (*(--myHistoryList.end()))->Id())
+      addMsg(event);
+  }
+}
+
+void HistoryDlg::eventSent(const ICQEvent* event)
+{
+  if (event->Id() == myId && event->PPID() == myPpid && event->UserEvent() != NULL)
+    addMsg(event->UserEvent());
+}
+
+void HistoryDlg::addMsg(const CUserEvent* event)
+{
+  CUserEvent* eventCopy = event->Copy();
+  myHistoryList.push_back(eventCopy);
+  QDate date = QDateTime::fromTime_t(event->Time()).date();
+  myCalendar->markDate(date);
+  myCalendar->setMaximumDate(date);
 }
 

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

@@ -35 +35 @@
 class QRegExp;
 class QTextCodec;
+
+class CICQSignal;
+class ICQEvent;
 
 namespace LicqQtGui
@@ -108 +111 @@
   void previousDate();
 
+private slots:
+  /**
+   * A user was updated. Add to history if it was a message recieved for this user
+   *
+   * @param signal Signal from daemon
+   */
+  void updatedUser(CICQSignal* signal);
+
+  /**
+   * A message was sent. Add to history if it was for the current user
+   *
+   * @param event Event object for message
+   */
+  void eventSent(const ICQEvent* event);
+
 private:
+  /**
+   * Add an event to the current history
+   *
+   * @param event Event to add
+   */
+  void addMsg(const CUserEvent* event);
+
   /**
    * Build a regular expression from the input fields