diff -r 43d42a54cf50 -r 3ef014765648 Preferences/ConfigurationPages/EmailPage.ui
--- a/Preferences/ConfigurationPages/EmailPage.ui Wed Jan 25 11:17:04 2017 +0100
+++ b/Preferences/ConfigurationPages/EmailPage.ui Wed Jan 25 12:48:42 2017 +0100
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>422</width>
- <height>512</height>
+ <height>543</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
@@ -48,13 +48,77 @@
</widget>
</item>
<item row="1" column="0">
- <widget class="QLabel" name="label">
+ <widget class="QLabel" name="label_2">
<property name="text">
- <string>Outgoing mail server port:</string>
+ <string>Encryption Method:</string>
</property>
</widget>
</item>
- <item row="1" column="1">
+ <item row="1" column="1" colspan="2">
+ <widget class="QFrame" name="frame">
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Raised</enum>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <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>
+ <item>
+ <widget class="QRadioButton" name="noEncryptionButton">
+ <property name="toolTip">
+ <string>Select to use no encryption</string>
+ </property>
+ <property name="text">
+ <string>None</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="useSslButton">
+ <property name="toolTip">
+ <string>Select to use SSL</string>
+ </property>
+ <property name="text">
+ <string>SSL</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="useTlsButton">
+ <property name="toolTip">
+ <string>Select to use TLS</string>
+ </property>
+ <property name="text">
+ <string>TLS</string>
+ </property>
+ </widget>
+ </item>
+ </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>
@@ -73,34 +137,34 @@
</property>
</widget>
</item>
- <item row="1" column="2">
+ <item row="2" column="2">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>118</width>
+ <width>138</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
- <item row="2" column="0">
+ <item row="3" column="0">
<widget class="QLabel" name="textLabel1_5">
<property name="text">
<string>Email address:</string>
</property>
</widget>
</item>
- <item row="2" column="1" colspan="2">
+ <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="3" column="0">
+ <item row="4" column="0">
<widget class="QLabel" name="textLabel1_6">
<property name="text">
<string>Signature:</string>
@@ -110,7 +174,7 @@
</property>
</widget>
</item>
- <item row="3" column="1" colspan="2">
+ <item row="4" column="1" colspan="2">
<widget class="QTextEdit" name="signatureEdit">
<property name="toolTip">
<string>Enter your email signature</string>
@@ -123,83 +187,62 @@
</layout>
</item>
<item>
- <widget class="QCheckBox" name="useTlsCheckBox">
- <property name="toolTip">
- <string>Select to use TLS</string>
- </property>
- <property name="text">
- <string>Use TLS</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="mailAuthenticationCheckBox">
+ <widget class="QGroupBox" name="mailAuthenticationGroup">
<property name="toolTip">
<string>Select to authenticatate against the mail server</string>
</property>
- <property name="text">
+ <property name="title">
<string>Mail server needs authentication</string>
</property>
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="textLabel1_15">
+ <property name="text">
+ <string>Username:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="mailUserEdit">
+ <property name="toolTip">
+ <string>Enter your mail server username</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="textLabel2_7">
+ <property name="text">
+ <string>Password:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="mailPasswordEdit">
+ <property name="toolTip">
+ <string>Enter your password for accessing the mail server</string>
+ </property>
+ <property name="echoMode">
+ <enum>QLineEdit::Password</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" colspan="2">
+ <widget class="QPushButton" name="testButton">
+ <property name="toolTip">
+ <string>Press to test the login data</string>
+ </property>
+ <property name="text">
+ <string>Test Login</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</widget>
</item>
<item>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="QLabel" name="textLabel1_15">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Username:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QLineEdit" name="mailUserEdit">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="toolTip">
- <string>Enter your mail server username</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="textLabel2_7">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Password:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QLineEdit" name="mailPasswordEdit">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="toolTip">
- <string>Enter your password for accessing the mail server</string>
- </property>
- <property name="echoMode">
- <enum>QLineEdit::Password</enum>
- </property>
- </widget>
- </item>
- <item row="2" column="0" colspan="2">
- <widget class="QPushButton" name="testButton">
- <property name="toolTip">
- <string>Press to test the login data</string>
- </property>
- <property name="text">
- <string>Test Login</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
<spacer>
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -216,79 +259,17 @@
</widget>
<tabstops>
<tabstop>mailServerEdit</tabstop>
+ <tabstop>noEncryptionButton</tabstop>
+ <tabstop>useSslButton</tabstop>
+ <tabstop>useTlsButton</tabstop>
<tabstop>portSpin</tabstop>
<tabstop>emailEdit</tabstop>
<tabstop>signatureEdit</tabstop>
- <tabstop>useTlsCheckBox</tabstop>
- <tabstop>mailAuthenticationCheckBox</tabstop>
+ <tabstop>mailAuthenticationGroup</tabstop>
<tabstop>mailUserEdit</tabstop>
<tabstop>mailPasswordEdit</tabstop>
+ <tabstop>testButton</tabstop>
</tabstops>
<resources/>
- <connections>
- <connection>
- <sender>mailAuthenticationCheckBox</sender>
- <signal>toggled(bool)</signal>
- <receiver>textLabel1_15</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel">
- <x>39</x>
- <y>350</y>
- </hint>
- <hint type="destinationlabel">
- <x>49</x>
- <y>377</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>mailAuthenticationCheckBox</sender>
- <signal>toggled(bool)</signal>
- <receiver>textLabel2_7</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel">
- <x>74</x>
- <y>350</y>
- </hint>
- <hint type="destinationlabel">
- <x>16</x>
- <y>403</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>mailAuthenticationCheckBox</sender>
- <signal>toggled(bool)</signal>
- <receiver>mailUserEdit</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel">
- <x>105</x>
- <y>350</y>
- </hint>
- <hint type="destinationlabel">
- <x>193</x>
- <y>377</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>mailAuthenticationCheckBox</sender>
- <signal>toggled(bool)</signal>
- <receiver>mailPasswordEdit</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel">
- <x>176</x>
- <y>350</y>
- </hint>
- <hint type="destinationlabel">
- <x>243</x>
- <y>403</y>
- </hint>
- </hints>
- </connection>
- </connections>
+ <connections/>
</ui>
