summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-09-04 10:54:11 (GMT)
committerTobias Markmann <tm@ayena.de>2015-09-04 10:54:11 (GMT)
commit8de649a83747bcb59a497fe1aeddd61b00ad0c05 (patch)
tree9333cc76daf2b6c756e1e141bbad191fa7903520
parentbe6aa6e81b44be67518731d67bb2b72268d351e8 (diff)
downloadswift-8de649a83747bcb59a497fe1aeddd61b00ad0c05.zip
swift-8de649a83747bcb59a497fe1aeddd61b00ad0c05.tar.bz2
Fix middle name and suffix arrangement in vCard dialog
The vCard fields for middle name and suffix have been swapped at some point in the past. This commit fixes this error. It also specifies the correct tab sequence for the widget. Test-Information: Tested the correct visual appearance and tab sequence on Mac OS X 10.9.5 with Qt 5.4.2. Change-Id: I80d7e21982ddbb836c9f9a690e685a902e54df9c
-rw-r--r--Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.ui37
1 files changed, 23 insertions, 14 deletions
diff --git a/Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.ui b/Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.ui
index 8e24098..97acba0 100644
--- a/Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.ui
+++ b/Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.ui
@@ -257,7 +257,10 @@
</widget>
</item>
<item>
- <widget class="Swift::QtResizableLineEdit" name="lineEditSUFFIX">
+ <widget class="Swift::QtResizableLineEdit" name="lineEditMIDDLE">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -265,10 +268,13 @@
</sizepolicy>
</property>
<property name="toolTip">
- <string>Suffix</string>
+ <string>Middle Name</string>
</property>
- <property name="readOnly">
- <bool>false</bool>
+ <property name="styleSheet">
+ <string notr="true"/>
+ </property>
+ <property name="frame">
+ <bool>true</bool>
</property>
</widget>
</item>
@@ -286,10 +292,7 @@
</widget>
</item>
<item>
- <widget class="Swift::QtResizableLineEdit" name="lineEditMIDDLE">
- <property name="enabled">
- <bool>true</bool>
- </property>
+ <widget class="Swift::QtResizableLineEdit" name="lineEditSUFFIX">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -297,13 +300,10 @@
</sizepolicy>
</property>
<property name="toolTip">
- <string>Middle Name</string>
- </property>
- <property name="styleSheet">
- <string notr="true"/>
+ <string>Suffix</string>
</property>
- <property name="frame">
- <bool>true</bool>
+ <property name="readOnly">
+ <bool>false</bool>
</property>
</widget>
</item>
@@ -349,6 +349,15 @@
<header>Swift/QtUI/QtElidingLabel.h</header>
</customwidget>
</customwidgets>
+ <tabstops>
+ <tabstop>lineEditFN</tabstop>
+ <tabstop>lineEditNICKNAME</tabstop>
+ <tabstop>lineEditPREFIX</tabstop>
+ <tabstop>lineEditGIVEN</tabstop>
+ <tabstop>lineEditMIDDLE</tabstop>
+ <tabstop>lineEditFAMILY</tabstop>
+ <tabstop>lineEditSUFFIX</tabstop>
+ </tabstops>
<resources/>
<connections/>
</ui>