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

diff --git a/src/qtui/settingspages/servereditdlg.ui b/src/qtui/settingspages/servereditdlg.ui
index ec5f0ff7..c05cee25 100644
--- a/src/qtui/settingspages/servereditdlg.ui
+++ b/src/qtui/settingspages/servereditdlg.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>ServerEditDlg</class>
- <widget class="QDialog" name="ServerEditDlg" >
-  <property name="geometry" >
+ <widget class="QDialog" name="ServerEditDlg">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,62 +10,54 @@
     <height>346</height>
    </rect>
   </property>
-  <property name="windowTitle" >
-   <string>Dialog</string>
+  <property name="windowTitle">
+   <string>Edit Server</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_3" >
+  <layout class="QVBoxLayout" name="verticalLayout_3">
    <item>
-    <widget class="QTabWidget" name="tabWidget" >
-     <property name="toolTip" >
+    <widget class="QTabWidget" name="tabWidget">
+     <property name="toolTip">
       <string/>
      </property>
-     <property name="currentIndex" >
+     <property name="currentIndex">
       <number>0</number>
      </property>
-     <property name="usesScrollButtons" >
+     <property name="usesScrollButtons">
       <bool>false</bool>
      </property>
-     <widget class="QWidget" name="basic" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>356</width>
-        <height>243</height>
-       </rect>
-      </property>
-      <attribute name="title" >
+     <widget class="QWidget" name="basic">
+      <attribute name="title">
        <string>Server Info</string>
       </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_4" >
+      <layout class="QVBoxLayout" name="verticalLayout_4">
        <item>
-        <layout class="QGridLayout" name="gridLayout_2" >
-         <item row="0" column="0" >
-          <widget class="QLabel" name="label" >
-           <property name="text" >
+        <layout class="QGridLayout" name="gridLayout_2">
+         <item row="0" column="0">
+          <widget class="QLabel" name="label">
+           <property name="text">
             <string>Server address:</string>
            </property>
           </widget>
          </item>
-         <item row="0" column="1" >
-          <widget class="QLabel" name="label_2" >
-           <property name="text" >
+         <item row="0" column="1">
+          <widget class="QLabel" name="label_2">
+           <property name="text">
             <string>Port:</string>
            </property>
           </widget>
          </item>
-         <item row="1" column="0" >
-          <widget class="QLineEdit" name="host" />
+         <item row="1" column="0">
+          <widget class="QLineEdit" name="host"/>
          </item>
-         <item row="1" column="1" >
-          <widget class="QSpinBox" name="port" >
-           <property name="minimum" >
+         <item row="1" column="1">
+          <widget class="QSpinBox" name="port">
+           <property name="minimum">
             <number>1</number>
            </property>
-           <property name="maximum" >
+           <property name="maximum">
             <number>65535</number>
            </property>
-           <property name="value" >
+           <property name="value">
             <number>6667</number>
            </property>
           </widget>
@@ -72,20 +65,20 @@
         </layout>
        </item>
        <item>
-        <layout class="QHBoxLayout" >
+        <layout class="QHBoxLayout">
          <item>
-          <widget class="QLabel" name="passwordLabel" >
-           <property name="text" >
+          <widget class="QLabel" name="passwordLabel">
+           <property name="text">
             <string>Password:</string>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QLineEdit" name="password" >
-           <property name="enabled" >
+          <widget class="QLineEdit" name="password">
+           <property name="enabled">
             <bool>true</bool>
            </property>
-           <property name="echoMode" >
+           <property name="echoMode">
             <enum>QLineEdit::Password</enum>
            </property>
           </widget>
@@ -93,25 +86,44 @@
         </layout>
        </item>
        <item>
-        <widget class="QCheckBox" name="useSSL" >
-         <property name="enabled" >
+        <widget class="QCheckBox" name="useSSL">
+         <property name="enabled">
           <bool>true</bool>
          </property>
-         <property name="text" >
-          <string>Use SSL</string>
+         <property name="toolTip">
+          <string>Try to use an encrypted connection (e.g. SSL/TLS)</string>
          </property>
-         <property name="icon" >
+         <property name="text">
+          <string>Use encrypted connection</string>
+         </property>
+         <property name="icon">
           <iconset>
            <normaloff>:/16x16/actions/oxygen/16x16/actions/document-encrypt.png</normaloff>:/16x16/actions/oxygen/16x16/actions/document-encrypt.png</iconset>
          </property>
         </widget>
        </item>
        <item>
-        <spacer name="verticalSpacer_2" >
-         <property name="orientation" >
+        <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">
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeHint" stdset="0" >
+         <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
@@ -121,27 +133,19 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="advanced" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>356</width>
-        <height>243</height>
-       </rect>
-      </property>
-      <attribute name="title" >
+     <widget class="QWidget" name="advanced">
+      <attribute name="title">
        <string>Advanced</string>
       </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_2" >
+      <layout class="QVBoxLayout" name="verticalLayout_2">
        <item>
-        <layout class="QHBoxLayout" name="horizontalLayout" >
+        <layout class="QHBoxLayout" name="horizontalLayout">
          <item>
-          <spacer name="horizontalSpacer" >
-           <property name="orientation" >
+          <spacer name="horizontalSpacer">
+           <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
-           <property name="sizeHint" stdset="0" >
+           <property name="sizeHint" stdset="0">
             <size>
              <width>40</width>
              <height>20</height>
@@ -150,29 +154,29 @@
           </spacer>
          </item>
          <item>
-          <widget class="QLabel" name="label_3" >
-           <property name="text" >
+          <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>Do not change unless you're going to connect to a server not supporting SSLv3!</string>
+          <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 (default)</string>
+            <property name="text">
+             <string>SSLv3 (insecure)</string>
             </property>
            </item>
            <item>
-            <property name="text" >
-             <string>SSLv2</string>
+            <property name="text">
+             <string>SSLv2 (insecure)</string>
             </property>
            </item>
            <item>
-            <property name="text" >
+            <property name="text">
              <string>TLSv1</string>
             </property>
            </item>
@@ -181,38 +185,38 @@
         </layout>
        </item>
        <item>
-        <widget class="QGroupBox" name="useProxy" >
-         <property name="title" >
+        <widget class="QGroupBox" name="useProxy">
+         <property name="title">
           <string>Use a Proxy</string>
          </property>
-         <property name="flat" >
+         <property name="flat">
           <bool>false</bool>
          </property>
-         <property name="checkable" >
+         <property name="checkable">
           <bool>true</bool>
          </property>
-         <property name="checked" >
+         <property name="checked">
           <bool>false</bool>
          </property>
-         <layout class="QVBoxLayout" name="verticalLayout" >
+         <layout class="QVBoxLayout" name="verticalLayout">
           <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_3" >
+           <layout class="QHBoxLayout" name="horizontalLayout_3">
             <item>
-             <widget class="QLabel" name="label_8" >
-              <property name="text" >
+             <widget class="QLabel" name="label_8">
+              <property name="text">
                <string>Proxy Type:</string>
               </property>
              </widget>
             </item>
             <item>
-             <widget class="QComboBox" name="proxyType" >
+             <widget class="QComboBox" name="proxyType">
               <item>
-               <property name="text" >
-                <string>Socks 5</string>
+               <property name="text">
+                <string>SOCKS 5</string>
                </property>
               </item>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>HTTP</string>
                </property>
               </item>
@@ -221,37 +225,37 @@
            </layout>
           </item>
           <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_2" >
+           <layout class="QHBoxLayout" name="horizontalLayout_2">
             <item>
-             <widget class="QLabel" name="label_4" >
-              <property name="text" >
+             <widget class="QLabel" name="label_4">
+              <property name="text">
                <string>Proxy Host:</string>
               </property>
              </widget>
             </item>
             <item>
-             <widget class="QLineEdit" name="proxyHost" >
-              <property name="text" >
+             <widget class="QLineEdit" name="proxyHost">
+              <property name="text">
                <string>localhost</string>
               </property>
              </widget>
             </item>
             <item>
-             <widget class="QLabel" name="label_5" >
-              <property name="text" >
+             <widget class="QLabel" name="label_5">
+              <property name="text">
                <string>Port:</string>
               </property>
              </widget>
             </item>
             <item>
-             <widget class="QSpinBox" name="proxyPort" >
-              <property name="minimum" >
+             <widget class="QSpinBox" name="proxyPort">
+              <property name="minimum">
                <number>1</number>
               </property>
-              <property name="maximum" >
+              <property name="maximum">
                <number>65535</number>
               </property>
-              <property name="value" >
+              <property name="value">
                <number>8080</number>
               </property>
              </widget>
@@ -259,27 +263,27 @@
            </layout>
           </item>
           <item>
-           <layout class="QGridLayout" name="gridLayout" >
-            <item row="0" column="0" >
-             <widget class="QLabel" name="label_6" >
-              <property name="text" >
+           <layout class="QGridLayout" name="gridLayout">
+            <item row="0" column="0">
+             <widget class="QLabel" name="label_6">
+              <property name="text">
                <string>Proxy Username:</string>
               </property>
              </widget>
             </item>
-            <item row="0" column="1" >
-             <widget class="QLineEdit" name="proxyUsername" />
+            <item row="0" column="1">
+             <widget class="QLineEdit" name="proxyUsername"/>
             </item>
-            <item row="1" column="0" >
-             <widget class="QLabel" name="label_7" >
-              <property name="text" >
+            <item row="1" column="0">
+             <widget class="QLabel" name="label_7">
+              <property name="text">
                <string>Proxy Password:</string>
               </property>
              </widget>
             </item>
-            <item row="1" column="1" >
-             <widget class="QLineEdit" name="proxyPassword" >
-              <property name="echoMode" >
+            <item row="1" column="1">
+             <widget class="QLineEdit" name="proxyPassword">
+              <property name="echoMode">
                <enum>QLineEdit::Password</enum>
               </property>
              </widget>
@@ -294,11 +298,11 @@
     </widget>
    </item>
    <item>
-    <spacer name="verticalSpacer" >
-     <property name="orientation" >
+    <spacer name="verticalSpacer">
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>17</height>
@@ -307,17 +311,33 @@
     </spacer>
    </item>
    <item>
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="standardButtons" >
+     <property name="standardButtons">
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>tabWidget</tabstop>
+  <tabstop>host</tabstop>
+  <tabstop>port</tabstop>
+  <tabstop>password</tabstop>
+  <tabstop>useSSL</tabstop>
+  <tabstop>sslVerify</tabstop>
+  <tabstop>sslVersion</tabstop>
+  <tabstop>useProxy</tabstop>
+  <tabstop>proxyType</tabstop>
+  <tabstop>proxyHost</tabstop>
+  <tabstop>proxyPort</tabstop>
+  <tabstop>proxyUsername</tabstop>
+  <tabstop>proxyPassword</tabstop>
+  <tabstop>buttonBox</tabstop>
+ </tabstops>
  <resources/>
  <connections>
   <connection>
@@ -326,11 +346,11 @@
    <receiver>ServerEditDlg</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>248</x>
      <y>254</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>157</x>
      <y>274</y>
     </hint>
@@ -342,11 +362,11 @@
    <receiver>ServerEditDlg</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>316</x>
      <y>260</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>286</x>
      <y>274</y>
     </hint>