1 files changed, 33 insertions, 0 deletions
diff --git a/Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp b/Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp
index d681fe9..7dfc06a 100644
--- a/Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp
+++ b/Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp
@@ -1,15 +1,21 @@
 /*
  * Copyright (c) 2012 Tobias Markmann
  * Licensed under the simplified BSD license.
  * 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 <Swift/QtUI/QtVCardWidget/QtVCardWidget.h>
 
 #include <QDebug>
 #include <QLineEdit>
 #include <QMenu>
 
 #include <Swift/QtUI/QtVCardWidget/ui_QtVCardWidget.h>
 #include <Swift/QtUI/QtVCardWidget/QtVCardAddressField.h>
 #include <Swift/QtUI/QtVCardWidget/QtVCardAddressLabelField.h>
@@ -293,18 +299,31 @@ void QtVCardWidget::addField() {
 		if (newGeneralField) {
 			newGeneralField->initialize();
 		}
 		appendField(newGeneralField);
 		relayoutToolButton();
 	}
 }
 
 void QtVCardWidget::removeField(QtVCardGeneralField *field) {
+	int sameFields = 0;
+	QtVCardGeneralField* fieldToChange = NULL;
+	foreach (QtVCardGeneralField* vcardField, fields) {
+		if ((vcardField != field) && (typeid(*vcardField) == typeid(*field))) {
+			sameFields++;
+			fieldToChange = vcardField;
+		}
+	}
+
+	if ((sameFields == 1) && fieldToChange) {
+		fieldToChange->setStarVisible(false);
+	}
+
 	fields.remove(field);
 	delete field;
 }
 
 void QtVCardWidget::addFieldType(QMenu* menu, boost::shared_ptr<QtVCardFieldInfo> fieldType) {
 	if (!fieldType->getMenuName().isEmpty()) {
 		QAction* action = new QAction(tr("Add ") + fieldType->getMenuName(), this);
 		actionFieldInfo[action] = fieldType;
 		connect(action, SIGNAL(triggered()), this, SLOT(addField()));
@@ -358,17 +377,31 @@ void QtVCardWidget::clearEmptyFields() {
 	}
 
 	foreach(QtVCardGeneralField* field, items_to_remove) {
 		fields.remove(field);
 	}
 }
 
 void QtVCardWidget::appendField(QtVCardGeneralField *field) {
 	connect(field, SIGNAL(deleteField(QtVCardGeneralField*)), SLOT(removeField(QtVCardGeneralField*)));
+
+	QtVCardGeneralField* fieldToChange = NULL;
+	foreach (QtVCardGeneralField* vcardField, fields) {
+		if (typeid(*vcardField) == typeid(*field)) {
+			fieldToChange = vcardField;
+			break;
+		}
+	}
+
+	if (fieldToChange) {
+		fieldToChange->setStarVisible(true);
+		field->setStarVisible(true);
+	}
+
 	fields.push_back(field);
 }
 
 void QtVCardWidget::relayoutToolButton() {
 	ui->cardFields->addWidget(toolButton, ui->cardFields->rowCount(), ui->cardFields->columnCount()-2, 1, 1, Qt::AlignRight);
 }
 
 }