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,41 +1,47 @@
 /*
  * 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>
 #include <Swift/QtUI/QtVCardWidget/QtVCardBirthdayField.h>
 #include <Swift/QtUI/QtVCardWidget/QtVCardDescriptionField.h>
 #include <Swift/QtUI/QtVCardWidget/QtVCardGeneralField.h>
 #include <Swift/QtUI/QtVCardWidget/QtVCardInternetEMailField.h>
 #include <Swift/QtUI/QtVCardWidget/QtVCardJIDField.h>
 #include <Swift/QtUI/QtVCardWidget/QtVCardOrganizationField.h>
 #include <Swift/QtUI/QtVCardWidget/QtVCardRoleField.h>
 #include <Swift/QtUI/QtVCardWidget/QtVCardTelephoneField.h>
 #include <Swift/QtUI/QtVCardWidget/QtVCardTitleField.h>
 #include <Swift/QtUI/QtVCardWidget/QtVCardURLField.h>
 #include <Swift/QtUI/QtSwiftUtil.h>
 
 namespace Swift {
 
 QtVCardWidget::QtVCardWidget(QWidget* parent) :
 	QWidget(parent),
 	ui(new ::Ui::QtVCardWidget) {
 	ui->setupUi(this);
 
 	ui->cardFields->setColumnStretch(0,0);
 	ui->cardFields->setColumnStretch(1,0);
 	ui->cardFields->setColumnStretch(2,2);
 	ui->cardFields->setColumnStretch(3,1);
 	ui->cardFields->setColumnStretch(4,2);
 	menu = new QMenu(this);
 
@@ -267,108 +273,135 @@ VCard::ref QtVCardWidget::getVCard() {
 			vcard->addURL(urlField->getURL());
 			continue;
 		}
 	}
 
 	if (bdayField) {
 		vcard->setBirthday(bdayField->getBirthday());
 	} else {
 		vcard->setBirthday(boost::posix_time::ptime());
 	}
 
 	if (descriptionField) {
 		vcard->setDescription(descriptionField->getDescription());
 	} else {
 		vcard->setDescription("");
 	}
 
 	return vcard;
 }
 
 void QtVCardWidget::addField() {
 	QAction* action = NULL;
 	if ((action = dynamic_cast<QAction*>(sender()))) {
 		boost::shared_ptr<QtVCardFieldInfo> fieldInfo = actionFieldInfo[action];
 		QWidget* newField = fieldInfo->createFieldInstance(this, ui->cardFields, true);
 		QtVCardGeneralField* newGeneralField = dynamic_cast<QtVCardGeneralField*>(newField);
 		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()));
 		menu->addAction(action);
 	}
 }
 
 int QtVCardWidget::fieldTypeInstances(boost::shared_ptr<QtVCardFieldInfo> fieldType) {
 	int instances = 0;
 	for (int n = 0; n < ui->cardFields->count(); n++) {
 		if (fieldType->testInstance(ui->cardFields->itemAt(n)->widget())) instances++;
 	}
 	return instances;
 }
 
 void layoutDeleteChildren(QLayout *layout) {
 	while(layout->count() > 0) {
 		QLayoutItem* child;
 		if ((child = layout->takeAt(0)) != 0) {
 			if (child->layout()) {
 				layoutDeleteChildren(child->layout());
 			}
 			if (dynamic_cast<QToolButton*>(child->widget())) {
 				delete child;
 				break;
 			}
 			delete child->widget();
 			delete child;
 		}
 	}
 }
 
 void QtVCardWidget::clearFields() {
 	foreach(QtVCardGeneralField* field, fields) {
 		delete field;
 	}
 	fields.clear();
 
 	assert(ui->cardFields->count() >= 0);
 	layoutDeleteChildren(ui->cardFields);
 }
 
 void QtVCardWidget::clearEmptyFields() {
 	std::vector<QtVCardGeneralField*> items_to_remove;
 	foreach (QtVCardGeneralField* field, fields) {
 		if (field->property("empty").isValid() && field->property("empty").toBool()) {
 			ui->cardFields->removeWidget(field);
 			items_to_remove.push_back(field);
 			delete field;
 		}
 	}
 
 	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);
 }
 
 }