Reset roster filter when hitting enter to start chat.

Test-Information: Enter search term and use keyboard arrows to move to select a contact and pressing enter will start a chat and clear the filter. Confirm that pressing escape still clears the filter without starting a chat and that the changes do not interfere with starting a chat normally by double clicking on a contact. Change-Id: I90f5d431da56896eeb10f16c0ba23bdc143c4857
author: Richard Maudsley <richard.maudsley@isode.com> 2014-07-01 12:54:14 (GMT)
committer: Richard Maudsley <richard.maudsley@isode.com> 2014-07-01 12:57:14 (GMT)
commit: 9179b54ac93ddc88765c3cd984916d7ffd130d20 (patch)
tree: ddcbacdd0228d52ba3f0ad4d6e8e5f09e8d12c87 /Swift
parent: f90a0307a16a93376270a84be61451faa9bd9701 (diff)
download: swift-contrib-9179b54ac93ddc88765c3cd984916d7ffd130d20.zip
swift-contrib-9179b54ac93ddc88765c3cd984916d7ffd130d20.tar.bz2
5 files changed, 60 insertions, 34 deletions
diff --git a/Swift/QtUI/QtMainWindow.cpp b/Swift/QtUI/QtMainWindow.cpp
index 7af9728..1acc519 100644
--- a/Swift/QtUI/QtMainWindow.cpp
+++ b/Swift/QtUI/QtMainWindow.cpp
@@ -73,19 +73,19 @@ QtMainWindow::QtMainWindow(SettingsProvider* settings, UIEventStream* uiEventStr
 	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);
+	new QtFilterWidget(this, treeWidget_, uiEventStream_, 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)));
 
diff --git a/Swift/QtUI/Roster/QtFilterWidget.cpp b/Swift/QtUI/Roster/QtFilterWidget.cpp
index 5bd4669..2f08981 100644
--- a/Swift/QtUI/Roster/QtFilterWidget.cpp
+++ b/Swift/QtUI/Roster/QtFilterWidget.cpp
@@ -1,29 +1,29 @@
 /*
  * 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/Controllers/UIEvents/RequestChatUIEvent.h>
+#include <Swift/Controllers/UIEvents/UIEventStream.h>
 #include <Swift/QtUI/QtSwiftUtil.h>
+#include <Swift/QtUI/Roster/QtFilterWidget.h>
 
 namespace Swift {
 
-QtFilterWidget::QtFilterWidget(QWidget* parent, QtTreeWidget* treeView, QBoxLayout* layout) : QWidget(parent), treeView_(treeView), fuzzyRosterFilter_(0), isModifierSinglePressed_(false) {
+QtFilterWidget::QtFilterWidget(QWidget* parent, QtTreeWidget* treeView, UIEventStream* eventStream, QBoxLayout* layout) : QWidget(parent), treeView_(treeView), eventStream_(eventStream), 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_);
@@ -59,50 +59,36 @@ bool QtFilterWidget::eventFilter(QObject*, QEvent* event) {
 				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) {
+				JID target = treeView_->selectedJID();
+				if (target.isValid()) {
+					eventStream_->send(boost::shared_ptr<UIEvent>(new RequestChatUIEvent(target)));
+				}
 				filterLineEdit_->setText("");
-				return false;
+				updateRosterFilters();
 			} 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();
-				}
-			}
+			updateRosterFilters();
 		}
 		return true;
 	}
 	return false;
 }
 
 void QtFilterWidget::popAllFilters() {
 	std::vector<RosterFilter*> filters = treeView_->getRoster()->getFilters();
 	foreach(RosterFilter* filter, filters) {
@@ -112,18 +98,39 @@ void QtFilterWidget::popAllFilters() {
 }
 
 void QtFilterWidget::pushAllFilters() {
 	foreach(RosterFilter* filter, filters_) {
 		treeView_->getRoster()->addFilter(filter);
 	}
 	filters_.clear();
 }
 
+void QtFilterWidget::updateRosterFilters() {
+	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();
+		}
+	}
+}
+
 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
index e33616b..94ebc2a 100644
--- a/Swift/QtUI/Roster/QtFilterWidget.h
+++ b/Swift/QtUI/Roster/QtFilterWidget.h
@@ -13,34 +13,38 @@
 #include <QWidget>
 
 #include <Swift/Controllers/Roster/RosterFilter.h>
 #include <Swift/Controllers/Roster/FuzzyRosterFilter.h>
 
 #include <Swift/QtUI/Roster/QtTreeWidget.h>
 
 namespace Swift {
 
+class UIEventStream;
+
 class QtFilterWidget : public QWidget {
 	Q_OBJECT
 	public:
-		QtFilterWidget(QWidget* parent, QtTreeWidget* treeView, QBoxLayout* layout = 0);
+		QtFilterWidget(QWidget* parent, QtTreeWidget* treeView, UIEventStream* eventStream, QBoxLayout* layout = 0);
 		virtual ~QtFilterWidget();
 
 	protected:
 		bool eventFilter(QObject*, QEvent* event);
 
 	private:
 		void popAllFilters();
 		void pushAllFilters();
 
+		void updateRosterFilters();
 		void updateSearchFilter();
 
 	private:
 		QLineEdit* filterLineEdit_;
 		QtTreeWidget* treeView_;
+		UIEventStream* eventStream_;
 		std::vector<RosterFilter*> filters_;
 		QAbstractItemModel* sourceModel_;
 		FuzzyRosterFilter* fuzzyRosterFilter_;
 		bool isModifierSinglePressed_;
 };
 
 }
diff --git a/Swift/QtUI/Roster/QtTreeWidget.cpp b/Swift/QtUI/Roster/QtTreeWidget.cpp
index fbe85de..5333260 100644
--- a/Swift/QtUI/Roster/QtTreeWidget.cpp
+++ b/Swift/QtUI/Roster/QtTreeWidget.cpp
@@ -132,26 +132,19 @@ void QtTreeWidget::currentChanged(const QModelIndex& current, const QModelIndex&
 	else if (current.isValid()) {
 		item = static_cast<RosterItem*>(current.internalPointer());
 		item = dynamic_cast<ContactRosterItem*>(item);
 	}
 	onSomethingSelectedChanged(item);
 	QTreeView::currentChanged(current, previous);
 }
 
 void QtTreeWidget::handleItemActivated(const QModelIndex& index) {
-	JID target;
-	if (messageTarget_ == MessageDisplayJID) {
-		target = JID(Q2PSTRING(index.data(DisplayJIDRole).toString()));
-		target = target.toBare();
-	}
-	if (!target.isValid()) {
-		target = JID(Q2PSTRING(index.data(JIDRole).toString()));
-	}
+	JID target = jidFromIndex(index);
 	if (target.isValid()) {
 		eventStream_->send(boost::shared_ptr<UIEvent>(new RequestChatUIEvent(target)));
 	}
 }
 
 void QtTreeWidget::dragEnterEvent(QDragEnterEvent *event) {
 	if (event->mimeData()->hasUrls() && event->mimeData()->urls().size() == 1) {
 		event->acceptProposedAction();
 	}
@@ -233,10 +226,30 @@ void QtTreeWidget::drawBranches(QPainter*, const QRect&, const QModelIndex&) con
 
 void QtTreeWidget::show() {
 	QWidget::show();
 }
 
 void QtTreeWidget::setMessageTarget(MessageTarget messageTarget) {
 	messageTarget_ = messageTarget;
 }
 
+JID QtTreeWidget::jidFromIndex(const QModelIndex& index) const {
+	JID target;
+	if (messageTarget_ == MessageDisplayJID) {
+		target = JID(Q2PSTRING(index.data(DisplayJIDRole).toString()));
+		target = target.toBare();
+	}
+	if (!target.isValid()) {
+		target = JID(Q2PSTRING(index.data(JIDRole).toString()));
+	}
+	return target;
+}
+
+JID QtTreeWidget::selectedJID() const {
+	QModelIndexList list = selectedIndexes();
+	if (list.size() != 1) {
+		return JID();
+	}
+	return jidFromIndex(list[0]);
+}
+
 }
diff --git a/Swift/QtUI/Roster/QtTreeWidget.h b/Swift/QtUI/Roster/QtTreeWidget.h
index 29e985d..cf2f73e 100644
--- a/Swift/QtUI/Roster/QtTreeWidget.h
+++ b/Swift/QtUI/Roster/QtTreeWidget.h
@@ -28,18 +28,20 @@ class QtTreeWidget : public QTreeView {
 
 		QtTreeWidget(UIEventStream* eventStream, SettingsProvider* settings, MessageTarget messageTarget, QWidget* parent = 0);
 		~QtTreeWidget();
 		void show();
 		QtTreeWidgetItem* getRoot();
 		void setRosterModel(Roster* roster);
 		Roster* getRoster() {return roster_;}
 		void refreshTooltip();
 		void setMessageTarget(MessageTarget messageTarget);
+		JID jidFromIndex(const QModelIndex& index) const;
+		JID selectedJID() const;
 	public:
 		boost::signal<void (RosterItem*)> onSomethingSelectedChanged;
 
 	private slots:
 		void handleItemActivated(const QModelIndex&);
 		void handleModelItemExpanded(const QModelIndex&, bool expanded);
 		void handleExpanded(const QModelIndex&);
 		void handleCollapsed(const QModelIndex&);
 		void handleClicked(const QModelIndex&);
author	Richard Maudsley <richard.maudsley@isode.com>	2014-07-01 12:54:14 (GMT)
committer	Richard Maudsley <richard.maudsley@isode.com>	2014-07-01 12:57:14 (GMT)
commit	9179b54ac93ddc88765c3cd984916d7ffd130d20 (patch)
tree	ddcbacdd0228d52ba3f0ad4d6e8e5f09e8d12c87 /Swift
parent	f90a0307a16a93376270a84be61451faa9bd9701 (diff)
download	swift-contrib-9179b54ac93ddc88765c3cd984916d7ffd130d20.zip swift-contrib-9179b54ac93ddc88765c3cd984916d7ffd130d20.tar.bz2