1 files changed, 9 insertions, 2 deletions
diff --git a/Swift/QtUI/QtVCardWidget/QtVCardAddressField.cpp b/Swift/QtUI/QtVCardWidget/QtVCardAddressField.cpp
index af17d97..5f9fddf 100644
--- a/Swift/QtUI/QtVCardWidget/QtVCardAddressField.cpp
+++ b/Swift/QtUI/QtVCardWidget/QtVCardAddressField.cpp
@@ -1,16 +1,23 @@
 /*
  * Copyright (c) 2012-2014 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
-#include "QtVCardAddressField.h"
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
+#include <Swift/QtUI/QtVCardWidget/QtVCardAddressField.h>
 
 #include <QGridLayout>
 
+#include <Swift/QtUI/QtElidingLabel.h>
 #include <Swift/QtUI/QtSwiftUtil.h>
 
 namespace Swift {
 
 QtVCardAddressField::QtVCardAddressField(QWidget* parent, QGridLayout *layout, bool editable) :
 	QtVCardGeneralField(parent, layout, editable, layout->rowCount(), tr("Address")), streetLineEdit(NULL), poboxLineEdit(NULL), addressextLineEdit(NULL), cityLineEdit(NULL), pocodeLineEdit(NULL), regionLineEdit(NULL), countryLineEdit(NULL), textFieldGridLayout(NULL), textFieldGridLayoutItem(NULL), deliveryTypeLabel(NULL), domesticRadioButton(NULL), internationalRadioButton(NULL), buttonGroup(NULL) {
@@ -55,13 +62,13 @@ void QtVCardAddressField::setupContentWidgets() {
 	cityLineEdit->setPlaceholderText(tr("City"));
 	pocodeLineEdit->setPlaceholderText(tr("Postal Code"));
 	regionLineEdit->setPlaceholderText(tr("Region"));
 	countryLineEdit->setPlaceholderText(tr("Country"));
 #endif
 
-	deliveryTypeLabel = new QLabel(this);
+	deliveryTypeLabel = new QtElidingLabel(this);
 	deliveryTypeLabel->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard);
 	getGridLayout()->addWidget(deliveryTypeLabel, getGridLayout()->rowCount()-3, 4, Qt::AlignVCenter);
 
 	domesticRadioButton = new QRadioButton(tr("Domestic Delivery"), this);
 	getGridLayout()->addWidget(domesticRadioButton, getGridLayout()->rowCount()-2, 4, Qt::AlignVCenter);