summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-04-03 11:14:14 (GMT)
committerTobias Markmann <tm@ayena.de>2015-04-03 11:14:14 (GMT)
commitb41695a739c2b75973b8d22e2be39add7051d076 (patch)
tree9772a7626a65bfbcc539724cdbb0fe3fdb0915ec /Swift/QtUI/QtVCardWidget/QtVCardAddressField.cpp
parentffe36120a0ba5a512dc694955940ce4a8230a407 (diff)
downloadswift-b41695a739c2b75973b8d22e2be39add7051d076.zip
swift-b41695a739c2b75973b8d22e2be39add7051d076.tar.bz2
Elide rightmost fields in the VCard dialog
This patch changes the rightmost widget in the VCard fields from a QLabel to a QtElidingLabel. It also improves the spacing in the header in VCard profile dialog. Test-Information: Tested on OS X 10.9.5 with Qt 5.4.1. Change-Id: I771ddb555c5990c67550d9e36f001e57644712da
Diffstat (limited to 'Swift/QtUI/QtVCardWidget/QtVCardAddressField.cpp')
-rw-r--r--Swift/QtUI/QtVCardWidget/QtVCardAddressField.cpp11
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
@@ -4,10 +4,17 @@
* 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 {
@@ -58,7 +65,7 @@ void QtVCardAddressField::setupContentWidgets() {
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);