From 8de649a83747bcb59a497fe1aeddd61b00ad0c05 Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Fri, 4 Sep 2015 12:54:11 +0200
Subject: 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

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>
-- 
cgit v0.10.2-6-g49f6