Rollback changes to connection dialog

Author: uglide

src/app/forms/connection.ui

@@ -147,26 +147,23 @@
        <string>SSL</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_5">
-       <item row="0" column="0" colspan="3">
-        <widget class="QCheckBox" name="useSsl">
-         <property name="layoutDirection">
-          <enum>Qt::LeftToRight</enum>
+       <item row="3" column="2">
+        <widget class="QPushButton" name="sslPrivateKeyButton">
+         <property name="maximumSize">
+          <size>
+           <width>60</width>
+           <height>16777215</height>
+          </size>
          </property>
          <property name="text">
-          <string>Use SSL Protocol</string>
+          <string>...</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="0">
-        <widget class="QLabel" name="sslPrivateKey">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string>Private key:</string>
+       <item row="3" column="1">
+        <widget class="QLineEdit" name="sslPrivateKeyEdit">
+         <property name="placeholderText">
+          <string>(Optional) Private key in PEM format</string>
          </property>
         </widget>
        </item>
@@ -189,15 +186,38 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="1">
-        <widget class="QLineEdit" name="sslPrivateKeyEdit">
+       <item row="3" column="0">
+        <widget class="QLabel" name="sslPrivateKey">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>Private key:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="0" colspan="3">
+        <widget class="QCheckBox" name="useSsl">
+         <property name="layoutDirection">
+          <enum>Qt::LeftToRight</enum>
+         </property>
+         <property name="text">
+          <string>Use SSL Protocol</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1">
+        <widget class="QLineEdit" name="sslLocalCertEdit">
          <property name="placeholderText">
-          <string>Private key in PEM format</string>
+          <string>Public key in PEM format</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="2">
-        <widget class="QPushButton" name="sslPrivateKeyButton">
+       <item row="2" column="2">
+        <widget class="QPushButton" name="sslLocalCertButton">
          <property name="maximumSize">
           <size>
            <width>60</width>
@@ -209,14 +229,7 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="1">
-        <widget class="QLineEdit" name="sslCACertEdit">
-         <property name="placeholderText">
-          <string>Authority in PEM format</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="0">
+       <item row="4" column="0">
         <widget class="QLabel" name="label_2">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
@@ -229,27 +242,14 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="1">
-        <widget class="QLineEdit" name="sslLocalCertEdit">
+       <item row="4" column="1">
+        <widget class="QLineEdit" name="sslCACertEdit">
          <property name="placeholderText">
-          <string>Public key in PEM format</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="2">
-        <widget class="QPushButton" name="sslLocalCertButton">
-         <property name="maximumSize">
-          <size>
-           <width>60</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <property name="text">
-          <string>...</string>
+          <string>(Optional) Authority in PEM format</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="2">
+       <item row="4" column="2">
         <widget class="QPushButton" name="sslCACertButton">
          <property name="maximumSize">
           <size>