5 files changed, 220 insertions, 0 deletions
diff --git a/Swift/Controllers/Roster/FuzzyRosterFilter.h b/Swift/Controllers/Roster/FuzzyRosterFilter.h
new file mode 100644
index 0000000..6710084
--- /dev/null
+++ b/Swift/Controllers/Roster/FuzzyRosterFilter.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2013 Tobias Markmann
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#pragma once
+
+#include <string>
+
+#include <Swift/Controllers/ContactSuggester.h>
+#include <Swift/Controllers/Roster/ContactRosterItem.h>
+#include <Swift/Controllers/Roster/RosterItem.h>
+#include <Swift/Controllers/Roster/RosterFilter.h>
+
+namespace Swift {
+
+class FuzzyRosterFilter : public RosterFilter {
+	public:
+		FuzzyRosterFilter(const std::string& query) : query_(query) { }
+		virtual ~FuzzyRosterFilter() {}
+		virtual bool operator() (RosterItem* item) const {
+			ContactRosterItem *contactItem = dynamic_cast<ContactRosterItem*>(item);
+			if (contactItem) {
+				const bool itemMatched = ContactSuggester::fuzzyMatch(contactItem->getDisplayName(), query_) || ContactSuggester::fuzzyMatch(contactItem->getDisplayJID(), query_);
+				return !itemMatched;
+			} else {
+				return false;
+			}
+		}
+
+	private:
+		std::string query_;
+};
+
+}
+
+
diff --git a/Swift/QtUI/QtMainWindow.cpp b/Swift/QtUI/QtMainWindow.cpp
index 4716780..7af9728 100644
--- a/Swift/QtUI/QtMainWindow.cpp
+++ b/Swift/QtUI/QtMainWindow.cpp
@@ -1,114 +1,117 @@
 /*
  * Copyright (c) 2010-2011 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #include <Swift/QtUI/QtMainWindow.h>
 
 #include <boost/optional.hpp>
 #include <boost/bind.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
 
 #include <QBoxLayout>
 #include <QComboBox>
 #include <QLineEdit>
 #include <QListWidget>
 #include <QListWidgetItem>
 #include <QPushButton>
 #include <QMenuBar>
 #include <QToolBar>
 #include <QAction>
 #include <QTabWidget>
 
 #include <Swiften/Base/Platform.h>
 
 #include <Swift/Controllers/UIEvents/RequestJoinMUCUIEvent.h>
 #include <Swift/Controllers/UIEvents/RequestHistoryUIEvent.h>
 #include <Swift/Controllers/UIEvents/RequestAddUserDialogUIEvent.h>
 #include <Swift/Controllers/UIEvents/RequestChatWithUserDialogUIEvent.h>
 #include <Swift/Controllers/UIEvents/RequestProfileEditorUIEvent.h>
 #include <Swift/Controllers/UIEvents/JoinMUCUIEvent.h>
 #include <Swift/Controllers/UIEvents/RequestAdHocUIEvent.h>
 #include <Swift/Controllers/UIEvents/RequestBlockListDialogUIEvent.h>
 #include <Swift/Controllers/SettingConstants.h>
 
+#include <Swift/QtUI/Roster/QtFilterWidget.h>
 #include <Swift/QtUI/QtSwiftUtil.h>
 #include <Swift/QtUI/QtTabWidget.h>
 #include <Swift/QtUI/QtSettingsProvider.h>
 #include <Swift/QtUI/QtLoginWindow.h>
 #include <Swift/QtUI/Roster/QtRosterWidget.h>
 #include <Swift/QtUI/QtUISettingConstants.h>
 #if defined(SWIFTEN_PLATFORM_MACOSX)
 #include <Swift/QtUI/CocoaUIHelpers.h>
 #elif defined(SWIFTEN_PLATFORM_WINDOWS)
 #include <Swift/QtUI/WinUIHelpers.h>
 #else
 #include <Swift/QtUI/QtCertificateViewerDialog.h>
 #endif
 
 namespace Swift {
 
 QtMainWindow::QtMainWindow(SettingsProvider* settings, UIEventStream* uiEventStream, QtLoginWindow::QtMenus loginMenus, StatusCache* statusCache, bool emoticonsExist) : QWidget(), MainWindow(false), loginMenus_(loginMenus) {
 	uiEventStream_ = uiEventStream;
 	settings_ = settings;
 	setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
 	QBoxLayout *mainLayout = new QBoxLayout(QBoxLayout::TopToBottom, this);
 	mainLayout->setContentsMargins(0,0,0,0);
 	mainLayout->setSpacing(0);
 	meView_ = new QtRosterHeader(settings, statusCache, this);
 	mainLayout->addWidget(meView_);
 	connect(meView_, SIGNAL(onChangeStatusRequest(StatusShow::Type, const QString&)), this, SLOT(handleStatusChanged(StatusShow::Type, const QString&)));
 	connect(meView_, SIGNAL(onEditProfileRequest()), this, SLOT(handleEditProfileRequest()));
 	connect(meView_, SIGNAL(onShowCertificateInfo()), this, SLOT(handleShowCertificateInfo()));
 
 	tabs_ = new QtTabWidget(this);
 #if QT_VERSION >= 0x040500
 	tabs_->setDocumentMode(true);
 #endif
 	tabs_->setTabPosition(QTabWidget::South);
 	mainLayout->addWidget(tabs_);
 	contactsTabWidget_ = new QWidget(this);
 	contactsTabWidget_->setContentsMargins(0, 0, 0, 0);
 	QBoxLayout *contactTabLayout = new QBoxLayout(QBoxLayout::TopToBottom, contactsTabWidget_);
 	contactsTabWidget_->setLayout(contactTabLayout);
 	contactTabLayout->setSpacing(0);
 	contactTabLayout->setContentsMargins(0, 0, 0, 0);
 
 	treeWidget_ = new QtRosterWidget(uiEventStream_, settings_, this);
+
 	contactTabLayout->addWidget(treeWidget_);
+	new QtFilterWidget(this, treeWidget_, contactTabLayout);
 
 	tabs_->addTab(contactsTabWidget_, tr("&Contacts"));
 
 	eventWindow_ = new QtEventWindow(uiEventStream_);
 	connect(eventWindow_, SIGNAL(onNewEventCountUpdated(int)), this, SLOT(handleEventCountUpdated(int)));
 
 	chatListWindow_ = new QtChatListWindow(uiEventStream_, settings_);
 	connect(chatListWindow_, SIGNAL(onCountUpdated(int)), this, SLOT(handleChatCountUpdated(int)));
 
 	tabs_->addTab(chatListWindow_, tr("C&hats"));
 	tabs_->addTab(eventWindow_, tr("&Notices"));
 
 	tabs_->setCurrentIndex(settings_->getSetting(QtUISettingConstants::CURRENT_ROSTER_TAB));
 
 	connect(tabs_, SIGNAL(currentChanged(int)), this, SLOT(handleTabChanged(int)));
 
 	tabBarCombo_ = NULL;
 	if (settings_->getSetting(QtUISettingConstants::USE_SCREENREADER)) {
 		tabs_->tabBar()->hide();
 		tabBarCombo_ = new QComboBox(this);
 		tabBarCombo_->setAccessibleName("Current View");
 		tabBarCombo_->addItem(tr("Contacts"));
 		tabBarCombo_->addItem(tr("Chats"));
 		tabBarCombo_->addItem(tr("Notices"));
 		tabBarCombo_->setCurrentIndex(tabs_->currentIndex());
 		mainLayout->addWidget(tabBarCombo_);
 		connect(tabBarCombo_, SIGNAL(currentIndexChanged(int)), tabs_, SLOT(setCurrentIndex(int)));
 	}
 
 
 	this->setLayout(mainLayout);
 
 	QMenu* viewMenu = new QMenu(tr("&View"), this);
 	menus_.push_back(viewMenu);
 
diff --git a/Swift/QtUI/Roster/QtFilterWidget.cpp b/Swift/QtUI/Roster/QtFilterWidget.cpp
new file mode 100644
index 0000000..5bd4669
--- /dev/null
+++ b/Swift/QtUI/Roster/QtFilterWidget.cpp
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2013 Tobias Markmann
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#include <Swift/QtUI/Roster/QtFilterWidget.h>
+
+#include <QLayout>
+#include <QVBoxLayout>
+#include <QKeyEvent>
+#include <QEvent>
+#include <QString>
+#include <QEvent>
+
+#include <Swift/QtUI/QtSwiftUtil.h>
+
+namespace Swift {
+
+QtFilterWidget::QtFilterWidget(QWidget* parent, QtTreeWidget* treeView, QBoxLayout* layout) : QWidget(parent), treeView_(treeView), fuzzyRosterFilter_(0), isModifierSinglePressed_(false) {
+	int targetIndex = layout->indexOf(treeView);
+
+	QVBoxLayout* vboxLayout = new QVBoxLayout(this);
+	vboxLayout->setSpacing(0);
+	vboxLayout->setContentsMargins(0,0,0,0);
+
+	filterLineEdit_ = new QLineEdit(this);
+	filterLineEdit_->hide();
+	vboxLayout->addWidget(filterLineEdit_);
+
+	vboxLayout->addWidget(treeView);
+	setLayout(vboxLayout);
+	layout->insertWidget(targetIndex, this);
+
+	filterLineEdit_->installEventFilter(this);
+	treeView->installEventFilter(this);
+
+	sourceModel_ = treeView_->model();
+}
+
+QtFilterWidget::~QtFilterWidget() {
+
+}
+
+bool QtFilterWidget::eventFilter(QObject*, QEvent* event) {
+	if (event->type() == QEvent::KeyPress ||
+		event->type() == QEvent::KeyRelease ||
+		// InputMethodQuery got introduced in Qt 5.
+#if QT_VERSION >= 0x050000
+		event->type() == QEvent::InputMethodQuery ||
+#endif
+		event->type() == QEvent::InputMethod) {
+		event->ignore();
+		QKeyEvent* keyEvent = dynamic_cast<QKeyEvent*>(event);
+		if (keyEvent) {
+			if (keyEvent->key() == Qt::Key_Up || keyEvent->key() == Qt::Key_Down) {
+				return false;
+			} else if ((keyEvent->key() == Qt::Key_Left || keyEvent->key() == Qt::Key_Right) && filterLineEdit_->text().isEmpty()) {
+				return false;
+			} else if (keyEvent->key() == Qt::Key_Alt && event->type() == QEvent::KeyPress) {
+				isModifierSinglePressed_ = true;
+			} else if (keyEvent->key() == Qt::Key_Alt && event->type() == QEvent::KeyRelease && isModifierSinglePressed_) {
+				QPoint itemOffset(2,2);
+				QPoint contextMenuPosition = treeView_->visualRect(treeView_->currentIndex()).topLeft() + itemOffset;;
+				QApplication::postEvent(treeView_, new QContextMenuEvent(QContextMenuEvent::Keyboard, contextMenuPosition, treeView_->mapToGlobal(contextMenuPosition)));
+				return true;
+			} else if (keyEvent->key() == Qt::Key_Return) {
+				filterLineEdit_->setText("");
+				return false;
+			} else if (keyEvent->key() == Qt::Key_Escape) {
+				filterLineEdit_->setText("");
+			} else {
+				isModifierSinglePressed_ = false;
+			}
+		}
+
+		filterLineEdit_->event(event);
+		filterLineEdit_->setVisible(!filterLineEdit_->text().isEmpty());
+
+		// update roster filters
+		if (event->type() == QEvent::KeyRelease) {
+			if (fuzzyRosterFilter_) {
+				if (filterLineEdit_->text().isEmpty()) {
+					// remove currently installed search filter and put old filters back
+					treeView_->getRoster()->removeFilter(fuzzyRosterFilter_);
+					delete fuzzyRosterFilter_;
+					fuzzyRosterFilter_ = NULL;
+					pushAllFilters();
+				} else {
+					// remove currently intsalled search filter and put new search filter in place
+					updateSearchFilter();
+				}
+			} else {
+				if (!filterLineEdit_->text().isEmpty()) {
+					// remove currently installed filters and put a search filter in place
+					popAllFilters();
+					updateSearchFilter();
+				}
+			}
+		}
+		return true;
+	}
+	return false;
+}
+
+void QtFilterWidget::popAllFilters() {
+	std::vector<RosterFilter*> filters = treeView_->getRoster()->getFilters();
+	foreach(RosterFilter* filter, filters) {
+		filters_.push_back(filter);
+		treeView_->getRoster()->removeFilter(filter);
+	}
+}
+
+void QtFilterWidget::pushAllFilters() {
+	foreach(RosterFilter* filter, filters_) {
+		treeView_->getRoster()->addFilter(filter);
+	}
+	filters_.clear();
+}
+
+void QtFilterWidget::updateSearchFilter() {
+	if (fuzzyRosterFilter_) {
+		treeView_->getRoster()->removeFilter(fuzzyRosterFilter_);
+		delete fuzzyRosterFilter_;
+		fuzzyRosterFilter_ = NULL;
+	}
+	fuzzyRosterFilter_ = new FuzzyRosterFilter(Q2PSTRING(filterLineEdit_->text()));
+	treeView_->getRoster()->addFilter(fuzzyRosterFilter_);
+	treeView_->setCurrentIndex(sourceModel_->index(0, 0, sourceModel_->index(0,0)));
+}
+
+}
diff --git a/Swift/QtUI/Roster/QtFilterWidget.h b/Swift/QtUI/Roster/QtFilterWidget.h
new file mode 100644
index 0000000..e33616b
--- /dev/null
+++ b/Swift/QtUI/Roster/QtFilterWidget.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2013 Tobias Markmann
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#pragma once
+
+#include <vector>
+
+#include <QBoxLayout>
+#include <QLineEdit>
+#include <QWidget>
+
+#include <Swift/Controllers/Roster/RosterFilter.h>
+#include <Swift/Controllers/Roster/FuzzyRosterFilter.h>
+
+#include <Swift/QtUI/Roster/QtTreeWidget.h>
+
+namespace Swift {
+
+class QtFilterWidget : public QWidget {
+	Q_OBJECT
+	public:
+		QtFilterWidget(QWidget* parent, QtTreeWidget* treeView, QBoxLayout* layout = 0);
+		virtual ~QtFilterWidget();
+
+	protected:
+		bool eventFilter(QObject*, QEvent* event);
+
+	private:
+		void popAllFilters();
+		void pushAllFilters();
+
+		void updateSearchFilter();
+
+	private:
+		QLineEdit* filterLineEdit_;
+		QtTreeWidget* treeView_;
+		std::vector<RosterFilter*> filters_;
+		QAbstractItemModel* sourceModel_;
+		FuzzyRosterFilter* fuzzyRosterFilter_;
+		bool isModifierSinglePressed_;
+};
+
+}
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index 56d2d1b..06b04fa 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -113,70 +113,71 @@ sources = [
     "QtCachedImageScaler.cpp",
     "QtTabbable.cpp",
     "QtTabWidget.cpp",
     "QtTextEdit.cpp",
     "QtXMLConsoleWidget.cpp",
     "QtHistoryWindow.cpp",
     "QtFileTransferListWidget.cpp",
     "QtFileTransferListItemModel.cpp",
     "QtAdHocCommandWindow.cpp",
     "QtUtilities.cpp",
     "QtBookmarkDetailWindow.cpp",
     "QtAddBookmarkWindow.cpp",
     "QtEditBookmarkWindow.cpp",
     "QtContactEditWindow.cpp",
     "QtContactEditWidget.cpp",
     "QtSingleWindow.cpp",
     "QtHighlightEditorWidget.cpp",
     "QtHighlightRulesItemModel.cpp",
     "QtHighlightRuleWidget.cpp",
     "QtColorToolButton.cpp",
     "ChatSnippet.cpp",
     "MessageSnippet.cpp",
     "SystemMessageSnippet.cpp",
     "QtElidingLabel.cpp",
     "QtFormWidget.cpp",
     "QtFormResultItemModel.cpp",
     "QtLineEdit.cpp",
     "QtJoinMUCWindow.cpp",
     "QtConnectionSettingsWindow.cpp",
     "Roster/RosterModel.cpp",
     "Roster/QtTreeWidget.cpp",
 #    "Roster/QtTreeWidgetItem.cpp",
     "Roster/RosterDelegate.cpp",
     "Roster/GroupItemDelegate.cpp",
     "Roster/DelegateCommons.cpp",
+    "Roster/QtFilterWidget.cpp",
     "Roster/QtRosterWidget.cpp",
     "Roster/QtOccupantListWidget.cpp",
     "Roster/RosterTooltip.cpp",
     "EventViewer/EventModel.cpp",
     "EventViewer/EventDelegate.cpp",
     "EventViewer/TwoLineDelegate.cpp",
     "EventViewer/QtEventWindow.cpp",
     "EventViewer/QtEvent.cpp",
     "ChatList/QtChatListWindow.cpp",
     "ChatList/ChatListModel.cpp",
     "ChatList/ChatListDelegate.cpp",
     "ChatList/ChatListMUCItem.cpp",
     "ChatList/ChatListRecentItem.cpp",
     "ChatList/ChatListWhiteboardItem.cpp",
     "MUCSearch/QtMUCSearchWindow.cpp",
     "MUCSearch/MUCSearchModel.cpp",
     "MUCSearch/MUCSearchRoomItem.cpp",
     "MUCSearch/MUCSearchEmptyItem.cpp",
     "MUCSearch/MUCSearchDelegate.cpp",
     "UserSearch/ContactListDelegate.cpp",
     "UserSearch/ContactListModel.cpp",
     "UserSearch/QtContactListWidget.cpp",
     "UserSearch/QtSuggestingJIDInput.cpp",
     "UserSearch/QtUserSearchFirstPage.cpp",
     "UserSearch/QtUserSearchFirstMultiJIDPage.cpp",
     "UserSearch/QtUserSearchFieldsPage.cpp",
     "UserSearch/QtUserSearchResultsPage.cpp",
     "UserSearch/QtUserSearchDetailsPage.cpp",
     "UserSearch/QtUserSearchWindow.cpp",
     "UserSearch/UserSearchModel.cpp",
     "UserSearch/UserSearchDelegate.cpp",
     "Whiteboard/FreehandLineItem.cpp",
     "Whiteboard/GView.cpp",
     "Whiteboard/TextDialog.cpp",
     "Whiteboard/QtWhiteboardWindow.cpp",