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/QtVCardAddressLabelField.h
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/QtVCardAddressLabelField.h')
-rw-r--r--Swift/QtUI/QtVCardWidget/QtVCardAddressLabelField.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/Swift/QtUI/QtVCardWidget/QtVCardAddressLabelField.h b/Swift/QtUI/QtVCardWidget/QtVCardAddressLabelField.h
index a665d31..7d9893b 100644
--- a/Swift/QtUI/QtVCardWidget/QtVCardAddressLabelField.h
+++ b/Swift/QtUI/QtVCardWidget/QtVCardAddressLabelField.h
@@ -1,12 +1,18 @@
/*
* Copyright (c) 2012 Tobias Markmann
* Licensed under the simplified BSD license.
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
#pragma once
#include <QButtonGroup>
#include <QPlainTextEdit>
#include <QRadioButton>
@@ -15,12 +21,14 @@
#include <Swift/QtUI/QtVCardWidget/QtVCardFieldInfo.h>
#include <Swift/QtUI/QtVCardWidget/QtVCardGeneralField.h>
#include <Swift/QtUI/QtVCardWidget/QtVCardHomeWork.h>
namespace Swift {
+class QtElidingLabel;
+
class QtVCardAddressLabelField : public QtVCardGeneralField, public QtVCardHomeWork {
Q_OBJECT
public:
GENERIC_QT_VCARD_FIELD_INFO("Address Label", UNLIMITED_INSTANCES, QtVCardAddressLabelField)
@@ -38,13 +46,13 @@ class QtVCardAddressLabelField : public QtVCardGeneralField, public QtVCardHomeW
public slots:
void handleEditibleChanged(bool isEditable);
private:
QPlainTextEdit* addressLabelPlainTextEdit;
- QLabel* deliveryTypeLabel;
+ QtElidingLabel* deliveryTypeLabel;
QRadioButton* domesticRadioButton;
QRadioButton* internationalRadioButton;
QButtonGroup* buttonGroup;
};
}