Mercurial Repositories > eric / file diff

--- a/Preferences/ConfigurationPages/EmailPage.ui	Sat Mar 02 18:10:57 2019 +0100
+++ b/Preferences/ConfigurationPages/EmailPage.ui	Sat Mar 02 19:04:09 2019 +0100
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>450</width>
-    <height>500</height>
+    <height>498</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_3">
@@ -32,6 +32,44 @@
     </widget>
    </item>
    <item>
+    <layout class="QGridLayout" name="gridLayout_3">
+     <item row="0" column="0">
+      <widget class="QLabel" name="textLabel1_5">
+       <property name="text">
+        <string>Email address:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QLineEdit" name="emailEdit">
+       <property name="toolTip">
+        <string>Enter your email address</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="textLabel1_6">
+       <property name="text">
+        <string>Signature:</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignTop</set>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QTextEdit" name="signatureEdit">
+       <property name="toolTip">
+        <string>Enter your email signature</string>
+       </property>
+       <property name="acceptRichText">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
       <string>Google Mail</string>
@@ -109,6 +147,13 @@
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
        <layout class="QGridLayout" name="gridLayout_2">
+        <item row="1" column="0">
+         <widget class="QLabel" name="label_2">
+          <property name="text">
+           <string>Encryption Method:</string>
+          </property>
+         </widget>
+        </item>
         <item row="0" column="0">
          <widget class="QLabel" name="textLabel2_2">
           <property name="text">
@@ -116,6 +161,32 @@
           </property>
          </widget>
         </item>
+        <item row="2" column="0">
+         <widget class="QLabel" name="label">
+          <property name="text">
+           <string>Port:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="1">
+         <widget class="QSpinBox" name="portSpin">
+          <property name="toolTip">
+           <string>Enter the port of the mail server</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+          <property name="minimum">
+           <number>1</number>
+          </property>
+          <property name="maximum">
+           <number>65535</number>
+          </property>
+          <property name="value">
+           <number>25</number>
+          </property>
+         </widget>
+        </item>
         <item row="0" column="1" colspan="2">
          <widget class="QLineEdit" name="mailServerEdit">
           <property name="toolTip">
@@ -123,13 +194,6 @@
           </property>
          </widget>
         </item>
-        <item row="1" column="0">
-         <widget class="QLabel" name="label_2">
-          <property name="text">
-           <string>Encryption Method:</string>
-          </property>
-         </widget>
-        </item>
         <item row="1" column="1" colspan="2">
          <widget class="QFrame" name="frame">
           <property name="frameShape">
@@ -187,32 +251,6 @@
           </layout>
          </widget>
         </item>
-        <item row="2" column="0">
-         <widget class="QLabel" name="label">
-          <property name="text">
-           <string>Port:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="1">
-         <widget class="QSpinBox" name="portSpin">
-          <property name="toolTip">
-           <string>Enter the port of the mail server</string>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-          </property>
-          <property name="minimum">
-           <number>1</number>
-          </property>
-          <property name="maximum">
-           <number>65535</number>
-          </property>
-          <property name="value">
-           <number>25</number>
-          </property>
-         </widget>
-        </item>
         <item row="2" column="2">
          <spacer name="horizontalSpacer">
           <property name="orientation">
@@ -226,40 +264,6 @@
           </property>
          </spacer>
         </item>
-        <item row="3" column="0">
-         <widget class="QLabel" name="textLabel1_5">
-          <property name="text">
-           <string>Email address:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="3" column="1" colspan="2">
-         <widget class="QLineEdit" name="emailEdit">
-          <property name="toolTip">
-           <string>Enter your email address</string>
-          </property>
-         </widget>
-        </item>
-        <item row="4" column="0">
-         <widget class="QLabel" name="textLabel1_6">
-          <property name="text">
-           <string>Signature:</string>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignTop</set>
-          </property>
-         </widget>
-        </item>
-        <item row="4" column="1" colspan="2">
-         <widget class="QTextEdit" name="signatureEdit">
-          <property name="toolTip">
-           <string>Enter your email signature</string>
-          </property>
-          <property name="acceptRichText">
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
        </layout>
       </item>
       <item>
@@ -337,6 +341,8 @@
   </layout>
  </widget>
  <tabstops>
+  <tabstop>emailEdit</tabstop>
+  <tabstop>signatureEdit</tabstop>
   <tabstop>googleMailCheckBox</tabstop>
   <tabstop>googleHelpButton</tabstop>
   <tabstop>googleInstallButton</tabstop>
@@ -346,8 +352,6 @@
   <tabstop>useSslButton</tabstop>
   <tabstop>useTlsButton</tabstop>
   <tabstop>portSpin</tabstop>
-  <tabstop>emailEdit</tabstop>
-  <tabstop>signatureEdit</tabstop>
   <tabstop>mailAuthenticationGroup</tabstop>
   <tabstop>mailUserEdit</tabstop>
   <tabstop>mailPasswordEdit</tabstop>