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/QtVCardAddressField.h | |
| 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/QtVCardAddressField.h')
| -rw-r--r-- | Swift/QtUI/QtVCardWidget/QtVCardAddressField.h | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/Swift/QtUI/QtVCardWidget/QtVCardAddressField.h b/Swift/QtUI/QtVCardWidget/QtVCardAddressField.h index 5a1256a..8cbee18 100644 --- a/Swift/QtUI/QtVCardWidget/QtVCardAddressField.h +++ b/Swift/QtUI/QtVCardWidget/QtVCardAddressField.h @@ -4,20 +4,28 @@ * See Documentation/Licenses/BSD-simplified.txt for more information. */ -#pragma once +/* + * Copyright (c) 2015 Isode Limited. + * All rights reserved. + * See the COPYING file for more information. + */ -#include <Swiften/Elements/VCard.h> +#pragma once #include <QButtonGroup> #include <QRadioButton> -#include "QtResizableLineEdit.h" -#include "QtVCardFieldInfo.h" -#include "QtVCardGeneralField.h" -#include "QtVCardHomeWork.h" +#include <Swiften/Elements/VCard.h> + +#include <Swift/QtUI/QtVCardWidget/QtResizableLineEdit.h> +#include <Swift/QtUI/QtVCardWidget/QtVCardFieldInfo.h> +#include <Swift/QtUI/QtVCardWidget/QtVCardGeneralField.h> +#include <Swift/QtUI/QtVCardWidget/QtVCardHomeWork.h> namespace Swift { +class QtElidingLabel; + class QtVCardAddressField : public QtVCardGeneralField, public QtVCardHomeWork { Q_OBJECT @@ -51,7 +59,7 @@ class QtVCardAddressField : public QtVCardGeneralField, public QtVCardHomeWork { QGridLayout* textFieldGridLayout; QLayoutItem* textFieldGridLayoutItem; - QLabel* deliveryTypeLabel; + QtElidingLabel* deliveryTypeLabel; QRadioButton* domesticRadioButton; QRadioButton* internationalRadioButton; QButtonGroup* buttonGroup; |