X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fgeneralsettingspage.ui;h=8155465796b1d1299104764e091ff1b6508c2859;hp=e24ebd88093b5c225174a4294b0f18a14d165da1;hb=65d88a7f8c37e549a259aba85c52b7916b89a17d;hpb=85c2a2a853e4f4d4488344672d47c2aa77172f69

diff --git a/src/qtui/settingspages/generalsettingspage.ui b/src/qtui/settingspages/generalsettingspage.ui
index e24ebd88..81554657 100644
--- a/src/qtui/settingspages/generalsettingspage.ui
+++ b/src/qtui/settingspages/generalsettingspage.ui
@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>453</width>
-    <height>632</height>
+    <height>800</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -64,20 +64,93 @@
       <string>User Notification:</string>
      </property>
      <layout class="QGridLayout" >
-      <item row="0" column="0" >
-       <widget class="QCheckBox" name="animateTrayIcon" >
-        <property name="text" >
-         <string>Animate tray icon</string>
+      <item row="2" column="0" >
+       <widget class="QGroupBox" name="bubbleBox" >
+        <property name="title" >
+         <string>Bubble</string>
         </property>
-        <property name="checked" >
+        <property name="checkable" >
          <bool>true</bool>
         </property>
+        <layout class="QVBoxLayout" name="verticalLayout" />
+       </widget>
+      </item>
+      <item row="2" column="1" >
+       <widget class="QGroupBox" name="desktopBox" >
+        <property name="title" >
+         <string>Desktop</string>
+        </property>
+        <property name="checkable" >
+         <bool>true</bool>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout_2" >
+         <item>
+          <widget class="QFrame" name="desktopFrame" >
+           <property name="frameShape" >
+            <enum>QFrame::StyledPanel</enum>
+           </property>
+           <property name="frameShadow" >
+            <enum>QFrame::Raised</enum>
+           </property>
+           <layout class="QFormLayout" name="formLayout" >
+            <item row="0" column="0" >
+             <widget class="QLabel" name="timeout_label" >
+              <property name="text" >
+               <string>Timeout</string>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="1" >
+             <widget class="QSpinBox" name="timeout_value" >
+              <property name="minimum" >
+               <number>-1</number>
+              </property>
+              <property name="maximum" >
+               <number>100000</number>
+              </property>
+              <property name="value" >
+               <number>5000</number>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="0" >
+             <widget class="QLabel" name="x_label" >
+              <property name="text" >
+               <string>X</string>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="0" >
+             <widget class="QLabel" name="y_label" >
+              <property name="text" >
+               <string>Y</string>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="1" >
+             <widget class="QSpinBox" name="x_value" >
+              <property name="maximum" >
+               <number>10000</number>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="1" >
+             <widget class="QSpinBox" name="y_value" >
+              <property name="maximum" >
+               <number>10000</number>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+         </item>
+        </layout>
        </widget>
       </item>
       <item row="1" column="0" >
-       <widget class="QCheckBox" name="displayPopupMessages" >
+       <widget class="QCheckBox" name="animateTrayIcon" >
         <property name="text" >
-         <string>Display pop-up messages</string>
+         <string>Animate tray icon</string>
         </property>
         <property name="checked" >
          <bool>true</bool>