From 9ba2c6898b9bfa03f6e4b865966bb8f501f99735 Mon Sep 17 00:00:00 2001 From: Catalin Badea Date: Fri, 20 Jul 2012 16:14:32 +0300 Subject: Set the date when selecting a contact diff --git a/Swift/Controllers/HistoryViewController.cpp b/Swift/Controllers/HistoryViewController.cpp index 8efdc99..6ec8a3e 100644 --- a/Swift/Controllers/HistoryViewController.cpp +++ b/Swift/Controllers/HistoryViewController.cpp @@ -103,6 +103,8 @@ void HistoryViewController::handleSelectedContactChanged(RosterItem* newContact) currentItemType_ = HistoryMessage::Groupchat; } + historyWindow_->setDate(currentResultDate_); + foreach (const HistoryMessage& message, messages) { addNewMessage(message, false); } diff --git a/Swift/Controllers/UIInterfaces/HistoryWindow.h b/Swift/Controllers/UIInterfaces/HistoryWindow.h index effff27..03f4886 100644 --- a/Swift/Controllers/UIInterfaces/HistoryWindow.h +++ b/Swift/Controllers/UIInterfaces/HistoryWindow.h @@ -17,6 +17,7 @@ namespace Swift { virtual void setRosterModel(Roster*) = 0; virtual void addMessage(const std::string &message, const std::string &senderName, bool senderIsSelf, const std::string& avatarPath, const boost::posix_time::ptime& time, bool addAtTheTop) = 0; virtual void resetConversationView() = 0; + virtual void setDate(const boost::gregorian::date& date) = 0; boost::signal onSelectedContactChanged; boost::signal onReturnPressed; diff --git a/Swift/QtUI/QtHistoryWindow.cpp b/Swift/QtUI/QtHistoryWindow.cpp index feec059..6e779ea 100644 --- a/Swift/QtUI/QtHistoryWindow.cpp +++ b/Swift/QtUI/QtHistoryWindow.cpp @@ -165,4 +165,8 @@ void QtHistoryWindow::handleReturnPressed() { void QtHistoryWindow::handleCalendarClicked(const QDate& date) { } +void QtHistoryWindow::setDate(const boost::gregorian::date& date) { + ui_.calendarWidget_->setSelectedDate(QDate::fromJulianDay(date.julian_day())); +} + } diff --git a/Swift/QtUI/QtHistoryWindow.h b/Swift/QtUI/QtHistoryWindow.h index 97b9866..721b4da 100644 --- a/Swift/QtUI/QtHistoryWindow.h +++ b/Swift/QtUI/QtHistoryWindow.h @@ -25,6 +25,7 @@ namespace Swift { void setRosterModel(Roster*); void addMessage(const std::string &message, const std::string &senderName, bool senderIsSelf, const std::string& avatarPath, const boost::posix_time::ptime& time, bool addAtTheTop); void resetConversationView(); + void setDate(const boost::gregorian::date& date); void closeEvent(QCloseEvent* event); void showEvent(QShowEvent* event); -- cgit v0.10.2-6-g49f6