X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fnetworkssettingspage.ui;h=4bbafbaaec1e8a7582669629e9f48e60c4b044b6;hp=120f3f1bb2c420f727e0c68b83218d391273f828;hb=e4972a0ebce0d555d752ab2f34ffd6a6dcdef1dd;hpb=93567823df81a180c0474cdb554e196e477dcef5

diff --git a/src/qtui/settingspages/networkssettingspage.ui b/src/qtui/settingspages/networkssettingspage.ui
index 120f3f1b..4bbafbaa 100644
--- a/src/qtui/settingspages/networkssettingspage.ui
+++ b/src/qtui/settingspages/networkssettingspage.ui
@@ -1,424 +1,545 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>NetworksSettingsPage</class>
- <widget class="QWidget" name="NetworksSettingsPage" >
-  <property name="geometry" >
+ <widget class="QWidget" name="NetworksSettingsPage">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>565</width>
-    <height>468</height>
+    <width>515</width>
+    <height>503</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QHBoxLayout" >
+  <layout class="QVBoxLayout" name="verticalLayout_7">
    <item>
-    <layout class="QVBoxLayout" >
+    <layout class="QVBoxLayout" name="verticalLayout_3">
      <item>
-      <widget class="QListWidget" name="networkList" >
-       <property name="selectionBehavior" >
-        <enum>QAbstractItemView::SelectRows</enum>
-       </property>
-       <property name="sortingEnabled" >
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="renameNetwork" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text" >
-        <string>Re&amp;name...</string>
-       </property>
-       <property name="icon" >
-        <iconset resource="../../icons/icons.qrc" >
-         <normaloff>:/16x16/actions/oxygen/16x16/actions/edit-rename.png</normaloff>:/16x16/actions/oxygen/16x16/actions/edit-rename.png</iconset>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="addNetwork" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text" >
-        <string>&amp;Add...</string>
-       </property>
-       <property name="icon" >
-        <iconset resource="../../icons/icons.qrc" >
-         <normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</iconset>
-       </property>
-       <property name="iconSize" >
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="deleteNetwork" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text" >
-        <string>De&amp;lete</string>
-       </property>
-       <property name="icon" >
-        <iconset resource="../../icons/icons.qrc" >
-         <normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</iconset>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeHint" stdset="0" >
-        <size>
-         <width>131</width>
-         <height>71</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="connectNow" >
-       <property name="enabled" >
-        <bool>false</bool>
-       </property>
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text" >
-        <string>Connect now</string>
-       </property>
-       <property name="icon" >
-        <iconset>
-         <normaloff/>
-        </iconset>
-       </property>
-      </widget>
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <item>
+        <widget class="QListWidget" name="networkList">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+           <horstretch>1</horstretch>
+           <verstretch>10</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="selectionBehavior">
+          <enum>QAbstractItemView::SelectRows</enum>
+         </property>
+         <property name="sortingEnabled">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <layout class="QVBoxLayout" name="verticalLayout_2">
+         <item>
+          <widget class="QPushButton" name="renameNetwork">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>Re&amp;name...</string>
+           </property>
+           <property name="icon">
+            <iconset>
+             <normaloff>:/16x16/actions/oxygen/16x16/actions/edit-rename.png</normaloff>:/16x16/actions/oxygen/16x16/actions/edit-rename.png</iconset>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="addNetwork">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>&amp;Add...</string>
+           </property>
+           <property name="icon">
+            <iconset>
+             <normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</iconset>
+           </property>
+           <property name="iconSize">
+            <size>
+             <width>16</width>
+             <height>16</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="deleteNetwork">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>De&amp;lete</string>
+           </property>
+           <property name="icon">
+            <iconset>
+             <normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</iconset>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="verticalSpacer">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+      </layout>
      </item>
     </layout>
    </item>
    <item>
-    <widget class="QGroupBox" name="detailsBox" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+    <widget class="QGroupBox" name="detailsBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
        <horstretch>10</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="title" >
+     <property name="title">
       <string>Network Details</string>
      </property>
-     <layout class="QVBoxLayout" >
+     <layout class="QVBoxLayout">
       <item>
-       <layout class="QHBoxLayout" >
+       <layout class="QHBoxLayout">
         <item>
-         <widget class="QLabel" name="label_6" >
-          <property name="text" >
+         <widget class="QLabel" name="label_6">
+          <property name="text">
            <string>Identity:</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QComboBox" name="identityList" >
-          <property name="sizePolicy" >
-           <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+         <widget class="QComboBox" name="identityList">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
          </widget>
         </item>
+        <item>
+         <widget class="QToolButton" name="editIdentities">
+          <property name="text">
+           <string>...</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer_2">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
        </layout>
       </item>
       <item>
-       <widget class="QTabWidget" name="tabWidget" >
-        <property name="enabled" >
+       <widget class="QTabWidget" name="tabWidget">
+        <property name="enabled">
          <bool>true</bool>
         </property>
-        <property name="toolTip" >
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="toolTip">
          <string/>
         </property>
-        <property name="currentIndex" >
+        <property name="currentIndex">
          <number>0</number>
         </property>
-        <widget class="QWidget" name="serversTab" >
-         <property name="enabled" >
+        <widget class="QWidget" name="serversTab">
+         <property name="enabled">
           <bool>true</bool>
          </property>
-         <property name="geometry" >
-          <rect>
-           <x>0</x>
-           <y>0</y>
-           <width>364</width>
-           <height>348</height>
-          </rect>
-         </property>
-         <attribute name="title" >
+         <attribute name="title">
           <string>Servers</string>
          </attribute>
-         <attribute name="toolTip" >
+         <attribute name="toolTip">
           <string>Manage servers for this network</string>
          </attribute>
-         <layout class="QVBoxLayout" >
+         <layout class="QHBoxLayout" name="horizontalLayout_2">
           <item>
-           <layout class="QHBoxLayout" >
+           <widget class="QListWidget" name="serverList">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+              <horstretch>1</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <layout class="QVBoxLayout">
             <item>
-             <widget class="QListWidget" name="serverList" >
-              <property name="sizePolicy" >
-               <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
-                <horstretch>1</horstretch>
+             <widget class="QPushButton" name="editServer">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
+              <property name="text">
+               <string>&amp;Edit...</string>
+              </property>
+              <property name="icon">
+               <iconset>
+                <normaloff/>
+               </iconset>
+              </property>
              </widget>
             </item>
             <item>
-             <layout class="QVBoxLayout" >
+             <widget class="QPushButton" name="addServer">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>&amp;Add...</string>
+              </property>
+              <property name="icon">
+               <iconset>
+                <normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</iconset>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QPushButton" name="deleteServer">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>De&amp;lete</string>
+              </property>
+              <property name="icon">
+               <iconset>
+                <normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</iconset>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <layout class="QHBoxLayout">
               <item>
-               <widget class="QPushButton" name="editServer" >
-                <property name="sizePolicy" >
-                 <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text" >
-                 <string>&amp;Edit...</string>
+               <spacer>
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
                 </property>
-                <property name="icon" >
-                 <iconset>
-                  <normaloff/>
-                 </iconset>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>0</width>
+                  <height>20</height>
+                 </size>
                 </property>
-               </widget>
+               </spacer>
               </item>
               <item>
-               <widget class="QPushButton" name="addServer" >
-                <property name="sizePolicy" >
-                 <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
+               <widget class="QToolButton" name="upServer">
+                <property name="toolTip">
+                 <string>Move upwards in list</string>
                 </property>
-                <property name="text" >
-                 <string>&amp;Add...</string>
+                <property name="text">
+                 <string>...</string>
                 </property>
-                <property name="icon" >
-                 <iconset resource="../../icons/icons.qrc" >
-                  <normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</iconset>
+                <property name="icon">
+                 <iconset>
+                  <normaloff>:/16x16/actions/oxygen/16x16/actions/go-up.png</normaloff>:/16x16/actions/oxygen/16x16/actions/go-up.png</iconset>
                 </property>
                </widget>
               </item>
               <item>
-               <widget class="QPushButton" name="deleteServer" >
-                <property name="sizePolicy" >
-                 <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
+               <widget class="QToolButton" name="downServer">
+                <property name="toolTip">
+                 <string>Move downwards in list</string>
                 </property>
-                <property name="text" >
-                 <string>De&amp;lete</string>
+                <property name="text">
+                 <string>...</string>
                 </property>
-                <property name="icon" >
-                 <iconset resource="../../icons/icons.qrc" >
-                  <normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</iconset>
+                <property name="icon">
+                 <iconset>
+                  <normaloff>:/16x16/actions/oxygen/16x16/actions/go-down.png</normaloff>:/16x16/actions/oxygen/16x16/actions/go-down.png</iconset>
                 </property>
                </widget>
               </item>
-              <item>
-               <layout class="QHBoxLayout" >
-                <item>
-                 <spacer>
-                  <property name="orientation" >
-                   <enum>Qt::Horizontal</enum>
-                  </property>
-                  <property name="sizeHint" stdset="0" >
-                   <size>
-                    <width>0</width>
-                    <height>20</height>
-                   </size>
-                  </property>
-                 </spacer>
-                </item>
-                <item>
-                 <widget class="QToolButton" name="upServer" >
-                  <property name="toolTip" >
-                   <string>Move upwards in list</string>
-                  </property>
-                  <property name="text" >
-                   <string>...</string>
-                  </property>
-                  <property name="icon" >
-                   <iconset resource="../../icons/icons.qrc" >
-                    <normaloff>:/16x16/actions/oxygen/16x16/actions/go-up.png</normaloff>:/16x16/actions/oxygen/16x16/actions/go-up.png</iconset>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QToolButton" name="downServer" >
-                  <property name="toolTip" >
-                   <string>Move downwards in list</string>
-                  </property>
-                  <property name="text" >
-                   <string>...</string>
-                  </property>
-                  <property name="icon" >
-                   <iconset resource="../../icons/icons.qrc" >
-                    <normaloff>:/16x16/actions/oxygen/16x16/actions/go-down.png</normaloff>:/16x16/actions/oxygen/16x16/actions/go-down.png</iconset>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <spacer>
-                  <property name="orientation" >
-                   <enum>Qt::Horizontal</enum>
-                  </property>
-                  <property name="sizeHint" stdset="0" >
-                   <size>
-                    <width>0</width>
-                    <height>20</height>
-                   </size>
-                  </property>
-                 </spacer>
-                </item>
-               </layout>
-              </item>
               <item>
                <spacer>
-                <property name="orientation" >
-                 <enum>Qt::Vertical</enum>
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
                 </property>
-                <property name="sizeHint" stdset="0" >
+                <property name="sizeHint" stdset="0">
                  <size>
-                  <width>20</width>
-                  <height>40</height>
+                  <width>0</width>
+                  <height>20</height>
                  </size>
                 </property>
                </spacer>
               </item>
              </layout>
             </item>
+            <item>
+             <spacer>
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>20</width>
+                <height>40</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
            </layout>
           </item>
-          <item>
-           <widget class="QCheckBox" name="randomServer" >
-            <property name="enabled" >
-             <bool>true</bool>
-            </property>
-            <property name="text" >
-             <string>Choose random server for connecting</string>
-            </property>
-           </widget>
-          </item>
          </layout>
         </widget>
-        <widget class="QWidget" name="performTab" >
-         <property name="geometry" >
-          <rect>
-           <x>0</x>
-           <y>0</y>
-           <width>364</width>
-           <height>348</height>
-          </rect>
-         </property>
-         <attribute name="title" >
-          <string>Perform</string>
+        <widget class="QWidget" name="performTab">
+         <attribute name="title">
+          <string>Commands</string>
          </attribute>
-         <attribute name="toolTip" >
+         <attribute name="toolTip">
           <string>Configure automatic identification or misc. commands to be executed after connecting to a server</string>
          </attribute>
-         <layout class="QVBoxLayout" name="verticalLayout" >
+         <layout class="QVBoxLayout" name="verticalLayout">
           <item>
-           <widget class="QLabel" name="label" >
-            <property name="text" >
+           <widget class="QLabel" name="label">
+            <property name="text">
              <string>Commands to execute on connect:</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QTextEdit" name="performEdit" >
-            <property name="enabled" >
+           <widget class="QTextEdit" name="performEdit">
+            <property name="enabled">
              <bool>true</bool>
             </property>
-            <property name="toolTip" >
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="toolTip">
              <string>Specify a list of IRC commands to be executed upon connect.
 Note that Quassel IRC automatically rejoins channels, so /join will rarely be needed here!</string>
             </property>
-            <property name="lineWrapMode" >
+            <property name="lineWrapMode">
              <enum>QTextEdit::NoWrap</enum>
             </property>
            </widget>
           </item>
+         </layout>
+        </widget>
+        <widget class="QWidget" name="tab">
+         <attribute name="title">
+          <string>Connection</string>
+         </attribute>
+         <layout class="QVBoxLayout" name="verticalLayout_5">
           <item>
-           <widget class="QGroupBox" name="autoIdentify" >
-            <property name="enabled" >
+           <widget class="QGroupBox" name="autoReconnect">
+            <property name="enabled">
              <bool>true</bool>
             </property>
-            <property name="title" >
+            <property name="toolTip">
+             <string>Control automatic reconnect to the network</string>
+            </property>
+            <property name="title">
+             <string>Automatic Reconnect</string>
+            </property>
+            <property name="checkable">
+             <bool>true</bool>
+            </property>
+            <layout class="QVBoxLayout" name="_2">
+             <item>
+              <layout class="QGridLayout" name="_3">
+               <item row="0" column="0">
+                <widget class="QLabel" name="label_7">
+                 <property name="text">
+                  <string>Interval:</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="1">
+                <widget class="QSpinBox" name="reconnectInterval">
+                 <property name="suffix">
+                  <string> s</string>
+                 </property>
+                 <property name="minimum">
+                  <number>10</number>
+                 </property>
+                 <property name="maximum">
+                  <number>3600</number>
+                 </property>
+                 <property name="value">
+                  <number>30</number>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="0">
+                <widget class="QLabel" name="label_8">
+                 <property name="text">
+                  <string>Retries:</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="1">
+                <widget class="QSpinBox" name="reconnectRetries">
+                 <property name="minimum">
+                  <number>1</number>
+                 </property>
+                 <property name="maximum">
+                  <number>999</number>
+                 </property>
+                 <property name="value">
+                  <number>10</number>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="2">
+                <widget class="QCheckBox" name="unlimitedRetries">
+                 <property name="text">
+                  <string>Unlimited</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="3">
+                <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>
+              </layout>
+             </item>
+             <item>
+              <widget class="QCheckBox" name="rejoinOnReconnect">
+               <property name="enabled">
+                <bool>true</bool>
+               </property>
+               <property name="text">
+                <string>Rejoin all channels on reconnect</string>
+               </property>
+               <property name="checked">
+                <bool>true</bool>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item>
+           <spacer name="verticalSpacer_3">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>79</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </widget>
+        <widget class="QWidget" name="tab_2">
+         <attribute name="title">
+          <string>Auto Identify</string>
+         </attribute>
+         <layout class="QVBoxLayout" name="verticalLayout_4">
+          <item>
+           <widget class="QGroupBox" name="autoIdentify">
+            <property name="enabled">
+             <bool>true</bool>
+            </property>
+            <property name="title">
              <string>Auto Identify</string>
             </property>
-            <property name="checkable" >
+            <property name="checkable">
              <bool>true</bool>
             </property>
-            <property name="checked" >
+            <property name="checked">
              <bool>true</bool>
             </property>
-            <layout class="QGridLayout" name="gridLayout" >
-             <item row="0" column="1" >
-              <widget class="QLineEdit" name="autoIdentifyService" >
-               <property name="enabled" >
+            <layout class="QGridLayout" name="gridLayout">
+             <item row="0" column="1">
+              <widget class="QLineEdit" name="autoIdentifyService">
+               <property name="enabled">
                 <bool>true</bool>
                </property>
-               <property name="text" >
+               <property name="text">
                 <string>NickServ</string>
                </property>
               </widget>
              </item>
-             <item row="1" column="1" >
-              <widget class="QLineEdit" name="autoIdentifyPassword" >
-               <property name="enabled" >
+             <item row="1" column="1">
+              <widget class="QLineEdit" name="autoIdentifyPassword">
+               <property name="enabled">
                 <bool>true</bool>
                </property>
-               <property name="echoMode" >
+               <property name="echoMode">
                 <enum>QLineEdit::Password</enum>
                </property>
               </widget>
              </item>
-             <item row="0" column="0" >
-              <widget class="QLabel" name="label_2" >
-               <property name="text" >
+             <item row="0" column="0">
+              <widget class="QLabel" name="label_2">
+               <property name="text">
                 <string>Service:</string>
                </property>
               </widget>
              </item>
-             <item row="1" column="0" >
-              <widget class="QLabel" name="label_3" >
-               <property name="enabled" >
+             <item row="1" column="0">
+              <widget class="QLabel" name="label_3">
+               <property name="enabled">
                 <bool>true</bool>
                </property>
-               <property name="text" >
+               <property name="text">
                 <string>Password:</string>
                </property>
               </widget>
@@ -426,117 +547,183 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
             </layout>
            </widget>
           </item>
+          <item>
+           <widget class="QGroupBox" name="sasl">
+            <property name="enabled">
+             <bool>true</bool>
+            </property>
+            <property name="title">
+             <string>Use SASL Authentication</string>
+            </property>
+            <property name="checkable">
+             <bool>true</bool>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+            <layout class="QGridLayout" name="gridLayout_2">
+             <item row="0" column="1">
+              <widget class="QLineEdit" name="saslAccount">
+               <property name="enabled">
+                <bool>true</bool>
+               </property>
+               <property name="text">
+                <string/>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="1">
+              <widget class="QLineEdit" name="saslPassword">
+               <property name="enabled">
+                <bool>true</bool>
+               </property>
+               <property name="echoMode">
+                <enum>QLineEdit::Password</enum>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="0">
+              <widget class="QLabel" name="label_11">
+               <property name="enabled">
+                <bool>true</bool>
+               </property>
+               <property name="text">
+                <string>Password:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="0">
+              <widget class="QLabel" name="label_10">
+               <property name="enabled">
+                <bool>true</bool>
+               </property>
+               <property name="text">
+                <string>Account:</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item>
+           <spacer name="verticalSpacer_2">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>40</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
          </layout>
         </widget>
-        <widget class="QWidget" name="advancedTab" >
-         <property name="geometry" >
-          <rect>
-           <x>0</x>
-           <y>0</y>
-           <width>364</width>
-           <height>348</height>
-          </rect>
-         </property>
-         <attribute name="title" >
-          <string>Advanced</string>
+        <widget class="QWidget" name="advancedTab">
+         <attribute name="title">
+          <string>Encodings</string>
          </attribute>
-         <attribute name="toolTip" >
+         <attribute name="toolTip">
           <string>Configure advanced settings such as message encodings and automatic reconnect</string>
          </attribute>
-         <layout class="QVBoxLayout" >
+         <layout class="QVBoxLayout" name="verticalLayout_6">
           <item>
-           <widget class="QGroupBox" name="groupBox_3" >
-            <property name="enabled" >
+           <widget class="QGroupBox" name="useCustomEncodings">
+            <property name="enabled">
              <bool>true</bool>
             </property>
-            <property name="toolTip" >
+            <property name="toolTip">
              <string>Control encodings for in- and outgoing messages</string>
             </property>
-            <property name="title" >
-             <string>Encodings</string>
+            <property name="title">
+             <string>Use Custom Encodings</string>
             </property>
-            <layout class="QVBoxLayout" >
+            <property name="checkable">
+             <bool>true</bool>
+            </property>
+            <layout class="QVBoxLayout">
              <item>
-              <layout class="QGridLayout" >
-               <item row="0" column="0" >
-                <widget class="QLabel" name="label_4" >
-                 <property name="toolTip" >
+              <layout class="QGridLayout">
+               <item row="0" column="0">
+                <widget class="QLabel" name="label_4">
+                 <property name="toolTip">
                   <string>Specify which encoding your messages will be sent in.
 UTF-8 should be a sane choice for most networks.</string>
                  </property>
-                 <property name="text" >
+                 <property name="text">
                   <string>Send messages in:</string>
                  </property>
                 </widget>
                </item>
-               <item row="0" column="1" >
-                <widget class="QComboBox" name="sendEncoding" >
-                 <property name="enabled" >
-                  <bool>false</bool>
+               <item row="0" column="1">
+                <widget class="QComboBox" name="sendEncoding">
+                 <property name="enabled">
+                  <bool>true</bool>
                  </property>
-                 <property name="sizePolicy" >
-                  <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                    <horstretch>0</horstretch>
                    <verstretch>0</verstretch>
                   </sizepolicy>
                  </property>
-                 <property name="toolTip" >
+                 <property name="toolTip">
                   <string>Specify which encoding your messages will be sent in.
 UTF-8 should be a sane choice for most networks.</string>
                  </property>
-                 <property name="insertPolicy" >
+                 <property name="insertPolicy">
                   <enum>QComboBox::InsertAlphabetically</enum>
                  </property>
                 </widget>
                </item>
-               <item row="1" column="0" >
-                <widget class="QLabel" name="label_5" >
-                 <property name="toolTip" >
+               <item row="1" column="0">
+                <widget class="QLabel" name="label_5">
+                 <property name="toolTip">
                   <string>Incoming messages encoded in Utf8 will always be treated as such.
 This setting defines the encoding for messages that are not Utf8.</string>
                  </property>
-                 <property name="text" >
+                 <property name="text">
                   <string>Receive fallback:</string>
                  </property>
                 </widget>
                </item>
-               <item row="1" column="1" >
-                <widget class="QComboBox" name="recvEncoding" >
-                 <property name="enabled" >
-                  <bool>false</bool>
+               <item row="1" column="1">
+                <widget class="QComboBox" name="recvEncoding">
+                 <property name="enabled">
+                  <bool>true</bool>
                  </property>
-                 <property name="sizePolicy" >
-                  <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                    <horstretch>0</horstretch>
                    <verstretch>0</verstretch>
                   </sizepolicy>
                  </property>
-                 <property name="toolTip" >
+                 <property name="toolTip">
                   <string>Incoming messages encoded in Utf8 will always be treated as such.
 This setting defines the encoding for messages that are not Utf8.</string>
                  </property>
-                 <property name="insertPolicy" >
+                 <property name="insertPolicy">
                   <enum>QComboBox::InsertAlphabetically</enum>
                  </property>
                 </widget>
                </item>
-               <item row="2" column="0" >
-                <widget class="QLabel" name="label_9" >
-                 <property name="toolTip" >
+               <item row="2" column="0">
+                <widget class="QLabel" name="label_9">
+                 <property name="toolTip">
                   <string>This specifies how control messages, nicks and servernames are encoded.
 Unless you *really* know what you do, leave this as ISO-8859-1!</string>
                  </property>
-                 <property name="text" >
+                 <property name="text">
                   <string>Server encoding:</string>
                  </property>
                 </widget>
                </item>
-               <item row="2" column="1" >
-                <widget class="QComboBox" name="serverEncoding" >
-                 <property name="enabled" >
-                  <bool>false</bool>
+               <item row="2" column="1">
+                <widget class="QComboBox" name="serverEncoding">
+                 <property name="enabled">
+                  <bool>true</bool>
                  </property>
-                 <property name="toolTip" >
+                 <property name="toolTip">
                   <string>This specifies how control messages, nicks and servernames are encoded.
 Unless you *really* know what you do, leave this as ISO-8859-1!</string>
                  </property>
@@ -544,109 +731,21 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</string>
                </item>
               </layout>
              </item>
-             <item>
-              <widget class="QCheckBox" name="useDefaultEncodings" >
-               <property name="enabled" >
-                <bool>true</bool>
-               </property>
-               <property name="toolTip" >
-                <string>Use default settings for encodings (recommended)</string>
-               </property>
-               <property name="text" >
-                <string>Use defaults</string>
-               </property>
-               <property name="checked" >
-                <bool>true</bool>
-               </property>
-              </widget>
-             </item>
             </layout>
            </widget>
           </item>
           <item>
-           <widget class="QGroupBox" name="autoReconnect" >
-            <property name="enabled" >
-             <bool>true</bool>
+           <spacer name="verticalSpacer_4">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
             </property>
-            <property name="toolTip" >
-             <string>Control automatic reconnect to the network</string>
-            </property>
-            <property name="title" >
-             <string>Automatic Reconnect</string>
-            </property>
-            <property name="checkable" >
-             <bool>true</bool>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>79</height>
+             </size>
             </property>
-            <layout class="QVBoxLayout" >
-             <item>
-              <layout class="QGridLayout" >
-               <item row="0" column="0" >
-                <widget class="QLabel" name="label_7" >
-                 <property name="text" >
-                  <string>Interval:</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="1" >
-                <widget class="QSpinBox" name="reconnectInterval" >
-                 <property name="suffix" >
-                  <string> s</string>
-                 </property>
-                 <property name="minimum" >
-                  <number>10</number>
-                 </property>
-                 <property name="maximum" >
-                  <number>3600</number>
-                 </property>
-                 <property name="value" >
-                  <number>30</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="0" >
-                <widget class="QLabel" name="label_8" >
-                 <property name="text" >
-                  <string>Retries:</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="1" >
-                <widget class="QSpinBox" name="reconnectRetries" >
-                 <property name="minimum" >
-                  <number>1</number>
-                 </property>
-                 <property name="maximum" >
-                  <number>999</number>
-                 </property>
-                 <property name="value" >
-                  <number>10</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="2" >
-                <widget class="QCheckBox" name="unlimitedRetries" >
-                 <property name="text" >
-                  <string>Unlimited</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="rejoinOnReconnect" >
-               <property name="enabled" >
-                <bool>false</bool>
-               </property>
-               <property name="text" >
-                <string>Rejoin all channels on reconnect</string>
-               </property>
-               <property name="checked" >
-                <bool>true</bool>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
+           </spacer>
           </item>
          </layout>
         </widget>
@@ -657,9 +756,34 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</string>
    </item>
   </layout>
  </widget>
- <resources>
-  <include location="../../icons/icons.qrc" />
- </resources>
+ <tabstops>
+  <tabstop>networkList</tabstop>
+  <tabstop>renameNetwork</tabstop>
+  <tabstop>addNetwork</tabstop>
+  <tabstop>deleteNetwork</tabstop>
+  <tabstop>identityList</tabstop>
+  <tabstop>editIdentities</tabstop>
+  <tabstop>tabWidget</tabstop>
+  <tabstop>serverList</tabstop>
+  <tabstop>editServer</tabstop>
+  <tabstop>addServer</tabstop>
+  <tabstop>deleteServer</tabstop>
+  <tabstop>upServer</tabstop>
+  <tabstop>downServer</tabstop>
+  <tabstop>performEdit</tabstop>
+  <tabstop>autoReconnect</tabstop>
+  <tabstop>reconnectInterval</tabstop>
+  <tabstop>reconnectRetries</tabstop>
+  <tabstop>unlimitedRetries</tabstop>
+  <tabstop>rejoinOnReconnect</tabstop>
+  <tabstop>autoIdentifyService</tabstop>
+  <tabstop>autoIdentifyPassword</tabstop>
+  <tabstop>useCustomEncodings</tabstop>
+  <tabstop>sendEncoding</tabstop>
+  <tabstop>recvEncoding</tabstop>
+  <tabstop>serverEncoding</tabstop>
+ </tabstops>
+ <resources/>
  <connections>
   <connection>
    <sender>unlimitedRetries</sender>
@@ -667,61 +791,13 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</string>
    <receiver>reconnectRetries</receiver>
    <slot>setDisabled(bool)</slot>
    <hints>
-    <hint type="sourcelabel" >
-     <x>512</x>
-     <y>373</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>420</x>
-     <y>377</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>useDefaultEncodings</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>sendEncoding</receiver>
-   <slot>setDisabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>659</x>
-     <y>262</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>471</x>
-     <y>176</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>useDefaultEncodings</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>recvEncoding</receiver>
-   <slot>setDisabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>659</x>
-     <y>262</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>471</x>
-     <y>209</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>useDefaultEncodings</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>serverEncoding</receiver>
-   <slot>setDisabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>396</x>
-     <y>251</y>
+    <hint type="sourcelabel">
+     <x>317</x>
+     <y>331</y>
     </hint>
-    <hint type="destinationlabel" >
-     <x>456</x>
-     <y>230</y>
+    <hint type="destinationlabel">
+     <x>209</x>
+     <y>334</y>
     </hint>
    </hints>
   </connection>