1 files changed, 17 insertions, 6 deletions
diff --git a/Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.cpp b/Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.cpp
index 46678f5..c8b010e 100644
--- a/Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.cpp
+++ b/Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.cpp
@@ -1,12 +1,18 @@
 /*
  * Copyright (c) 2012-2014 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #include <Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.h>
 
 #include <Swift/QtUI/QtVCardWidget/ui_QtVCardPhotoAndNameFields.h>
 
 #include <QMenu>
 
@@ -18,12 +24,14 @@ QtVCardPhotoAndNameFields::QtVCardPhotoAndNameFields(QWidget* parent) :
 	ui->setupUi(this);
 	ui->lineEditPREFIX->hide();
 	ui->lineEditMIDDLE->hide();
 	ui->lineEditSUFFIX->hide();
 	ui->lineEditFN->hide();
 	ui->lineEditNICKNAME->hide();
+	ui->labelFN->hide();
+	ui->labelNICKNAME->hide();
 	ui->labelFULLNAME->hide();
 
 #if QT_VERSION >= 0x040700
 	ui->lineEditFN->setPlaceholderText(tr("Formatted Name"));
 	ui->lineEditNICKNAME->setPlaceholderText(tr("Nickname"));
 	ui->lineEditPREFIX->setPlaceholderText(tr("Prefix"));
@@ -45,21 +53,22 @@ bool QtVCardPhotoAndNameFields::isEditable() const {
 }
 
 void QtVCardPhotoAndNameFields::setEditable(bool editable) {
 	this->editable = editable;
 
 	ui->avatarWidget->setEditable(editable);
-	ui->lineEditFN->setVisible(editable ? true : !ui->lineEditFN->text().isEmpty());
-	ui->lineEditFN->setEditable(editable);
-	ui->lineEditFN->setStyleSheet(editable ? "" : "QLineEdit {border: none; background-color: transparent;}");
+	ui->horizontalLayoutFN->setSpacing(editable ? 2 : 0);
+	ui->lineEditFN->setVisible(editable);
+	ui->labelFN->setVisible(!editable);
 
-	ui->lineEditNICKNAME->setVisible(editable ? true : !ui->lineEditNICKNAME->text().isEmpty());
-	ui->lineEditNICKNAME->setEditable(editable);
-	ui->lineEditNICKNAME->setStyleSheet(editable ? "" : "QLineEdit {border: none; background-color: transparent;}");
+	ui->horizontalLayoutNICKNAME->setSpacing(editable ? 2 : 0);
+	ui->lineEditNICKNAME->setVisible(editable);
+	ui->labelNICKNAME->setVisible(!editable);
 
 	// prefix given middle last suffix
+	ui->horizontalLayoutFULLNAME->setSpacing(editable ? 2 : 0);
 	ui->lineEditPREFIX->setVisible(editable);
 	ui->lineEditGIVEN->setVisible(editable);
 	ui->lineEditMIDDLE->setVisible(editable);
 	ui->lineEditFAMILY->setVisible(editable);
 	ui->lineEditSUFFIX->setVisible(editable);
 	ui->labelFULLNAME->setVisible(!editable);
@@ -84,20 +93,22 @@ ByteArray QtVCardPhotoAndNameFields::getAvatarData() const {
 std::string QtVCardPhotoAndNameFields::getAvatarType() const {
 	return ui->avatarWidget->getAvatarType();
 }
 
 void QtVCardPhotoAndNameFields::setFormattedName(const QString& formattedName) {
 	ui->lineEditFN->setText(formattedName);
+	ui->labelFN->setText(formattedName);
 }
 
 QString QtVCardPhotoAndNameFields::getFormattedName() const {
 	return ui->lineEditFN->text();
 }
 
 void QtVCardPhotoAndNameFields::setNickname(const QString& nickname) {
 	ui->lineEditNICKNAME->setText(nickname);
+	ui->labelNICKNAME->setText(nickname);
 }
 
 QString QtVCardPhotoAndNameFields::getNickname() const {
 	return ui->lineEditNICKNAME->text();
 }