Swift
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCatalin Badea <catalin.badea392@gmail.com>2012-07-17 11:05:23 (GMT)
committerCătălin Badea <catalin.badea392@gmail.com>2012-08-11 15:59:12 (GMT)
commit3af84bc87419831e26a85321c1c970aecd18d2c7 (patch)
tree02d0930265cfbdebfbf32bbad072b426b856feb5
parent5e736fe9601d1af367d564b94666372661f70d2a (diff)
downloadswift-contrib-3af84bc87419831e26a85321c1c970aecd18d2c7.zip
swift-contrib-3af84bc87419831e26a85321c1c970aecd18d2c7.tar.bz2
Added signal handlers in history window.
Diffstat
-rw-r--r--Swift/Controllers/HistoryController.cpp4
-rw-r--r--Swift/Controllers/HistoryController.h2
-rw-r--r--Swift/QtUI/QtHistoryWindow.cpp14
-rw-r--r--Swift/QtUI/QtHistoryWindow.h2
-rw-r--r--Swiften/History/HistoryManager.h2
-rw-r--r--Swiften/History/SQLiteHistoryManager.cpp2
-rw-r--r--Swiften/History/SQLiteHistoryManager.h2
7 files changed, 22 insertions, 6 deletions
diff --git a/Swift/Controllers/HistoryController.cpp b/Swift/Controllers/HistoryController.cpp
index fe54e79..d52e2b2 100644
--- a/Swift/Controllers/HistoryController.cpp
+++ b/Swift/Controllers/HistoryController.cpp
@@ -29,8 +29,8 @@ std::vector<HistoryMessage> HistoryController::getMessages(const JID& selfJID, c
return localHistory_->getMessages(selfJID, contactJID, type);
}
-std::set<JID> HistoryController::getContacts(const JID& selfJID, HistoryMessage::Type type) const {
- return localHistory_->getContacts(selfJID, type);
+std::set<JID> HistoryController::getContacts(const JID& selfJID, HistoryMessage::Type type, const std::string& keyword) const {
+ return localHistory_->getContacts(selfJID, type, keyword);
}
}
diff --git a/Swift/Controllers/HistoryController.h b/Swift/Controllers/HistoryController.h
index c08e112..ef832c9 100644
--- a/Swift/Controllers/HistoryController.h
+++ b/Swift/Controllers/HistoryController.h
@@ -24,7 +24,7 @@ namespace Swift {
void addMessage(const std::string& message, const JID& fromJID, const JID& toJID, HistoryMessage::Type type, const boost::posix_time::ptime& timeStamp);
std::vector<HistoryMessage> getMessages(const JID& selfJID, const JID& contactJID, HistoryMessage::Type type) const;
- std::set<JID> getContacts(const JID& selfJID, HistoryMessage::Type type) const;
+ std::set<JID> getContacts(const JID& selfJID, HistoryMessage::Type type, const std::string& keyword = std::string()) const;
boost::signal<void (const HistoryMessage&)> onNewMessage;
diff --git a/Swift/QtUI/QtHistoryWindow.cpp b/Swift/QtUI/QtHistoryWindow.cpp
index 36c899c..51dd1d5 100644
--- a/Swift/QtUI/QtHistoryWindow.cpp
+++ b/Swift/QtUI/QtHistoryWindow.cpp
@@ -20,6 +20,7 @@
#include <QTextDocument>
#include <QDateTime>
#include <Swift/QtUI/QtScaledAvatarCache.h>
+#include <QLineEdit>
#include <boost/smart_ptr/make_shared.hpp>
@@ -56,10 +57,16 @@ QtHistoryWindow::QtHistoryWindow(SettingsProvider* settings, UIEventStream* even
connect(conversation_, SIGNAL(scrollRequested(int)), this, SLOT(handleScrollRequested(int)));
connect(conversation_, SIGNAL(scrollReachedTop()), this, SLOT(handleScrollReachedTop()));
connect(conversation_, SIGNAL(scrollReachedBottom()), this, SLOT(handleScrollReachedBottom()));
+ connect(ui_.searchBox_->lineEdit(), SIGNAL(returnPressed()), this, SLOT(handleReturnPressed()));
+ connect(ui_.calendarWidget_, SIGNAL(clicked(const QDate&)), this, SLOT(handleCalendarClicked(const QDate&)));
}
QtHistoryWindow::~QtHistoryWindow() {
disconnect(conversation_, SIGNAL(scrollRequested(int)), this, SLOT(handleScrollRequested(int)));
+ disconnect(conversation_, SIGNAL(scrollReachedTop()), this, SLOT(handleScrollReachedTop()));
+ disconnect(conversation_, SIGNAL(scrollReachedBottom()), this, SLOT(handleScrollReachedBottom()));
+ disconnect(ui_.searchBox_->lineEdit(), SIGNAL(returnPressed()), this, SLOT(handleReturnPressed()));
+ disconnect(ui_.calendarWidget_, SIGNAL(clicked(const QDate&)), this, SLOT(handleCalendarClicked(const QDate&)));
delete theme_;
delete conversation_;
@@ -133,10 +140,17 @@ void QtHistoryWindow::handleScrollRequested(int pos) {
ui_.calendarWidget_->setSelectedDate(currentDate_);
}
}
+
void QtHistoryWindow::handleScrollReachedTop() {
}
void QtHistoryWindow::handleScrollReachedBottom() {
}
+void QtHistoryWindow::handleReturnPressed() {
+}
+
+void QtHistoryWindow::handleCalendarClicked(const QDate& date) {
+}
+
}
diff --git a/Swift/QtUI/QtHistoryWindow.h b/Swift/QtUI/QtHistoryWindow.h
index f9d9a30..9a887bf 100644
--- a/Swift/QtUI/QtHistoryWindow.h
+++ b/Swift/QtUI/QtHistoryWindow.h
@@ -33,6 +33,8 @@ namespace Swift {
void handleScrollRequested(int pos);
void handleScrollReachedTop();
void handleScrollReachedBottom();
+ void handleReturnPressed();
+ void handleCalendarClicked(const QDate& date);
private:
void handleSomethingSelectedChanged(RosterItem* item);
diff --git a/Swiften/History/HistoryManager.h b/Swiften/History/HistoryManager.h
index bc1680b..51039e4 100644
--- a/Swiften/History/HistoryManager.h
+++ b/Swiften/History/HistoryManager.h
@@ -19,6 +19,6 @@ namespace Swift {
virtual void addMessage(const HistoryMessage& message) = 0;
virtual std::vector<HistoryMessage> getMessages(const JID& selfJID, const JID& contactJID, HistoryMessage::Type type) const = 0;
- virtual std::set<JID> getContacts(const JID& selfJID, HistoryMessage::Type type) const = 0;
+ virtual std::set<JID> getContacts(const JID& selfJID, HistoryMessage::Type type, const std::string& keyword) const = 0;
};
}
diff --git a/Swiften/History/SQLiteHistoryManager.cpp b/Swiften/History/SQLiteHistoryManager.cpp
index 3304a07..0a14b99 100644
--- a/Swiften/History/SQLiteHistoryManager.cpp
+++ b/Swiften/History/SQLiteHistoryManager.cpp
@@ -190,7 +190,7 @@ boost::optional<int> SQLiteHistoryManager::getIDFromJID(const JID& jid) const {
return result;
}
-std::set<JID> SQLiteHistoryManager::getContacts(const JID& selfJID, HistoryMessage::Type type) const {
+std::set<JID> SQLiteHistoryManager::getContacts(const JID& selfJID, HistoryMessage::Type type, const std::string& keyword) const {
std::set<JID> result;
sqlite3_stmt* selectStatement;
diff --git a/Swiften/History/SQLiteHistoryManager.h b/Swiften/History/SQLiteHistoryManager.h
index fce30f8..a02ecc3 100644
--- a/Swiften/History/SQLiteHistoryManager.h
+++ b/Swiften/History/SQLiteHistoryManager.h
@@ -20,7 +20,7 @@ namespace Swift {
void addMessage(const HistoryMessage& message);
std::vector<HistoryMessage> getMessages(const JID& selfJID, const JID& contactJID, HistoryMessage::Type type) const;
- std::set<JID> getContacts(const JID& selfJID, HistoryMessage::Type type) const;
+ std::set<JID> getContacts(const JID& selfJID, HistoryMessage::Type type, const std::string& keyword) const;
private:
int getIDForJID(const JID&);