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/QtVCardPhotoAndNameFields.ui
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/QtVCardPhotoAndNameFields.ui')
-rw-r--r--Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.ui75
1 files changed, 66 insertions, 9 deletions
diff --git a/Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.ui b/Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.ui
index 04da2bc..146b49d 100644
--- a/Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.ui
+++ b/Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.ui
@@ -26,15 +26,24 @@
<property name="sizeConstraint">
<enum>QLayout::SetMinimumSize</enum>
</property>
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
<property name="horizontalSpacing">
<number>5</number>
</property>
<property name="verticalSpacing">
<number>1</number>
</property>
- <property name="margin">
- <number>0</number>
- </property>
<item row="0" column="0" rowspan="5">
<widget class="Swift::QtAvatarWidget" name="avatarWidget" native="true">
<property name="sizePolicy">
@@ -52,7 +61,25 @@
</widget>
</item>
<item row="0" column="1">
- <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <layout class="QHBoxLayout" name="horizontalLayoutFN">
+ <item>
+ <widget class="Swift::QtElidingLabel" name="labelFN">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>18</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
<item>
<widget class="Swift::QtResizableLineEdit" name="lineEditFN">
<property name="sizePolicy">
@@ -80,7 +107,7 @@
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>40</width>
+ <width>5</width>
<height>20</height>
</size>
</property>
@@ -89,9 +116,28 @@
</layout>
</item>
<item row="1" column="1">
- <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <layout class="QHBoxLayout" name="horizontalLayoutNICKNAME">
+ <item>
+ <widget class="Swift::QtElidingLabel" name="labelNICKNAME">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
<item>
<widget class="Swift::QtResizableLineEdit" name="lineEditNICKNAME">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="toolTip">
<string>Nickname</string>
</property>
@@ -107,7 +153,7 @@
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>40</width>
+ <width>5</width>
<height>20</height>
</size>
</property>
@@ -116,7 +162,7 @@
</layout>
</item>
<item row="2" column="1">
- <layout class="QHBoxLayout" name="horizontalLayout">
+ <layout class="QHBoxLayout" name="horizontalLayoutFULLNAME">
<property name="spacing">
<number>2</number>
</property>
@@ -124,7 +170,13 @@
<enum>QLayout::SetMinimumSize</enum>
</property>
<item>
- <widget class="QLabel" name="labelFULLNAME">
+ <widget class="Swift::QtElidingLabel" name="labelFULLNAME">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="text">
<string/>
</property>
@@ -245,6 +297,11 @@
<header>Swift/QtUI/QtAvatarWidget.h</header>
<container>1</container>
</customwidget>
+ <customwidget>
+ <class>Swift::QtElidingLabel</class>
+ <extends>QLabel</extends>
+ <header>Swift/QtUI/QtElidingLabel.h</header>
+ </customwidget>
</customwidgets>
<resources/>
<connections/>