From aa42a3adb3c5e36a77e24eb879ae6ecc8932b035 Mon Sep 17 00:00:00 2001 From: Kevin Smith <git@kismith.co.uk> Date: Fri, 11 Jun 2010 21:28:29 +0100 Subject: Show the time of Notices in the tooltip. Resolves: #396 diff --git a/Swift/QtUI/EventViewer/QtEvent.cpp b/Swift/QtUI/EventViewer/QtEvent.cpp index 844a7f7..5305db2 100644 --- a/Swift/QtUI/EventViewer/QtEvent.cpp +++ b/Swift/QtUI/EventViewer/QtEvent.cpp @@ -6,6 +6,8 @@ #include "Swift/QtUI/EventViewer/QtEvent.h" +#include <QDateTime> + #include "Swiften/Events/MessageEvent.h" #include "Swiften/Events/ErrorEvent.h" #include "Swiften/Events/SubscriptionRequestEvent.h" @@ -20,7 +22,7 @@ QtEvent::QtEvent(boost::shared_ptr<StanzaEvent> event, bool active) : event_(eve QVariant QtEvent::data(int role) { switch (role) { - case Qt::ToolTipRole: + case Qt::ToolTipRole: return QVariant(text()).toString() + "\n" + B2QDATE(event_->getTime()).toString(); case Qt::DisplayRole: return QVariant(text()); case Qt::TextColorRole: return active_ ? Qt::black : Qt::darkGray; case Qt::BackgroundColorRole: return active_ ? Qt::white : Qt::lightGray; diff --git a/Swiften/Events/StanzaEvent.h b/Swiften/Events/StanzaEvent.h index 69fbe27..78dd4dc 100644 --- a/Swiften/Events/StanzaEvent.h +++ b/Swiften/Events/StanzaEvent.h @@ -6,19 +6,23 @@ #pragma once -#include "Swiften/Base/boost_bsignals.h" #include <boost/shared_ptr.hpp> +#include <boost/date_time/posix_time/posix_time.hpp> + +#include "Swiften/Base/boost_bsignals.h" namespace Swift { class StanzaEvent { public: - StanzaEvent(){concluded_ = false;}; + StanzaEvent() : time_(boost::posix_time::microsec_clock::universal_time()) {concluded_ = false;}; virtual ~StanzaEvent() {}; void conclude() {concluded_ = true; onConclusion();}; /** Do not call this directly from outside the class */ boost::signal<void()> onConclusion; bool getConcluded() {return concluded_;}; + boost::posix_time::ptime getTime() {return time_;} private: bool concluded_; + boost::posix_time::ptime time_; }; } -- cgit v0.10.2-6-g49f6