X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fnetworkssettingspage.ui;h=cf7274c9f107e6b2ace4381d3e44b01185035b25;hp=eaf1a8c12d1c408fe7deb81e253717c1e8a3b509;hb=526eccc444029c5a0d80694487c3aec6707cbeda;hpb=dd2b40bf10da0309a72a9b2e8f49af752646fd92

diff --git a/src/qtui/settingspages/networkssettingspage.ui b/src/qtui/settingspages/networkssettingspage.ui
index eaf1a8c1..cf7274c9 100644
--- a/src/qtui/settingspages/networkssettingspage.ui
+++ b/src/qtui/settingspages/networkssettingspage.ui
@@ -5,32 +5,26 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>688</width>
-    <height>462</height>
+    <width>515</width>
+    <height>453</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Form</string>
   </property>
-  <layout class="QHBoxLayout" >
-   <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>
+  <layout class="QVBoxLayout" name="verticalLayout_7" >
    <item>
-    <layout class="QHBoxLayout" >
+    <layout class="QVBoxLayout" name="verticalLayout_3" >
      <item>
-      <layout class="QVBoxLayout" >
+      <layout class="QHBoxLayout" name="horizontalLayout" >
        <item>
         <widget class="QListWidget" name="networkList" >
+         <property name="sizePolicy" >
+          <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+           <horstretch>1</horstretch>
+           <verstretch>10</verstretch>
+          </sizepolicy>
+         </property>
          <property name="selectionBehavior" >
           <enum>QAbstractItemView::SelectRows</enum>
          </property>
@@ -40,7 +34,7 @@
         </widget>
        </item>
        <item>
-        <layout class="QVBoxLayout" >
+        <layout class="QVBoxLayout" name="verticalLayout_2" >
          <item>
           <widget class="QPushButton" name="renameNetwork" >
            <property name="sizePolicy" >
@@ -53,7 +47,8 @@
             <string>Re&amp;name...</string>
            </property>
            <property name="icon" >
-            <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/edit-rename.png</iconset>
+            <iconset>
+             <normaloff>:/16x16/actions/oxygen/16x16/actions/edit-rename.png</normaloff>:/16x16/actions/oxygen/16x16/actions/edit-rename.png</iconset>
            </property>
           </widget>
          </item>
@@ -69,7 +64,8 @@
             <string>&amp;Add...</string>
            </property>
            <property name="icon" >
-            <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/list-add.png</iconset>
+            <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>
@@ -91,16 +87,17 @@
             <string>De&amp;lete</string>
            </property>
            <property name="icon" >
-            <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/edit-delete.png</iconset>
+            <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>
+          <spacer name="verticalSpacer" >
            <property name="orientation" >
             <enum>Qt::Vertical</enum>
            </property>
-           <property name="sizeHint" >
+           <property name="sizeHint" stdset="0" >
             <size>
              <width>20</width>
              <height>40</height>
@@ -108,584 +105,600 @@
            </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/>
-           </property>
-          </widget>
-         </item>
         </layout>
        </item>
       </layout>
      </item>
-     <item>
-      <widget class="QGroupBox" name="detailsBox" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
-         <horstretch>10</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="title" >
-        <string>Network Details</string>
-       </property>
-       <layout class="QVBoxLayout" >
+    </layout>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="detailsBox" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+       <horstretch>10</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title" >
+      <string>Network Details</string>
+     </property>
+     <layout class="QVBoxLayout" >
+      <item>
+       <layout class="QHBoxLayout" >
         <item>
-         <layout class="QHBoxLayout" >
-          <item>
-           <widget class="QLabel" name="label_6" >
-            <property name="text" >
-             <string>Identity:</string>
-            </property>
-           </widget>
-          </item>
+         <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" >
+            <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" >
+         <bool>true</bool>
+        </property>
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="toolTip" >
+         <string/>
+        </property>
+        <property name="currentIndex" >
+         <number>0</number>
+        </property>
+        <widget class="QWidget" name="serversTab" >
+         <property name="enabled" >
+          <bool>true</bool>
+         </property>
+         <attribute name="title" >
+          <string>Servers</string>
+         </attribute>
+         <attribute name="toolTip" >
+          <string>Manage servers for this network</string>
+         </attribute>
+         <layout class="QHBoxLayout" name="horizontalLayout_2" >
           <item>
-           <widget class="QComboBox" name="identityList" >
+           <widget class="QListWidget" name="serverList" >
             <property name="sizePolicy" >
-             <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
-              <horstretch>0</horstretch>
+             <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+              <horstretch>1</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
            </widget>
           </item>
-         </layout>
-        </item>
-        <item>
-         <widget class="QTabWidget" name="tabWidget" >
-          <property name="enabled" >
-           <bool>true</bool>
-          </property>
-          <property name="currentIndex" >
-           <number>2</number>
-          </property>
-          <widget class="QWidget" name="serversTab" >
-           <property name="enabled" >
-            <bool>true</bool>
-           </property>
-           <attribute name="title" >
-            <string>Servers</string>
-           </attribute>
+          <item>
            <layout class="QVBoxLayout" >
             <item>
-             <layout class="QVBoxLayout" >
-              <item>
-               <layout class="QHBoxLayout" >
-                <item>
-                 <widget class="QListWidget" name="serverList" >
-                  <property name="sizePolicy" >
-                   <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
-                    <horstretch>1</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <layout class="QVBoxLayout" >
-                  <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>
-                    </property>
-                    <property name="icon" >
-                     <iconset/>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QPushButton" name="addServer" >
-                    <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" >:/16x16/actions/oxygen/16x16/actions/list-add.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>
-                    </property>
-                    <property name="text" >
-                     <string>De&amp;lete</string>
-                    </property>
-                    <property name="icon" >
-                     <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/edit-delete.png</iconset>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <layout class="QHBoxLayout" >
-                    <property name="spacing" >
-                     <number>6</number>
-                    </property>
-                    <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>
-                     <spacer>
-                      <property name="orientation" >
-                       <enum>Qt::Horizontal</enum>
-                      </property>
-                      <property name="sizeHint" >
-                       <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" >:/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" >:/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" >
-                       <size>
-                        <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" >
-                     <size>
-                      <width>20</width>
-                      <height>40</height>
-                     </size>
-                    </property>
-                   </spacer>
-                  </item>
-                 </layout>
-                </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 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>
+              </property>
+              <property name="icon" >
+               <iconset>
+                <normaloff/>
+               </iconset>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QPushButton" name="addServer" >
+              <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>
+                <normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</iconset>
+              </property>
+             </widget>
             </item>
-           </layout>
-          </widget>
-          <widget class="QWidget" name="performTab" >
-           <attribute name="title" >
-            <string>Perform</string>
-           </attribute>
-           <layout class="QVBoxLayout" >
             <item>
-             <widget class="QLabel" name="label" >
+             <widget class="QPushButton" name="deleteServer" >
+              <property name="sizePolicy" >
+               <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
               <property name="text" >
-               <string>Commands to execute on connect:</string>
+               <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="QVBoxLayout" >
+             <layout class="QHBoxLayout" >
               <item>
-               <widget class="QTextEdit" name="performEdit" >
-                <property name="enabled" >
-                 <bool>true</bool>
+               <spacer>
+                <property name="orientation" >
+                 <enum>Qt::Horizontal</enum>
                 </property>
-                <property name="lineWrapMode" >
-                 <enum>QTextEdit::NoWrap</enum>
+                <property name="sizeHint" stdset="0" >
+                 <size>
+                  <width>0</width>
+                  <height>20</height>
+                 </size>
                 </property>
-               </widget>
+               </spacer>
               </item>
               <item>
-               <widget class="QGroupBox" name="autoIdentify" >
-                <property name="enabled" >
-                 <bool>true</bool>
+               <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>
+                  <normaloff>:/16x16/actions/oxygen/16x16/actions/go-up.png</normaloff>:/16x16/actions/oxygen/16x16/actions/go-up.png</iconset>
                 </property>
-                <property name="title" >
-                 <string>Auto Identify</string>
+               </widget>
+              </item>
+              <item>
+               <widget class="QToolButton" name="downServer" >
+                <property name="toolTip" >
+                 <string>Move downwards in list</string>
                 </property>
-                <property name="checkable" >
-                 <bool>true</bool>
+                <property name="text" >
+                 <string>...</string>
                 </property>
-                <property name="checked" >
-                 <bool>true</bool>
+                <property name="icon" >
+                 <iconset>
+                  <normaloff>:/16x16/actions/oxygen/16x16/actions/go-down.png</normaloff>:/16x16/actions/oxygen/16x16/actions/go-down.png</iconset>
                 </property>
-                <layout class="QVBoxLayout" >
-                 <item>
-                  <layout class="QGridLayout" >
-                   <item row="0" column="0" >
-                    <widget class="QLabel" name="label_2" >
-                     <property name="text" >
-                      <string>Service:</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="0" column="1" >
-                    <widget class="QLineEdit" name="autoIdentifyService" >
-                     <property name="enabled" >
-                      <bool>true</bool>
-                     </property>
-                     <property name="text" >
-                      <string>NickServ</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="1" column="0" >
-                    <widget class="QLabel" name="label_3" >
-                     <property name="enabled" >
-                      <bool>true</bool>
-                     </property>
-                     <property name="text" >
-                      <string>Password:</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="1" column="1" >
-                    <widget class="QLineEdit" name="autoIdentifyPassword" >
-                     <property name="enabled" >
-                      <bool>true</bool>
-                     </property>
-                     <property name="echoMode" >
-                      <enum>QLineEdit::Password</enum>
-                     </property>
-                    </widget>
-                   </item>
-                  </layout>
-                 </item>
-                </layout>
                </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>
-           </layout>
-          </widget>
-          <widget class="QWidget" name="tab" >
-           <attribute name="title" >
-            <string>Advanced</string>
-           </attribute>
-           <layout class="QVBoxLayout" >
             <item>
-             <widget class="QGroupBox" name="groupBox_3" >
-              <property name="enabled" >
-               <bool>true</bool>
+             <spacer>
+              <property name="orientation" >
+               <enum>Qt::Vertical</enum>
               </property>
-              <property name="title" >
-               <string>Network Encoding</string>
+              <property name="sizeHint" stdset="0" >
+               <size>
+                <width>20</width>
+                <height>40</height>
+               </size>
               </property>
-              <layout class="QVBoxLayout" >
-               <item>
-                <layout class="QHBoxLayout" >
-                 <item>
-                  <layout class="QGridLayout" >
-                   <item row="0" column="0" >
-                    <widget class="QLabel" name="label_4" >
-                     <property name="text" >
-                      <string>Sending:</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="0" column="1" >
-                    <widget class="QComboBox" name="sendEncoding" >
-                     <property name="enabled" >
-                      <bool>false</bool>
-                     </property>
-                     <property name="sizePolicy" >
-                      <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
-                       <horstretch>0</horstretch>
-                       <verstretch>0</verstretch>
-                      </sizepolicy>
-                     </property>
-                     <property name="insertPolicy" >
-                      <enum>QComboBox::InsertAlphabetically</enum>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="1" column="0" >
-                    <widget class="QLabel" name="label_5" >
-                     <property name="text" >
-                      <string>Receiving:</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="1" column="1" >
-                    <widget class="QComboBox" name="recvEncoding" >
-                     <property name="enabled" >
-                      <bool>false</bool>
-                     </property>
-                     <property name="sizePolicy" >
-                      <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
-                       <horstretch>0</horstretch>
-                       <verstretch>0</verstretch>
-                      </sizepolicy>
-                     </property>
-                     <property name="insertPolicy" >
-                      <enum>QComboBox::InsertAlphabetically</enum>
-                     </property>
-                    </widget>
-                   </item>
-                  </layout>
-                 </item>
-                 <item>
-                  <spacer>
-                   <property name="orientation" >
-                    <enum>Qt::Horizontal</enum>
-                   </property>
-                   <property name="sizeHint" >
-                    <size>
-                     <width>40</width>
-                     <height>20</height>
-                    </size>
-                   </property>
-                  </spacer>
-                 </item>
-                </layout>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+        <widget class="QWidget" name="performTab" >
+         <attribute name="title" >
+          <string>Commands</string>
+         </attribute>
+         <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" >
+          <item>
+           <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" >
+             <bool>true</bool>
+            </property>
+            <property name="sizePolicy" >
+             <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+              <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" >
+             <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="autoReconnect" >
+            <property name="enabled" >
+             <bool>true</bool>
+            </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>
+            <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" >
+             <bool>true</bool>
+            </property>
+            <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" >
+                <bool>true</bool>
+               </property>
+               <property name="text" >
+                <string>NickServ</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="1" >
+              <widget class="QLineEdit" name="autoIdentifyPassword" >
+               <property name="enabled" >
+                <bool>true</bool>
+               </property>
+               <property name="echoMode" >
+                <enum>QLineEdit::Password</enum>
+               </property>
+              </widget>
+             </item>
+             <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" >
+                <bool>true</bool>
+               </property>
+               <property name="text" >
+                <string>Password:</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" >
+         <attribute name="title" >
+          <string>Encodings</string>
+         </attribute>
+         <attribute name="toolTip" >
+          <string>Configure advanced settings such as message encodings and automatic reconnect</string>
+         </attribute>
+         <layout class="QVBoxLayout" name="verticalLayout_6" >
+          <item>
+           <widget class="QGroupBox" name="useCustomEncodings" >
+            <property name="enabled" >
+             <bool>true</bool>
+            </property>
+            <property name="toolTip" >
+             <string>Control encodings for in- and outgoing messages</string>
+            </property>
+            <property name="title" >
+             <string>Use Custom Encodings</string>
+            </property>
+            <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" >
+                  <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" >
+                  <string>Send messages in:</string>
+                 </property>
+                </widget>
                </item>
-               <item>
-                <widget class="QCheckBox" name="useDefaultEncodings" >
+               <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" >
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                 <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" >
+                  <enum>QComboBox::InsertAlphabetically</enum>
+                 </property>
+                </widget>
+               </item>
+               <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" >
-                  <string>Use defaults</string>
+                  <string>Receive fallback:</string>
                  </property>
-                 <property name="checked" >
+                </widget>
+               </item>
+               <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" >
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                 <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" >
+                  <enum>QComboBox::InsertAlphabetically</enum>
+                 </property>
                 </widget>
                </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="autoReconnect" >
-              <property name="enabled" >
-               <bool>true</bool>
-              </property>
-              <property name="title" >
-               <string>Automatic Reconnect</string>
-              </property>
-              <property name="checkable" >
-               <bool>true</bool>
-              </property>
-              <layout class="QVBoxLayout" >
-               <item>
-                <layout class="QHBoxLayout" >
-                 <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>
-                  <spacer>
-                   <property name="orientation" >
-                    <enum>Qt::Horizontal</enum>
-                   </property>
-                   <property name="sizeHint" >
-                    <size>
-                     <width>40</width>
-                     <height>20</height>
-                    </size>
-                   </property>
-                  </spacer>
-                 </item>
-                </layout>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="rejoinOnReconnect" >
+               <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" >
-                  <string>Rejoin all channels on reconnect</string>
+                  <string>Server encoding:</string>
                  </property>
-                 <property name="checked" >
+                </widget>
+               </item>
+               <item row="2" column="1" >
+                <widget class="QComboBox" name="serverEncoding" >
+                 <property name="enabled" >
                   <bool>true</bool>
                  </property>
+                 <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>
                 </widget>
                </item>
               </layout>
-             </widget>
-            </item>
-            <item>
-             <spacer>
-              <property name="orientation" >
-               <enum>Qt::Vertical</enum>
-              </property>
-              <property name="sizeHint" >
-               <size>
-                <width>386</width>
-                <height>31</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </widget>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </item>
-    </layout>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item>
+           <spacer name="verticalSpacer_4" >
+            <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>
+      </item>
+     </layout>
+    </widget>
    </item>
   </layout>
  </widget>
- <resources>
-  <include location="../../icons/icons.qrc" />
- </resources>
+ <resources/>
  <connections>
-  <connection>
-   <sender>useDefaultEncodings</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>sendEncoding</receiver>
-   <slot>setDisabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>647</x>
-     <y>238</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>658</x>
-     <y>238</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>471</x>
-     <y>209</y>
-    </hint>
-   </hints>
-  </connection>
   <connection>
    <sender>unlimitedRetries</sender>
    <signal>toggled(bool)</signal>
@@ -693,12 +706,12 @@
    <slot>setDisabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>443</x>
-     <y>336</y>
+     <x>173</x>
+     <y>296</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>390</x>
-     <y>338</y>
+     <x>118</x>
+     <y>294</y>
     </hint>
    </hints>
   </connection>