summaryrefslogtreecommitdiffstats
path: root/Swift
diff options
context:
space:
mode:
authorCatalin Badea <catalin.badea392@gmail.com>2012-07-20 13:14:32 (GMT)
committerCătălin Badea <catalin.badea392@gmail.com>2012-08-11 15:59:12 (GMT)
commit9ba2c6898b9bfa03f6e4b865966bb8f501f99735 (patch)
tree8354a9bef1afec23e7d68677a61362cc2482472a /Swift
parent461ddac4c336524e2d3ecdb95ae23d5219b5304c (diff)
downloadswift-contrib-9ba2c6898b9bfa03f6e4b865966bb8f501f99735.zip
swift-contrib-9ba2c6898b9bfa03f6e4b865966bb8f501f99735.tar.bz2
Set the date when selecting a contact
Diffstat (limited to 'Swift')
-rw-r--r--Swift/Controllers/HistoryViewController.cpp2
-rw-r--r--Swift/Controllers/UIInterfaces/HistoryWindow.h1
-rw-r--r--Swift/QtUI/QtHistoryWindow.cpp4
-rw-r--r--Swift/QtUI/QtHistoryWindow.h1
4 files changed, 8 insertions, 0 deletions
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<void (RosterItem*)> onSelectedContactChanged;
boost::signal<void (const std::string&)> 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);