X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fidentitiessettingspage.ui;h=9f61bbabe51421ea702c6d894e2960df1a9ba4ef;hp=19bb198ffb5cf0624cd99f15da95c1aa32444a83;hb=061528786d1dac1d1bf4904c86b71d95270dfd37;hpb=c6bc07febff322910675a1eb60c44f6be209a934

diff --git a/src/qtui/settingspages/identitiessettingspage.ui b/src/qtui/settingspages/identitiessettingspage.ui
index 19bb198f..9f61bbab 100644
--- a/src/qtui/settingspages/identitiessettingspage.ui
+++ b/src/qtui/settingspages/identitiessettingspage.ui
@@ -5,26 +5,37 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>422</width>
-    <height>380</height>
+    <width>430</width>
+    <height>492</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string/>
   </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QVBoxLayout" name="verticalLayout_13" >
    <item>
     <layout class="QHBoxLayout" >
      <item>
-      <widget class="QComboBox" name="comboBox" />
+      <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="addIdentity" >
+      <widget class="QToolButton" name="renameIdentity" >
+       <property name="toolTip" >
+        <string>Rename Identity</string>
+       </property>
        <property name="text" >
-        <string>Add...</string>
+        <string>...</string>
        </property>
        <property name="icon" >
-        <iconset resource="../../icons/icons.qrc" >:/22x22/actions/oxygen/22x22/actions/list-add-user.png</iconset>
+        <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>
@@ -32,18 +43,19 @@
          <height>22</height>
         </size>
        </property>
-       <property name="toolButtonStyle" >
-        <enum>Qt::ToolButtonIconOnly</enum>
-       </property>
       </widget>
      </item>
      <item>
-      <widget class="QToolButton" name="renameIdentity" >
+      <widget class="QToolButton" name="addIdentity" >
+       <property name="toolTip" >
+        <string>Add Identity</string>
+       </property>
        <property name="text" >
-        <string>...</string>
+        <string>Add...</string>
        </property>
        <property name="icon" >
-        <iconset resource="../../icons/icons.qrc" >:/22x22/actions/oxygen/22x22/actions/user-properties.png</iconset>
+        <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>
@@ -51,15 +63,22 @@
          <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 resource="../../icons/icons.qrc" >:/22x22/actions/oxygen/22x22/actions/list-remove-user.png</iconset>
+        <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>
@@ -77,6 +96,14 @@
       <number>0</number>
      </property>
      <widget class="QWidget" name="generalTab" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>400</width>
+        <height>399</height>
+       </rect>
+      </property>
       <attribute name="title" >
        <string>General</string>
       </attribute>
@@ -91,7 +118,11 @@
           </widget>
          </item>
          <item>
-          <widget class="QLineEdit" name="realName" />
+          <widget class="QLineEdit" name="realName" >
+           <property name="whatsThis" >
+            <string>The "Real Name" is shown in /whois.</string>
+           </property>
+          </widget>
          </item>
         </layout>
        </item>
@@ -109,161 +140,140 @@
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
+            <property name="showDropIndicator" stdset="0" >
+             <bool>true</bool>
+            </property>
+            <property name="dragEnabled" >
+             <bool>false</bool>
+            </property>
+            <property name="dragDropMode" >
+             <enum>QAbstractItemView::NoDragDrop</enum>
+            </property>
+            <property name="selectionBehavior" >
+             <enum>QAbstractItemView::SelectRows</enum>
+            </property>
            </widget>
           </item>
           <item>
            <layout class="QVBoxLayout" >
             <item>
-             <layout class="QVBoxLayout" >
-              <property name="spacing" >
-               <number>6</number>
+             <widget class="QPushButton" name="addNick" >
+              <property name="sizePolicy" >
+               <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
               </property>
-              <property name="leftMargin" >
-               <number>0</number>
+              <property name="toolTip" >
+               <string>Add Nickname</string>
               </property>
-              <property name="topMargin" >
-               <number>0</number>
+              <property name="text" >
+               <string>&amp;Add...</string>
               </property>
-              <property name="rightMargin" >
-               <number>0</number>
+              <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="bottomMargin" >
-               <number>0</number>
+              <property name="iconSize" >
+               <size>
+                <width>16</width>
+                <height>16</height>
+               </size>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <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>Remove Nickname</string>
+              </property>
+              <property name="text" >
+               <string>Remove</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>
+             <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>Rename Identity</string>
+              </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>
+             <layout class="QHBoxLayout" >
               <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>
+               <spacer>
+                <property name="orientation" >
+                 <enum>Qt::Horizontal</enum>
                 </property>
-                <property name="iconSize" >
+                <property name="sizeHint" stdset="0" >
                  <size>
-                  <width>16</width>
-                  <height>16</height>
+                  <width>0</width>
+                  <height>20</height>
                  </size>
                 </property>
-               </widget>
+               </spacer>
               </item>
               <item>
-               <widget class="QPushButton" name="renameNick" >
-                <property name="sizePolicy" >
-                 <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
+               <widget class="QToolButton" name="nickUp" >
+                <property name="toolTip" >
+                 <string>Move upwards in list</string>
                 </property>
                 <property name="text" >
-                 <string>Re&amp;name...</string>
+                 <string>...</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/go-up.png</normaloff>:/16x16/actions/oxygen/16x16/actions/go-up.png</iconset>
                 </property>
                </widget>
               </item>
               <item>
-               <widget class="QPushButton" name="deleteNick" >
-                <property name="sizePolicy" >
-                 <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
+               <widget class="QToolButton" name="nickDown" >
+                <property name="toolTip" >
+                 <string>Move downwards in list</string>
                 </property>
                 <property name="text" >
-                 <string>De&amp;lete</string>
+                 <string>...</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/go-down.png</normaloff>:/16x16/actions/oxygen/16x16/actions/go-down.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="upNick" >
-                  <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="downNick" >
-                  <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>
+                 <enum>Qt::Horizontal</enum>
                 </property>
-                <property name="sizeHint" >
+                <property name="sizeHint" stdset="0" >
                  <size>
-                  <width>20</width>
-                  <height>0</height>
+                  <width>0</width>
+                  <height>20</height>
                  </size>
                 </property>
                </spacer>
@@ -275,10 +285,10 @@
               <property name="orientation" >
                <enum>Qt::Vertical</enum>
               </property>
-              <property name="sizeHint" >
+              <property name="sizeHint" stdset="0" >
                <size>
-                <width>20</width>
-                <height>40</height>
+                <width>124</width>
+                <height>76</height>
                </size>
               </property>
              </spacer>
@@ -291,66 +301,126 @@
       </layout>
      </widget>
      <widget class="QWidget" name="awayTab" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>400</width>
+        <height>399</height>
+       </rect>
+      </property>
       <attribute name="title" >
        <string>A&amp;way</string>
       </attribute>
-      <layout class="QVBoxLayout" >
+      <layout class="QVBoxLayout" name="verticalLayout_4" >
        <item>
-        <layout class="QGridLayout" >
-         <property name="leftMargin" >
-          <number>0</number>
-         </property>
-         <property name="topMargin" >
-          <number>0</number>
+        <widget class="QGroupBox" name="groupBox_2" >
+         <property name="title" >
+          <string>Default Away Settings</string>
          </property>
-         <property name="rightMargin" >
-          <number>0</number>
+         <layout class="QVBoxLayout" name="verticalLayout_3" >
+          <item>
+           <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>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="detachAwayEnabled" >
+         <property name="toolTip" >
+          <string>Set away when all clients have detached from the core</string>
          </property>
-         <property name="bottomMargin" >
-          <number>0</number>
+         <property name="title" >
+          <string>Away On Detach</string>
          </property>
-         <property name="horizontalSpacing" >
-          <number>6</number>
+         <property name="checkable" >
+          <bool>true</bool>
          </property>
-         <property name="verticalSpacing" >
-          <number>6</number>
+         <property name="checked" >
+          <bool>false</bool>
          </property>
-         <item row="0" column="1" >
-          <widget class="QLineEdit" name="awayNick" />
-         </item>
-         <item row="1" column="0" >
-          <widget class="QCheckBox" name="enableAwayReason" >
-           <property name="text" >
-            <string>Away Reason</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="1" >
-          <widget class="QLineEdit" name="awayReason" />
-         </item>
-         <item row="2" column="0" >
-          <widget class="QCheckBox" name="enableReturnMessage" >
-           <property name="text" >
-            <string>Return Message</string>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="1" >
-          <widget class="QLineEdit" name="returnMessage" />
-         </item>
-         <item row="0" column="0" >
-          <widget class="QCheckBox" name="enableAwayNick" >
-           <property name="text" >
-            <string>Away Nick</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
+         <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>
-        <widget class="QGroupBox" name="autoAway" >
+        <widget class="QGroupBox" name="autoAwayEnabled" >
+         <property name="enabled" >
+          <bool>false</bool>
+         </property>
+         <property name="toolTip" >
+          <string>Not implemented yet</string>
+         </property>
          <property name="title" >
-          <string>Auto Away</string>
+          <string>Away On Idle</string>
          </property>
          <property name="checkable" >
           <bool>true</bool>
@@ -358,43 +428,13 @@
          <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>
+         <layout class="QVBoxLayout" name="verticalLayout_2" >
           <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>
+               <string>Set away after</string>
               </property>
              </widget>
             </item>
@@ -404,7 +444,7 @@
             <item>
              <widget class="QLabel" name="autoAwayLabel_2" >
               <property name="text" >
-               <string>minutes</string>
+               <string>minutes of being idle</string>
               </property>
              </widget>
             </item>
@@ -413,7 +453,7 @@
               <property name="orientation" >
                <enum>Qt::Horizontal</enum>
               </property>
-              <property name="sizeHint" >
+              <property name="sizeHint" stdset="0" >
                <size>
                 <width>40</width>
                 <height>20</height>
@@ -425,43 +465,19 @@
           </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="enableAutoAwayReturn" >
-              <property name="text" >
-               <string>Return Message</string>
-              </property>
-             </widget>
-            </item>
             <item row="0" column="0" >
-             <widget class="QCheckBox" name="enableAutoAwayReason" >
+             <widget class="QCheckBox" name="autoAwayReasonEnabled" >
               <property name="text" >
                <string>Away Reason</string>
               </property>
              </widget>
             </item>
-            <item row="1" column="1" >
-             <widget class="QLineEdit" name="autoAwayReturn" />
-            </item>
             <item row="0" column="1" >
-             <widget class="QLineEdit" name="autoAwayReason" />
+             <widget class="QLineEdit" name="autoAwayReason" >
+              <property name="enabled" >
+               <bool>false</bool>
+              </property>
+             </widget>
             </item>
            </layout>
           </item>
@@ -473,7 +489,7 @@
          <property name="orientation" >
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeHint" >
+         <property name="sizeHint" stdset="0" >
           <size>
            <width>20</width>
            <height>40</height>
@@ -484,10 +500,18 @@
       </layout>
      </widget>
      <widget class="QWidget" name="advancedTab" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>400</width>
+        <height>399</height>
+       </rect>
+      </property>
       <attribute name="title" >
        <string>Advanced</string>
       </attribute>
-      <layout class="QVBoxLayout" >
+      <layout class="QVBoxLayout" name="verticalLayout_12" >
        <item>
         <layout class="QHBoxLayout" >
          <item>
@@ -498,7 +522,11 @@
           </widget>
          </item>
          <item>
-          <widget class="QLineEdit" name="ident" />
+          <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>
@@ -510,24 +538,6 @@
          <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" >
@@ -564,11 +574,305 @@
         </widget>
        </item>
        <item>
-        <spacer>
+        <widget class="QStackedWidget" name="keyAndCertSettings" >
+         <property name="styleSheet" >
+          <string notr="true" />
+         </property>
+         <property name="lineWidth" >
+          <number>0</number>
+         </property>
+         <property name="currentIndex" >
+          <number>0</number>
+         </property>
+         <widget class="QWidget" name="pageNoSsl" >
+          <layout class="QVBoxLayout" name="verticalLayout_8" >
+           <property name="margin" >
+            <number>0</number>
+           </property>
+           <item>
+            <widget class="QGroupBox" name="groupBox_6" >
+             <property name="title" >
+              <string/>
+             </property>
+             <layout class="QVBoxLayout" name="verticalLayout_9" >
+              <item>
+               <widget class="QLabel" name="label_8" >
+                <property name="text" >
+                 <string>You need an SSL Capable Client to edit your Cores SSL Key and Certificate</string>
+                </property>
+                <property name="alignment" >
+                 <set>Qt::AlignCenter</set>
+                </property>
+                <property name="wordWrap" >
+                 <bool>true</bool>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+         <widget class="QWidget" name="pageUnsecure" >
+          <layout class="QVBoxLayout" name="verticalLayout_7" >
+           <property name="margin" >
+            <number>0</number>
+           </property>
+           <item>
+            <widget class="QGroupBox" name="groupBox_5" >
+             <property name="title" >
+              <string/>
+             </property>
+             <layout class="QVBoxLayout" name="verticalLayout_6" >
+              <item>
+               <widget class="QLabel" name="label_7" >
+                <property name="text" >
+                 <string>Warning: you are not connected with a secured connection to the Quassel Core!
+Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificate!</string>
+                </property>
+                <property name="alignment" >
+                 <set>Qt::AlignCenter</set>
+                </property>
+                <property name="wordWrap" >
+                 <bool>true</bool>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <layout class="QHBoxLayout" name="horizontalLayout_2" >
+                <item>
+                 <spacer name="horizontalSpacer" >
+                  <property name="orientation" >
+                   <enum>Qt::Horizontal</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0" >
+                   <size>
+                    <width>40</width>
+                    <height>20</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+                <item>
+                 <widget class="QPushButton" name="continueUnsecured" >
+                  <property name="text" >
+                   <string>continue</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <spacer name="horizontalSpacer_3" >
+                  <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>
+             </layout>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+         <widget class="QWidget" name="pageEditSsl" >
+          <property name="geometry" >
+           <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>360</width>
+            <height>173</height>
+           </rect>
+          </property>
+          <layout class="QVBoxLayout" name="verticalLayout_11" >
+           <property name="spacing" >
+            <number>0</number>
+           </property>
+           <property name="margin" >
+            <number>0</number>
+           </property>
+           <item>
+            <widget class="QGroupBox" name="sslKeyGroupBox" >
+             <property name="styleSheet" >
+              <string notr="true" />
+             </property>
+             <property name="title" >
+              <string>Use SSL Key</string>
+             </property>
+             <property name="checkable" >
+              <bool>false</bool>
+             </property>
+             <property name="checked" >
+              <bool>false</bool>
+             </property>
+             <layout class="QVBoxLayout" name="verticalLayout_5" >
+              <item>
+               <layout class="QHBoxLayout" name="horizontalLayout_3" >
+                <item>
+                 <widget class="QLabel" name="label_6" >
+                  <property name="text" >
+                   <string>Key Type:</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QLabel" name="keyTypeLabel" >
+                  <property name="text" >
+                   <string>No Key loaded</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>
+                <item>
+                 <widget class="QPushButton" name="clearOrLoadKeyButton" >
+                  <property name="text" >
+                   <string>Load</string>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="sslCertGroupBox" >
+             <property name="title" >
+              <string>Use SSL Certificate</string>
+             </property>
+             <layout class="QHBoxLayout" name="horizontalLayout_6" >
+              <property name="spacing" >
+               <number>0</number>
+              </property>
+              <item>
+               <layout class="QVBoxLayout" name="verticalLayout_10" >
+                <property name="spacing" >
+                 <number>0</number>
+                </property>
+                <item>
+                 <layout class="QHBoxLayout" name="horizontalLayout_4" >
+                  <property name="spacing" >
+                   <number>8</number>
+                  </property>
+                  <item>
+                   <widget class="QLabel" name="label_9" >
+                    <property name="text" >
+                     <string>Organisation:</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QLabel" name="certOrgLabel" >
+                    <property name="text" >
+                     <string>No Certificate loaded</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <spacer name="horizontalSpacer_4" >
+                    <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="QHBoxLayout" name="horizontalLayout_5" >
+                  <property name="spacing" >
+                   <number>8</number>
+                  </property>
+                  <item>
+                   <widget class="QLabel" name="label_10" >
+                    <property name="text" >
+                     <string>CommonName:</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QLabel" name="certCNameLabel" >
+                    <property name="text" >
+                     <string>No Certificate loaded</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <spacer name="horizontalSpacer_5" >
+                    <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>
+               </layout>
+              </item>
+              <item>
+               <layout class="QVBoxLayout" name="verticalLayout_14" >
+                <item>
+                 <widget class="QPushButton" name="clearOrLoadCertButton" >
+                  <property name="text" >
+                   <string>Load</string>
+                  </property>
+                 </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>
+              </item>
+             </layout>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </widget>
+       </item>
+       <item>
+        <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>
@@ -582,8 +886,97 @@
    </item>
   </layout>
  </widget>
- <resources>
-  <include location="../../icons/icons.qrc" />
- </resources>
- <connections/>
+ <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>
+   <signal>toggled(bool)</signal>
+   <receiver>awayNick</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>71</x>
+     <y>128</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>314</x>
+     <y>129</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>awayReasonEnabled</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>awayReason</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>81</x>
+     <y>156</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>306</x>
+     <y>157</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>autoAwayReasonEnabled</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>autoAwayReason</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>157</x>
+     <y>382</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>454</x>
+     <y>382</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>detachAwayReasonEnabled</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>detachAwayReason</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>64</x>
+     <y>256</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>343</x>
+     <y>256</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>