X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fgeneralsettingspage.ui;h=4fce47f5148b3e421a8a918801c3b4675f7a52ab;hp=340faafa49352ece2e905cd910820108f8eee34b;hb=22fea756df3d68f8bc433d2540ac6e7400853d7b;hpb=b6745556187013f9ddb84abd26498c77a7db5999

diff --git a/src/qtui/settingspages/generalsettingspage.ui b/src/qtui/settingspages/generalsettingspage.ui
index 340faafa..4fce47f5 100644
--- a/src/qtui/settingspages/generalsettingspage.ui
+++ b/src/qtui/settingspages/generalsettingspage.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>475</width>
-    <height>366</height>
+    <width>453</width>
+    <height>632</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -39,14 +39,65 @@
      </layout>
     </widget>
    </item>
+   <item>
+    <widget class="QGroupBox" name="macOnly" >
+     <property name="title" >
+      <string>Tray icon:</string>
+     </property>
+     <layout class="QHBoxLayout" >
+      <item>
+       <widget class="QCheckBox" name="showSystemTrayIcon" >
+        <property name="text" >
+         <string>Show system tray icon</string>
+        </property>
+        <property name="checked" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_3" >
+     <property name="title" >
+      <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>
+        </property>
+        <property name="checked" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QCheckBox" name="displayPopupMessages" >
+        <property name="text" >
+         <string>Display pop-up messages</string>
+        </property>
+        <property name="checked" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item>
     <widget class="QGroupBox" name="groupBox" >
      <property name="title" >
-      <string>Display user related messages:</string>
+      <string>Display user related messages and private Notices:</string>
      </property>
      <layout class="QVBoxLayout" >
       <item>
        <widget class="QCheckBox" name="userMessagesInStatusBuffer" >
+        <property name="enabled" >
+         <bool>true</bool>
+        </property>
         <property name="text" >
          <string>in status buffer</string>
         </property>
@@ -57,13 +108,19 @@
       </item>
       <item>
        <widget class="QCheckBox" name="userMessagesInQueryBuffer" >
+        <property name="enabled" >
+         <bool>true</bool>
+        </property>
         <property name="text" >
-         <string> in query buffer (if exists)</string>
+         <string>in query buffer (if exists)</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QCheckBox" name="userMessagesInCurrentBuffer" >
+        <property name="enabled" >
+         <bool>true</bool>
+        </property>
         <property name="text" >
          <string>in current buffer</string>
         </property>
@@ -72,6 +129,32 @@
      </layout>
     </widget>
    </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_2" >
+     <property name="title" >
+      <string>Buffer view:</string>
+     </property>
+     <layout class="QVBoxLayout" >
+      <item>
+       <widget class="QCheckBox" name="displayTopicInTooltip" >
+        <property name="text" >
+         <string>Display topic in tooltip</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="mouseWheelChangesBuffers" >
+        <property name="text" >
+         <string>Mouse wheel changes displayed buffers</string>
+        </property>
+        <property name="checked" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item>
     <spacer>
      <property name="orientation" >