X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fservereditdlg.ui;h=c05cee25c73acc3b9f2b932ed5566598c632ba35;hp=d16d1e49c4cab5d84e40aa1bf85fa7e9f7d91b64;hb=158443f71d48215eea8b47b836b61afd77654b78;hpb=ce26c3770b254362c7bd1e094ba8f8bf22133653

diff --git a/src/qtui/settingspages/servereditdlg.ui b/src/qtui/settingspages/servereditdlg.ui
index d16d1e49..c05cee25 100644
--- a/src/qtui/settingspages/servereditdlg.ui
+++ b/src/qtui/settingspages/servereditdlg.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>Edit Server</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_3">
    <item>
@@ -90,8 +90,11 @@
          <property name="enabled">
           <bool>true</bool>
          </property>
+         <property name="toolTip">
+          <string>Try to use an encrypted connection (e.g. SSL/TLS)</string>
+         </property>
          <property name="text">
-          <string>Use SSL</string>
+          <string>Use encrypted connection</string>
          </property>
          <property name="icon">
           <iconset>
@@ -99,6 +102,22 @@
          </property>
         </widget>
        </item>
+       <item>
+        <widget class="QCheckBox" name="sslVerify">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
+         <property name="toolTip">
+          <string>&lt;p&gt;Verify the encrypted connection provides a valid certificate, increasing security.&lt;br/&gt;Uncheck if the IRC server uses a self-signed or invalid certificate.&lt;/p&gt;</string>
+         </property>
+         <property name="text">
+          <string>Verify connection security</string>
+         </property>
+         <property name="checked">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
        <item>
         <spacer name="verticalSpacer_2">
          <property name="orientation">
@@ -119,6 +138,52 @@
        <string>Advanced</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <item>
+          <spacer name="horizontalSpacer">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_3">
+           <property name="text">
+            <string>SSL Version:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="sslVersion">
+           <property name="toolTip">
+            <string>Use only TLSv1 unless you know what you are doing!</string>
+           </property>
+           <item>
+            <property name="text">
+             <string>SSLv3 (insecure)</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>SSLv2 (insecure)</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>TLSv1</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+        </layout>
+       </item>
        <item>
         <widget class="QGroupBox" name="useProxy">
          <property name="title">
@@ -147,7 +212,7 @@
              <widget class="QComboBox" name="proxyType">
               <item>
                <property name="text">
-                <string>Socks 5</string>
+                <string>SOCKS 5</string>
                </property>
               </item>
               <item>
@@ -263,6 +328,8 @@
   <tabstop>port</tabstop>
   <tabstop>password</tabstop>
   <tabstop>useSSL</tabstop>
+  <tabstop>sslVerify</tabstop>
+  <tabstop>sslVersion</tabstop>
   <tabstop>useProxy</tabstop>
   <tabstop>proxyType</tabstop>
   <tabstop>proxyHost</tabstop>