Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-04-03 11:14:14 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2015-04-03 11:14:14 (GMT) |
| commit | b41695a739c2b75973b8d22e2be39add7051d076 (patch) | |
| tree | 9772a7626a65bfbcc539724cdbb0fe3fdb0915ec /Swift/QtUI/QtVCardWidget/QtVCardAddressLabelField.cpp | |
| parent | ffe36120a0ba5a512dc694955940ce4a8230a407 (diff) | |
| download | swift-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/QtVCardAddressLabelField.cpp')
| -rw-r--r-- | Swift/QtUI/QtVCardWidget/QtVCardAddressLabelField.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/Swift/QtUI/QtVCardWidget/QtVCardAddressLabelField.cpp b/Swift/QtUI/QtVCardWidget/QtVCardAddressLabelField.cpp index ba3d25f..64d2533 100644 --- a/Swift/QtUI/QtVCardWidget/QtVCardAddressLabelField.cpp +++ b/Swift/QtUI/QtVCardWidget/QtVCardAddressLabelField.cpp @@ -4,11 +4,19 @@ * See Documentation/Licenses/BSD-simplified.txt for more information. */ -#include "QtVCardAddressLabelField.h" +/* + * Copyright (c) 2015 Isode Limited. + * All rights reserved. + * See the COPYING file for more information. + */ + +#include <Swift/QtUI/QtVCardWidget/QtVCardAddressLabelField.h> -#include <QGridLayout> #include <boost/algorithm/string.hpp> +#include <QGridLayout> + +#include <Swift/QtUI/QtElidingLabel.h> #include <Swift/QtUI/QtSwiftUtil.h> namespace Swift { @@ -27,7 +35,7 @@ void QtVCardAddressLabelField::setupContentWidgets() { addressLabelPlainTextEdit->setTabChangesFocus(true); getGridLayout()->addWidget(addressLabelPlainTextEdit, getGridLayout()->rowCount()-1, 2, 3, 2, Qt::AlignVCenter); - deliveryTypeLabel = new QLabel(this); + deliveryTypeLabel = new QtElidingLabel(this); deliveryTypeLabel->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard); getGridLayout()->addWidget(deliveryTypeLabel, getGridLayout()->rowCount()-2, 4, Qt::AlignVCenter); |