X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fidentitiessettingspage.ui;h=d88df569366495ab39f6dfc268ff204caaaac747;hp=92f18b283e04a97eb173464892406645d3f7f369;hb=ff0f6746a6bf1b728d57352480e6cab0b98ac3a0;hpb=2e6dc76ae100a6b8e1b1661e422995f90083500e

diff --git a/src/qtui/settingspages/identitiessettingspage.ui b/src/qtui/settingspages/identitiessettingspage.ui
index 92f18b28..d88df569 100644
--- a/src/qtui/settingspages/identitiessettingspage.ui
+++ b/src/qtui/settingspages/identitiessettingspage.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>431</width>
-    <height>398</height>
+    <width>602</width>
+    <height>450</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -14,564 +14,615 @@
   </property>
   <layout class="QVBoxLayout" >
    <item>
-    <layout class="QHBoxLayout" >
+    <layout class="QVBoxLayout" >
      <item>
-      <widget class="QComboBox" name="identityList" >
-       <property name="insertPolicy" >
-        <enum>QComboBox::InsertAtBottom</enum>
-       </property>
-       <property name="duplicatesEnabled" >
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QToolButton" name="renameIdentity" >
-       <property name="text" >
-        <string>...</string>
-       </property>
-       <property name="icon" >
-        <iconset resource="../../icons/icons.qrc" >:/22x22/actions/oxygen/22x22/actions/edit-rename.png</iconset>
-       </property>
-       <property name="iconSize" >
-        <size>
-         <width>22</width>
-         <height>22</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QToolButton" name="addIdentity" >
-       <property name="text" >
-        <string>Add...</string>
-       </property>
-       <property name="icon" >
-        <iconset resource="../../icons/icons.qrc" >:/22x22/actions/oxygen/22x22/actions/list-add-user.png</iconset>
-       </property>
-       <property name="iconSize" >
-        <size>
-         <width>22</width>
-         <height>22</height>
-        </size>
-       </property>
-       <property name="toolButtonStyle" >
-        <enum>Qt::ToolButtonIconOnly</enum>
-       </property>
-      </widget>
+      <layout class="QHBoxLayout" >
+       <item>
+        <widget class="QComboBox" name="identityList" >
+         <property name="insertPolicy" >
+          <enum>QComboBox::InsertAtBottom</enum>
+         </property>
+         <property name="duplicatesEnabled" >
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QToolButton" name="renameIdentity" >
+         <property name="toolTip" >
+          <string>Rename Identity</string>
+         </property>
+         <property name="text" >
+          <string>...</string>
+         </property>
+         <property name="icon" >
+          <iconset>
+           <normaloff>:/22x22/actions/oxygen/22x22/actions/edit-rename.png</normaloff>:/22x22/actions/oxygen/22x22/actions/edit-rename.png</iconset>
+         </property>
+         <property name="iconSize" >
+          <size>
+           <width>22</width>
+           <height>22</height>
+          </size>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QToolButton" name="addIdentity" >
+         <property name="toolTip" >
+          <string>Add Identity</string>
+         </property>
+         <property name="text" >
+          <string>Add...</string>
+         </property>
+         <property name="icon" >
+          <iconset>
+           <normaloff>:/22x22/actions/oxygen/22x22/actions/list-add-user.png</normaloff>:/22x22/actions/oxygen/22x22/actions/list-add-user.png</iconset>
+         </property>
+         <property name="iconSize" >
+          <size>
+           <width>22</width>
+           <height>22</height>
+          </size>
+         </property>
+         <property name="toolButtonStyle" >
+          <enum>Qt::ToolButtonIconOnly</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QToolButton" name="deleteIdentity" >
+         <property name="toolTip" >
+          <string>Remove Identity</string>
+         </property>
+         <property name="text" >
+          <string>...</string>
+         </property>
+         <property name="icon" >
+          <iconset>
+           <normaloff>:/22x22/actions/oxygen/22x22/actions/list-remove-user.png</normaloff>:/22x22/actions/oxygen/22x22/actions/list-remove-user.png</iconset>
+         </property>
+         <property name="iconSize" >
+          <size>
+           <width>22</width>
+           <height>22</height>
+          </size>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
      <item>
-      <widget class="QToolButton" name="deleteIdentity" >
-       <property name="text" >
-        <string>...</string>
-       </property>
-       <property name="icon" >
-        <iconset resource="../../icons/icons.qrc" >:/22x22/actions/oxygen/22x22/actions/list-remove-user.png</iconset>
+      <widget class="QTabWidget" name="tabWidget" >
+       <property name="currentIndex" >
+        <number>0</number>
        </property>
-       <property name="iconSize" >
-        <size>
-         <width>22</width>
-         <height>22</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QTabWidget" name="tabWidget" >
-     <property name="currentIndex" >
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="generalTab" >
-      <attribute name="title" >
-       <string>General</string>
-      </attribute>
-      <layout class="QVBoxLayout" >
-       <item>
-        <layout class="QHBoxLayout" >
+       <widget class="QWidget" name="generalTab" >
+        <property name="geometry" >
+         <rect>
+          <x>0</x>
+          <y>0</y>
+          <width>570</width>
+          <height>355</height>
+         </rect>
+        </property>
+        <attribute name="title" >
+         <string>General</string>
+        </attribute>
+        <layout class="QVBoxLayout" >
          <item>
-          <widget class="QLabel" name="label" >
-           <property name="text" >
-            <string>Real Name:</string>
-           </property>
-          </widget>
+          <layout class="QHBoxLayout" >
+           <item>
+            <widget class="QLabel" name="label" >
+             <property name="text" >
+              <string>Real Name:</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLineEdit" name="realName" >
+             <property name="whatsThis" >
+              <string>The "Real Name" is shown in /whois.</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
          </item>
          <item>
-          <widget class="QLineEdit" name="realName" />
-         </item>
-        </layout>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="groupBox" >
-         <property name="title" >
-          <string>Nicknames</string>
-         </property>
-         <layout class="QHBoxLayout" >
-          <item>
-           <widget class="QListWidget" name="nicknameList" >
-            <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="addNick" >
-              <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>
-              <property name="iconSize" >
-               <size>
-                <width>16</width>
-                <height>16</height>
-               </size>
-              </property>
-             </widget>
-            </item>
+          <widget class="QGroupBox" name="groupBox" >
+           <property name="title" >
+            <string>Nicknames</string>
+           </property>
+           <layout class="QHBoxLayout" >
             <item>
-             <widget class="QPushButton" name="deleteNick" >
+             <widget class="QListWidget" name="nicknameList" >
               <property name="sizePolicy" >
-               <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
-                <horstretch>0</horstretch>
+               <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+                <horstretch>1</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 name="showDropIndicator" stdset="0" >
+               <bool>true</bool>
               </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QPushButton" name="renameNick" >
-              <property name="sizePolicy" >
-               <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
+              <property name="dragEnabled" >
+               <bool>false</bool>
               </property>
-              <property name="text" >
-               <string>Re&amp;name...</string>
+              <property name="dragDropMode" >
+               <enum>QAbstractItemView::NoDragDrop</enum>
               </property>
-              <property name="icon" >
-               <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/edit-rename.png</iconset>
+              <property name="selectionBehavior" >
+               <enum>QAbstractItemView::SelectRows</enum>
               </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>
+             <layout class="QVBoxLayout" >
               <item>
-               <spacer>
-                <property name="orientation" >
-                 <enum>Qt::Horizontal</enum>
+               <widget class="QPushButton" name="addNick" >
+                <property name="sizePolicy" >
+                 <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="toolTip" >
+                 <string>Add Nickname</string>
+                </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="sizeHint" >
+                <property name="iconSize" >
                  <size>
-                  <width>0</width>
-                  <height>20</height>
+                  <width>16</width>
+                  <height>16</height>
                  </size>
                 </property>
-               </spacer>
+               </widget>
               </item>
               <item>
-               <widget class="QToolButton" name="upNick" >
+               <widget class="QPushButton" name="deleteNick" >
+                <property name="sizePolicy" >
+                 <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
                 <property name="toolTip" >
-                 <string>Move upwards in list</string>
+                 <string>Remove Nickname</string>
                 </property>
                 <property name="text" >
-                 <string>...</string>
+                 <string>Remove</string>
                 </property>
                 <property name="icon" >
-                 <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/go-up.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>
-               <widget class="QToolButton" name="downNick" >
+               <widget class="QPushButton" name="renameNick" >
+                <property name="sizePolicy" >
+                 <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
                 <property name="toolTip" >
-                 <string>Move downwards in list</string>
+                 <string>Rename Identity</string>
                 </property>
                 <property name="text" >
-                 <string>...</string>
+                 <string>Re&amp;name...</string>
                 </property>
                 <property name="icon" >
-                 <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/go-down.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>
+              <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="nickUp" >
+                  <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>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QToolButton" name="nickDown" >
+                  <property name="toolTip" >
+                   <string>Move downwards in list</string>
+                  </property>
+                  <property name="text" >
+                   <string>...</string>
+                  </property>
+                  <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>
+                 <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::Horizontal</enum>
+                 <enum>Qt::Vertical</enum>
                 </property>
-                <property name="sizeHint" >
+                <property name="sizeHint" stdset="0" >
                  <size>
-                  <width>0</width>
-                  <height>20</height>
+                  <width>124</width>
+                  <height>76</height>
                  </size>
                 </property>
                </spacer>
               </item>
              </layout>
             </item>
+           </layout>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+       <widget class="QWidget" name="awayTab" >
+        <property name="geometry" >
+         <rect>
+          <x>0</x>
+          <y>0</y>
+          <width>570</width>
+          <height>355</height>
+         </rect>
+        </property>
+        <attribute name="title" >
+         <string>A&amp;way</string>
+        </attribute>
+        <layout class="QVBoxLayout" name="verticalLayout_4" >
+         <item>
+          <widget class="QGroupBox" name="groupBox_2" >
+           <property name="title" >
+            <string>Default Away Settings</string>
+           </property>
+           <layout class="QVBoxLayout" name="verticalLayout_3" >
             <item>
-             <spacer>
-              <property name="orientation" >
-               <enum>Qt::Vertical</enum>
-              </property>
-              <property name="sizeHint" >
-               <size>
-                <width>124</width>
-                <height>76</height>
-               </size>
-              </property>
-             </spacer>
+             <layout class="QGridLayout" >
+              <item row="0" column="1" >
+               <widget class="QLineEdit" name="awayNick" >
+                <property name="enabled" >
+                 <bool>false</bool>
+                </property>
+                <property name="toolTip" >
+                 <string>Nick to be used when being away</string>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="0" >
+               <widget class="QCheckBox" name="awayReasonEnabled" >
+                <property name="toolTip" >
+                 <string>Default away reason</string>
+                </property>
+                <property name="text" >
+                 <string>Away Reason</string>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="1" >
+               <widget class="QLineEdit" name="awayReason" >
+                <property name="enabled" >
+                 <bool>false</bool>
+                </property>
+                <property name="toolTip" >
+                 <string>Default away reason</string>
+                </property>
+               </widget>
+              </item>
+              <item row="0" column="0" >
+               <widget class="QCheckBox" name="awayNickEnabled" >
+                <property name="enabled" >
+                 <bool>false</bool>
+                </property>
+                <property name="toolTip" >
+                 <string>Nick to be used when being away</string>
+                </property>
+                <property name="text" >
+                 <string>Away Nick</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
             </item>
            </layout>
-          </item>
-         </layout>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="awayTab" >
-      <attribute name="title" >
-       <string>A&amp;way</string>
-      </attribute>
-      <layout class="QVBoxLayout" >
-       <item>
-        <layout class="QGridLayout" >
-         <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>
-         <property name="horizontalSpacing" >
-          <number>6</number>
-         </property>
-         <property name="verticalSpacing" >
-          <number>6</number>
-         </property>
-         <item row="0" column="1" >
-          <widget class="QLineEdit" name="awayNick" >
-           <property name="enabled" >
-            <bool>false</bool>
-           </property>
           </widget>
          </item>
-         <item row="1" column="0" >
-          <widget class="QCheckBox" name="awayReasonEnabled" >
-           <property name="text" >
-            <string>Away Reason</string>
+         <item>
+          <widget class="QGroupBox" name="detachAwayEnabled" >
+           <property name="toolTip" >
+            <string>Set away when all clients have detached from the core</string>
+           </property>
+           <property name="title" >
+            <string>Away On Detach</string>
+           </property>
+           <property name="checkable" >
+            <bool>true</bool>
+           </property>
+           <property name="checked" >
+            <bool>false</bool>
            </property>
+           <layout class="QVBoxLayout" name="verticalLayout" >
+            <item>
+             <layout class="QHBoxLayout" name="horizontalLayout" >
+              <item>
+               <widget class="QCheckBox" name="detachAwayReasonEnabled" >
+                <property name="toolTip" >
+                 <string>Override default away reason for auto-away on detach</string>
+                </property>
+                <property name="text" >
+                 <string>Away Reason</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLineEdit" name="detachAwayReason" >
+                <property name="enabled" >
+                 <bool>false</bool>
+                </property>
+                <property name="toolTip" >
+                 <string>Override default away reason for auto-away on detach</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+           </layout>
           </widget>
          </item>
-         <item row="1" column="1" >
-          <widget class="QLineEdit" name="awayReason" >
+         <item>
+          <widget class="QGroupBox" name="autoAwayEnabled" >
            <property name="enabled" >
             <bool>false</bool>
            </property>
-          </widget>
-         </item>
-         <item row="2" column="0" >
-          <widget class="QCheckBox" name="returnMessageEnabled" >
-           <property name="text" >
-            <string>Return Message</string>
+           <property name="toolTip" >
+            <string>Not implemented yet</string>
            </property>
-          </widget>
-         </item>
-         <item row="2" column="1" >
-          <widget class="QLineEdit" name="returnMessage" >
-           <property name="enabled" >
+           <property name="title" >
+            <string>Away On Idle</string>
+           </property>
+           <property name="checkable" >
+            <bool>true</bool>
+           </property>
+           <property name="checked" >
             <bool>false</bool>
            </property>
+           <layout class="QVBoxLayout" name="verticalLayout_2" >
+            <item>
+             <layout class="QHBoxLayout" >
+              <item>
+               <widget class="QLabel" name="autoAwayLabel_1" >
+                <property name="text" >
+                 <string>Set away after</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QSpinBox" name="autoAwayTime" />
+              </item>
+              <item>
+               <widget class="QLabel" name="autoAwayLabel_2" >
+                <property name="text" >
+                 <string>minutes of being idle</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <spacer>
+                <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>
+             <layout class="QGridLayout" >
+              <item row="0" column="0" >
+               <widget class="QCheckBox" name="autoAwayReasonEnabled" >
+                <property name="text" >
+                 <string>Away Reason</string>
+                </property>
+               </widget>
+              </item>
+              <item row="0" column="1" >
+               <widget class="QLineEdit" name="autoAwayReason" >
+                <property name="enabled" >
+                 <bool>false</bool>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+           </layout>
           </widget>
          </item>
-         <item row="0" column="0" >
-          <widget class="QCheckBox" name="awayNickEnabled" >
-           <property name="text" >
-            <string>Away Nick</string>
+         <item>
+          <spacer>
+           <property name="orientation" >
+            <enum>Qt::Vertical</enum>
            </property>
-          </widget>
+           <property name="sizeHint" stdset="0" >
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
          </item>
         </layout>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="autoAwayEnabled" >
-         <property name="title" >
-          <string>Auto Away</string>
-         </property>
-         <property name="checkable" >
-          <bool>true</bool>
-         </property>
-         <property name="checked" >
-          <bool>false</bool>
-         </property>
-         <layout class="QVBoxLayout" >
-          <property name="spacing" >
-           <number>6</number>
-          </property>
-          <property name="leftMargin" >
-           <number>8</number>
-          </property>
-          <property name="topMargin" >
-           <number>8</number>
-          </property>
-          <property name="rightMargin" >
-           <number>8</number>
-          </property>
-          <property name="bottomMargin" >
-           <number>8</number>
-          </property>
-          <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>
-             <widget class="QLabel" name="autoAwayLabel_1" >
-              <property name="text" >
-               <string>Auto away after</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QSpinBox" name="autoAwayTime" />
-            </item>
-            <item>
-             <widget class="QLabel" name="autoAwayLabel_2" >
-              <property name="text" >
-               <string>minutes</string>
-              </property>
-             </widget>
-            </item>
+       </widget>
+       <widget class="QWidget" name="advancedTab" >
+        <property name="geometry" >
+         <rect>
+          <x>0</x>
+          <y>0</y>
+          <width>570</width>
+          <height>355</height>
+         </rect>
+        </property>
+        <attribute name="title" >
+         <string>Advanced</string>
+        </attribute>
+        <layout class="QVBoxLayout" >
+         <item>
+          <layout class="QHBoxLayout" >
+           <item>
+            <widget class="QLabel" name="label_2" >
+             <property name="text" >
+              <string>Ident:</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLineEdit" name="ident" >
+             <property name="whatsThis" >
+              <string>The "ident" is part of your hostmask and, together with your host, uniquely identifies you within the IRC network.</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <widget class="QGroupBox" name="groupBox_3" >
+           <property name="title" >
+            <string>Messages</string>
+           </property>
+           <layout class="QVBoxLayout" >
             <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>
-           <layout class="QGridLayout" >
-            <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>
-            <property name="horizontalSpacing" >
-             <number>6</number>
-            </property>
-            <property name="verticalSpacing" >
-             <number>6</number>
-            </property>
-            <item row="1" column="0" >
-             <widget class="QCheckBox" name="autoReturnMessageEnabled" >
-              <property name="text" >
-               <string>Return Message</string>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="0" >
-             <widget class="QCheckBox" name="autoAwayReasonEnabled" >
-              <property name="text" >
-               <string>Away Reason</string>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="1" >
-             <widget class="QLineEdit" name="autoReturnMessage" />
-            </item>
-            <item row="0" column="1" >
-             <widget class="QLineEdit" name="autoAwayReason" />
+             <layout class="QGridLayout" >
+              <item row="1" column="0" >
+               <widget class="QLabel" name="label_3" >
+                <property name="text" >
+                 <string>Part Reason:</string>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="1" >
+               <widget class="QLineEdit" name="partReason" />
+              </item>
+              <item row="0" column="1" >
+               <widget class="QLineEdit" name="kickReason" />
+              </item>
+              <item row="2" column="0" >
+               <widget class="QLabel" name="label_5" >
+                <property name="text" >
+                 <string>Quit Reason:</string>
+                </property>
+               </widget>
+              </item>
+              <item row="2" column="1" >
+               <widget class="QLineEdit" name="quitReason" />
+              </item>
+              <item row="0" column="0" >
+               <widget class="QLabel" name="label_4" >
+                <property name="text" >
+                 <string>Kick Reason:</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
             </item>
            </layout>
-          </item>
-         </layout>
-        </widget>
-       </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>
-     </widget>
-     <widget class="QWidget" name="advancedTab" >
-      <attribute name="title" >
-       <string>Advanced</string>
-      </attribute>
-      <layout class="QVBoxLayout" >
-       <item>
-        <layout class="QHBoxLayout" >
-         <item>
-          <widget class="QLabel" name="label_2" >
-           <property name="text" >
-            <string>Ident:</string>
-           </property>
           </widget>
          </item>
          <item>
-          <widget class="QLineEdit" name="ident" />
+          <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="QGroupBox" name="groupBox_3" >
-         <property name="title" >
-          <string>Messages</string>
-         </property>
-         <layout class="QVBoxLayout" >
-          <item>
-           <layout class="QGridLayout" >
-            <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>
-            <property name="horizontalSpacing" >
-             <number>6</number>
-            </property>
-            <property name="verticalSpacing" >
-             <number>6</number>
-            </property>
-            <item row="1" column="0" >
-             <widget class="QLabel" name="label_3" >
-              <property name="text" >
-               <string>Part Reason:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="1" >
-             <widget class="QLineEdit" name="partReason" />
-            </item>
-            <item row="0" column="1" >
-             <widget class="QLineEdit" name="kickReason" />
-            </item>
-            <item row="2" column="0" >
-             <widget class="QLabel" name="label_5" >
-              <property name="text" >
-               <string>Quit Reason:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="1" >
-             <widget class="QLineEdit" name="quitReason" />
-            </item>
-            <item row="0" column="0" >
-             <widget class="QLabel" name="label_4" >
-              <property name="text" >
-               <string>Kick Reason:</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-         </layout>
-        </widget>
-       </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>
-     </widget>
-    </widget>
+       </widget>
+      </widget>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>
- <resources>
-  <include location="../../icons/icons.qrc" />
- </resources>
+ <tabstops>
+  <tabstop>identityList</tabstop>
+  <tabstop>renameIdentity</tabstop>
+  <tabstop>addIdentity</tabstop>
+  <tabstop>deleteIdentity</tabstop>
+  <tabstop>tabWidget</tabstop>
+  <tabstop>realName</tabstop>
+  <tabstop>nicknameList</tabstop>
+  <tabstop>addNick</tabstop>
+  <tabstop>deleteNick</tabstop>
+  <tabstop>renameNick</tabstop>
+  <tabstop>nickUp</tabstop>
+  <tabstop>nickDown</tabstop>
+  <tabstop>awayNick</tabstop>
+  <tabstop>awayReasonEnabled</tabstop>
+  <tabstop>awayReason</tabstop>
+  <tabstop>awayNickEnabled</tabstop>
+  <tabstop>autoAwayEnabled</tabstop>
+  <tabstop>autoAwayTime</tabstop>
+  <tabstop>autoAwayReasonEnabled</tabstop>
+  <tabstop>autoAwayReason</tabstop>
+  <tabstop>ident</tabstop>
+  <tabstop>kickReason</tabstop>
+  <tabstop>partReason</tabstop>
+  <tabstop>quitReason</tabstop>
+ </tabstops>
+ <resources/>
  <connections>
   <connection>
    <sender>awayNickEnabled</sender>
@@ -580,12 +631,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>47</x>
-     <y>85</y>
+     <x>71</x>
+     <y>128</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>185</x>
-     <y>90</y>
+     <x>314</x>
+     <y>129</y>
     </hint>
    </hints>
   </connection>
@@ -596,28 +647,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>57</x>
-     <y>120</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>177</x>
-     <y>123</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>returnMessageEnabled</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>returnMessage</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>85</x>
-     <y>154</y>
+     <x>81</x>
+     <y>156</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>240</x>
-     <y>160</y>
+     <x>306</x>
+     <y>157</y>
     </hint>
    </hints>
   </connection>
@@ -628,28 +663,28 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>107</x>
-     <y>262</y>
+     <x>126</x>
+     <y>327</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>186</x>
-     <y>264</y>
+     <x>315</x>
+     <y>328</y>
     </hint>
    </hints>
   </connection>
   <connection>
-   <sender>autoReturnMessageEnabled</sender>
+   <sender>detachAwayReasonEnabled</sender>
    <signal>toggled(bool)</signal>
-   <receiver>autoReturnMessage</receiver>
+   <receiver>detachAwayReason</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>122</x>
-     <y>292</y>
+     <x>33</x>
+     <y>214</y>
     </hint>
     <hint type="destinationlabel" >
      <x>204</x>
-     <y>299</y>
+     <y>218</y>
     </hint>
    </hints>
   </connection>