4 files changed, 152 insertions, 41 deletions
diff --git a/Swift/QtUI/QtBlockListEditorWindow.cpp b/Swift/QtUI/QtBlockListEditorWindow.cpp
index a759a3f..2484eb7 100644
--- a/Swift/QtUI/QtBlockListEditorWindow.cpp
+++ b/Swift/QtUI/QtBlockListEditorWindow.cpp
@@ -4,6 +4,12 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2014 Kevin Smith and Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
 #include <QtBlockListEditorWindow.h>
 #include <ui_QtBlockListEditorWindow.h>
 
@@ -15,10 +21,10 @@
 #include <QStyledItemDelegate>
 #include <QValidator>
 
+#include <Swift/QtUI/QtSwiftUtil.h>
 #include <Swift/QtUI/QtUtilities.h>
-#include <Swiften/Client/ClientBlockListManager.h>
 #include <Swiften/Base/foreach.h>
-#include <Swift/QtUI/QtSwiftUtil.h>
+#include <Swiften/Client/ClientBlockListManager.h>
 #include <Swiften/JID/JID.h>
 
 namespace Swift {
@@ -66,18 +72,22 @@ class QtJIDValidatedItemDelegate : public QItemDelegate {
 		}
 };
 
-QtBlockListEditorWindow::QtBlockListEditorWindow() : QWidget(), ui(new Ui::QtBlockListEditorWindow) {
+QtBlockListEditorWindow::QtBlockListEditorWindow() : QWidget(), ui(new Ui::QtBlockListEditorWindow), removeItemDelegate(0), editItemDelegate(0) {
 	ui->setupUi(this);
+
+	freshBlockListTemplate = tr("Click to add contact");
+
 	new QShortcut(QKeySequence::Close, this, SLOT(close()));
 	ui->throbberLabel->setMovie(new QMovie(":/icons/throbber.gif", QByteArray(), this));
 
-	itemDelegate = new QtRemovableItemDelegate(style());
+	removeItemDelegate = new QtRemovableItemDelegate(style());
+	editItemDelegate = new QtJIDValidatedItemDelegate(this);
 
 	connect(ui->savePushButton, SIGNAL(clicked()), SLOT(applyChanges()));
 
 	ui->blockListTreeWidget->setColumnCount(2);
 	ui->blockListTreeWidget->header()->setStretchLastSection(false);
-	ui->blockListTreeWidget->header()->resizeSection(1, itemDelegate->sizeHint(QStyleOptionViewItem(), QModelIndex()).width());
+	ui->blockListTreeWidget->header()->resizeSection(1, removeItemDelegate->sizeHint(QStyleOptionViewItem(), QModelIndex()).width());
 
 #if QT_VERSION >= 0x050000
 	ui->blockListTreeWidget->header()->setSectionResizeMode(0, QHeaderView::Stretch);
@@ -87,12 +97,13 @@ QtBlockListEditorWindow::QtBlockListEditorWindow() : QWidget(), ui(new Ui::QtBlo
 
 	ui->blockListTreeWidget->setHeaderHidden(true);
 	ui->blockListTreeWidget->setRootIsDecorated(false);
-	ui->blockListTreeWidget->setEditTriggers(QAbstractItemView::DoubleClicked);
-	ui->blockListTreeWidget->setItemDelegateForColumn(0, new QtJIDValidatedItemDelegate(this));
-	ui->blockListTreeWidget->setItemDelegateForColumn(1, itemDelegate);
+	ui->blockListTreeWidget->setEditTriggers(QAbstractItemView::DoubleClicked | QAbstractItemView::SelectedClicked | QAbstractItemView::EditKeyPressed);
+	ui->blockListTreeWidget->setItemDelegateForColumn(0, editItemDelegate);
+	ui->blockListTreeWidget->setItemDelegateForColumn(1, removeItemDelegate);
 	connect(ui->blockListTreeWidget, SIGNAL(itemChanged(QTreeWidgetItem*,int)), SLOT(handleItemChanged(QTreeWidgetItem*,int)));
+	ui->blockListTreeWidget->installEventFilter(this);
 
-	QTreeWidgetItem* item = new QTreeWidgetItem(QStringList("") << "");
+	QTreeWidgetItem* item = new QTreeWidgetItem(QStringList(freshBlockListTemplate) << "x");
 	item->setFlags(item->flags() | Qt::ItemIsEditable);
 	ui->blockListTreeWidget->addTopLevelItem(item);
 }
@@ -101,31 +112,49 @@ QtBlockListEditorWindow::~QtBlockListEditorWindow() {
 }
 
 void QtBlockListEditorWindow::show() {
-	QWidget::show();
+	QWidget::showNormal();
 	QWidget::activateWindow();
+	QWidget::raise();
+}
+
+void QtBlockListEditorWindow::hide() {
+	QWidget::hide();
 }
 
-void QtBlockListEditorWindow::handleItemChanged(QTreeWidgetItem *, int) {
+void QtBlockListEditorWindow::handleItemChanged(QTreeWidgetItem *item, int) {
+	// check whether changed item contains a valid JID and make it removable
+	if (item && item->text(0) != freshBlockListTemplate) {
+		item->setText(1, "");
+	}
+
+	// check for empty rows and add an empty one so the user can add items
 	bool hasEmptyRow = false;
-	QList<QTreeWidgetItem*> rows = ui->blockListTreeWidget->findItems("", Qt::MatchFixedString);
-	foreach(QTreeWidgetItem* row, rows) {
-		if (row->text(0).isEmpty()) {
+	for( int i = 0; i < ui->blockListTreeWidget->topLevelItemCount(); ++i ) {
+		QTreeWidgetItem* row = ui->blockListTreeWidget->topLevelItem(i);
+		if (row->text(0) == freshBlockListTemplate) {
 			hasEmptyRow = true;
 		}
+		else if (row->text(0).isEmpty()) {
+			ui->blockListTreeWidget->removeItemWidget(row, 0);
+		}
 	}
 
 	if (!hasEmptyRow) {
-		QTreeWidgetItem* item = new QTreeWidgetItem(QStringList("") << "");
+		QTreeWidgetItem* item = new QTreeWidgetItem(QStringList(freshBlockListTemplate) << "x");
 		item->setFlags(item->flags() | Qt::ItemIsEditable);
 		ui->blockListTreeWidget->addTopLevelItem(item);
 	}
+
+	if (!item) {
+		ui->blockListTreeWidget->setCurrentItem(ui->blockListTreeWidget->topLevelItem(0));
+	}
 }
 
 void QtBlockListEditorWindow::applyChanges() {
 	onSetNewBlockList(getCurrentBlockList());
 }
 
-void Swift::QtBlockListEditorWindow::setCurrentBlockList(const std::vector<JID> &blockedJIDs) {
+void QtBlockListEditorWindow::setCurrentBlockList(const std::vector<JID> &blockedJIDs) {
 	ui->blockListTreeWidget->clear();
 
 	foreach(const JID& jid, blockedJIDs) {
@@ -136,13 +165,26 @@ void Swift::QtBlockListEditorWindow::setCurrentBlockList(const std::vector<JID>
 	handleItemChanged(0,0);
 }
 
-void Swift::QtBlockListEditorWindow::setBusy(bool isBusy) {
+void QtBlockListEditorWindow::setBusy(bool isBusy) {
 	if (isBusy) {
 		ui->throbberLabel->movie()->start();
 		ui->throbberLabel->show();
+		ui->blockListTreeWidget->setEnabled(false);
+		ui->savePushButton->setEnabled(false);
 	} else {
 		ui->throbberLabel->movie()->stop();
 		ui->throbberLabel->hide();
+		ui->blockListTreeWidget->setEnabled(true);
+		ui->savePushButton->setEnabled(true);
+	}
+}
+
+void QtBlockListEditorWindow::setError(const std::string& error) {
+	if (!error.empty()) {
+		ui->errorLabel->setText("<font color='red'>" + QtUtilities::htmlEscape(P2QSTRING(error)) + "</font>");
+	}
+	else {
+		ui->errorLabel->setText("");
 	}
 }
 
@@ -151,11 +193,34 @@ std::vector<JID> Swift::QtBlockListEditorWindow::getCurrentBlockList() const {
 
 	for(int i=0; i < ui->blockListTreeWidget->topLevelItemCount(); ++i) {
 		QTreeWidgetItem* row = ui->blockListTreeWidget->topLevelItem(i);
-		if (!row->text(0).isEmpty()) {
-			futureBlockedJIDs.push_back(JID(Q2PSTRING(row->text(0))));
+		JID jid = JID(Q2PSTRING(row->text(0)));
+		if (!jid.toString().empty() && jid.isValid()) {
+			futureBlockedJIDs.push_back(jid);
 		}
 	}
 	return futureBlockedJIDs;
 }
 
+bool QtBlockListEditorWindow::eventFilter(QObject* target, QEvent* event) {
+	if (target == ui->blockListTreeWidget) {
+		if (event->type() == QEvent::KeyPress) {
+			QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
+			if (keyEvent->key() == Qt::Key_Backspace) {
+				// remove currently selected item
+				QTreeWidgetItem* currentItem = ui->blockListTreeWidget->currentItem();
+				if (currentItem->text(0) != freshBlockListTemplate) {
+					ui->blockListTreeWidget->takeTopLevelItem(ui->blockListTreeWidget->indexOfTopLevelItem(currentItem));
+					return true;
+				}
+			}
+			else if (keyEvent->key() == Qt::Key_Return) {
+				// open editor for return key d
+				ui->blockListTreeWidget->editItem(ui->blockListTreeWidget->currentItem(), 0);
+				return true;
+			}
+		}
+	}
+	return QWidget::eventFilter(target, event);
+}
+
 }
diff --git a/Swift/QtUI/QtBlockListEditorWindow.h b/Swift/QtUI/QtBlockListEditorWindow.h
index 4b124a3..dd083fd 100644
--- a/Swift/QtUI/QtBlockListEditorWindow.h
+++ b/Swift/QtUI/QtBlockListEditorWindow.h
@@ -4,6 +4,12 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2014 Kevin Smith and Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
 #pragma once
 
 #include <Swift/Controllers/UIInterfaces/BlockListEditorWidget.h>
@@ -18,6 +24,8 @@ namespace Ui {
 
 namespace Swift {
 
+class QtJIDValidatedItemDelegate;
+
 class QtBlockListEditorWindow : public QWidget, public BlockListEditorWidget {
 	Q_OBJECT
 
@@ -26,9 +34,12 @@ class QtBlockListEditorWindow : public QWidget, public BlockListEditorWidget {
 		virtual ~QtBlockListEditorWindow();
 
 		virtual void show();
+		virtual void hide();
 		virtual void setCurrentBlockList(const std::vector<JID>& blockedJIDs);
 		virtual void setBusy(bool isBusy);
+		virtual void setError(const std::string& error);
 		virtual std::vector<JID> getCurrentBlockList() const;
+		virtual bool eventFilter(QObject* target, QEvent* event);
 
 	private slots:
 		void handleItemChanged(QTreeWidgetItem*, int);
@@ -36,7 +47,9 @@ class QtBlockListEditorWindow : public QWidget, public BlockListEditorWidget {
 
 	private:
 		Ui::QtBlockListEditorWindow* ui;
-		QtRemovableItemDelegate* itemDelegate;
+		QtRemovableItemDelegate* removeItemDelegate;
+		QtJIDValidatedItemDelegate* editItemDelegate;
+		QString freshBlockListTemplate;
 };
 
 }
diff --git a/Swift/QtUI/QtBlockListEditorWindow.ui b/Swift/QtUI/QtBlockListEditorWindow.ui
index f71bbae..a611890 100644
--- a/Swift/QtUI/QtBlockListEditorWindow.ui
+++ b/Swift/QtUI/QtBlockListEditorWindow.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>348</width>
+    <width>333</width>
     <height>262</height>
    </rect>
   </property>
@@ -17,9 +17,34 @@
    <property name="spacing">
     <number>5</number>
    </property>
-   <property name="margin">
+   <property name="leftMargin">
     <number>5</number>
    </property>
+   <property name="topMargin">
+    <number>5</number>
+   </property>
+   <property name="rightMargin">
+    <number>5</number>
+   </property>
+   <property name="bottomMargin">
+    <number>5</number>
+   </property>
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;The follwing list shows all contacts that you have currently blocked. You can add contacts to the list at the buttom of the list and remove contacts by clicking on the right column.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="textFormat">
+      <enum>Qt::RichText</enum>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignJustify|Qt::AlignVCenter</set>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
    <item>
     <widget class="QTreeWidget" name="blockListTreeWidget">
      <attribute name="headerVisible">
@@ -38,19 +63,6 @@
       <enum>QLayout::SetDefaultConstraint</enum>
      </property>
      <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
       <widget class="QLabel" name="errorLabel">
        <property name="text">
         <string/>
@@ -71,6 +83,19 @@
       </widget>
      </item>
      <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
       <widget class="QPushButton" name="savePushButton">
        <property name="text">
         <string>Save</string>
diff --git a/Swift/QtUI/QtVCardWidget/QtRemovableItemDelegate.cpp b/Swift/QtUI/QtVCardWidget/QtRemovableItemDelegate.cpp
index 1cae00a..d50585c 100644
--- a/Swift/QtUI/QtVCardWidget/QtRemovableItemDelegate.cpp
+++ b/Swift/QtUI/QtVCardWidget/QtRemovableItemDelegate.cpp
@@ -4,6 +4,12 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2014 Kevin Smith and Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
 #include "QtRemovableItemDelegate.h"
 #include <Swiften/Base/Platform.h>
 #include <QEvent>
@@ -15,7 +21,7 @@ QtRemovableItemDelegate::QtRemovableItemDelegate(const QStyle* style) : style(st
 
 }
 
-void QtRemovableItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex&) const {
+void QtRemovableItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const {
 	QStyleOption opt;
 	opt.state = option.state;
 	opt.state |= QStyle::State_AutoRaise;
@@ -25,12 +31,14 @@ void QtRemovableItemDelegate::paint(QPainter* painter, const QStyleOptionViewIte
 	opt.rect = option.rect;
 	painter->save();
 	painter->fillRect(option.rect, option.state & QStyle::State_Selected ? option.palette.highlight() : option.palette.base());
+	if (index.data().toString().isEmpty()) {
 #ifdef SWIFTEN_PLATFORM_MACOSX
-	// workaround for Qt not painting relative to the cell we're in, on OS X
-	int height = style->pixelMetric(QStyle::PM_TabCloseIndicatorWidth, 0, 0);
-	painter->translate(option.rect.x(), option.rect.y() + (option.rect.height() - height)/2);
+		// workaround for Qt not painting relative to the cell we're in, on OS X
+		int height = style->pixelMetric(QStyle::PM_TabCloseIndicatorWidth, 0, 0);
+		painter->translate(option.rect.x(), option.rect.y() + (option.rect.height() - height)/2);
 #endif
-	style->drawPrimitive(QStyle::PE_IndicatorTabClose, &opt, painter);
+		style->drawPrimitive(QStyle::PE_IndicatorTabClose, &opt, painter);
+	}
 	painter->restore();
 }
 
@@ -39,7 +47,7 @@ QWidget* QtRemovableItemDelegate::createEditor(QWidget*, const QStyleOptionViewI
 }
 
 bool QtRemovableItemDelegate::editorEvent(QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index) {
-	if (event->type() == QEvent::MouseButtonRelease) {
+	if (index.data().toString().isEmpty() && event->type() == QEvent::MouseButtonRelease) {
 		model->removeRow(index.row());
 		return true;
 	} else {