X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fidentitiessettingspage.ui;h=d88df569366495ab39f6dfc268ff204caaaac747;hb=77397f5e999830077fee13187c6a1ee044d92545;hp=917d42f9fd45ceec82e1d3ae85fba4e5544de2e3;hpb=cedc301cd2f6dc644ddbf9fc9ae4fe605be2e9da;p=quassel.git

diff --git a/src/qtui/settingspages/identitiessettingspage.ui b/src/qtui/settingspages/identitiessettingspage.ui
index 917d42f9..d88df569 100644
--- a/src/qtui/settingspages/identitiessettingspage.ui
+++ b/src/qtui/settingspages/identitiessettingspage.ui
@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>602</width>
-    <height>386</height>
+    <height>450</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -36,7 +36,7 @@
           <string>...</string>
          </property>
          <property name="icon" >
-          <iconset resource="../../icons/icons.qrc" >
+          <iconset>
            <normaloff>:/22x22/actions/oxygen/22x22/actions/edit-rename.png</normaloff>:/22x22/actions/oxygen/22x22/actions/edit-rename.png</iconset>
          </property>
          <property name="iconSize" >
@@ -56,7 +56,7 @@
           <string>Add...</string>
          </property>
          <property name="icon" >
-          <iconset resource="../../icons/icons.qrc" >
+          <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" >
@@ -79,7 +79,7 @@
           <string>...</string>
          </property>
          <property name="icon" >
-          <iconset resource="../../icons/icons.qrc" >
+          <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" >
@@ -98,6 +98,14 @@
         <number>0</number>
        </property>
        <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>
@@ -165,7 +173,7 @@
                  <string>&amp;Add...</string>
                 </property>
                 <property name="icon" >
-                 <iconset resource="../../icons/icons.qrc" >
+                 <iconset>
                   <normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</iconset>
                 </property>
                 <property name="iconSize" >
@@ -191,7 +199,7 @@
                  <string>Remove</string>
                 </property>
                 <property name="icon" >
-                 <iconset resource="../../icons/icons.qrc" >
+                 <iconset>
                   <normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</normaloff>:/16x16/actions/oxygen/16x16/actions/edit-delete.png</iconset>
                 </property>
                </widget>
@@ -211,19 +219,13 @@
                  <string>Re&amp;name...</string>
                 </property>
                 <property name="icon" >
-                 <iconset resource="../../icons/icons.qrc" >
+                 <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" >
-                <property name="spacing" >
-                 <number>6</number>
-                </property>
-                <property name="margin" >
-                 <number>0</number>
-                </property>
                 <item>
                  <spacer>
                   <property name="orientation" >
@@ -246,7 +248,7 @@
                    <string>...</string>
                   </property>
                   <property name="icon" >
-                   <iconset resource="../../icons/icons.qrc" >
+                   <iconset>
                     <normaloff>:/16x16/actions/oxygen/16x16/actions/go-up.png</normaloff>:/16x16/actions/oxygen/16x16/actions/go-up.png</iconset>
                   </property>
                  </widget>
@@ -260,7 +262,7 @@
                    <string>...</string>
                   </property>
                   <property name="icon" >
-                   <iconset resource="../../icons/icons.qrc" >
+                   <iconset>
                     <normaloff>:/16x16/actions/oxygen/16x16/actions/go-down.png</normaloff>:/16x16/actions/oxygen/16x16/actions/go-down.png</iconset>
                   </property>
                  </widget>
@@ -301,6 +303,14 @@
         </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>
@@ -313,12 +323,6 @@
            <layout class="QVBoxLayout" name="verticalLayout_3" >
             <item>
              <layout class="QGridLayout" >
-              <property name="margin" >
-               <number>0</number>
-              </property>
-              <property name="spacing" >
-               <number>6</number>
-              </property>
               <item row="0" column="1" >
                <widget class="QLineEdit" name="awayNick" >
                 <property name="enabled" >
@@ -351,6 +355,9 @@
               </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>
@@ -426,12 +433,6 @@
            <layout class="QVBoxLayout" name="verticalLayout_2" >
             <item>
              <layout class="QHBoxLayout" >
-              <property name="spacing" >
-               <number>6</number>
-              </property>
-              <property name="margin" >
-               <number>0</number>
-              </property>
               <item>
                <widget class="QLabel" name="autoAwayLabel_1" >
                 <property name="text" >
@@ -466,12 +467,6 @@
             </item>
             <item>
              <layout class="QGridLayout" >
-              <property name="margin" >
-               <number>0</number>
-              </property>
-              <property name="spacing" >
-               <number>6</number>
-              </property>
               <item row="0" column="0" >
                <widget class="QCheckBox" name="autoAwayReasonEnabled" >
                 <property name="text" >
@@ -489,7 +484,6 @@
              </layout>
             </item>
            </layout>
-           <zorder>detachAwayEnabled</zorder>
           </widget>
          </item>
          <item>
@@ -508,6 +502,14 @@
         </layout>
        </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>
@@ -538,12 +540,6 @@
            <layout class="QVBoxLayout" >
             <item>
              <layout class="QGridLayout" >
-              <property name="margin" >
-               <number>0</number>
-              </property>
-              <property name="spacing" >
-               <number>6</number>
-              </property>
               <item row="1" column="0" >
                <widget class="QLabel" name="label_3" >
                 <property name="text" >
@@ -626,9 +622,7 @@
   <tabstop>partReason</tabstop>
   <tabstop>quitReason</tabstop>
  </tabstops>
- <resources>
-  <include location="../../icons/icons.qrc" />
- </resources>
+ <resources/>
  <connections>
   <connection>
    <sender>awayNickEnabled</sender>