X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fgeneralsettingspage.ui;h=d35bce199e36d47b76dc63a1ad8f700af2ebcb7e;hp=e24ebd88093b5c225174a4294b0f18a14d165da1;hb=9d32e4eb35cecd82d936d2de7da7e7e7dc606667;hpb=8bcd653df36521cd30aed7ddebf7faa9783a48f1

diff --git a/src/qtui/settingspages/generalsettingspage.ui b/src/qtui/settingspages/generalsettingspage.ui
index e24ebd88..d35bce19 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>467</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -16,12 +16,12 @@
    <item>
     <widget class="QGroupBox" name="useSystemTrayIcon" >
      <property name="title" >
-      <string>Use system tray icon:</string>
+      <string>Show System Tray Icon</string>
      </property>
      <property name="checkable" >
       <bool>true</bool>
      </property>
-     <layout class="QVBoxLayout" >
+     <layout class="QVBoxLayout" name="_2" >
       <item>
        <widget class="QCheckBox" name="minimizeOnMinimize" >
         <property name="text" >
@@ -42,9 +42,9 @@
    <item>
     <widget class="QGroupBox" name="macOnly" >
      <property name="title" >
-      <string>Tray icon:</string>
+      <string>Tray Icon</string>
      </property>
-     <layout class="QHBoxLayout" >
+     <layout class="QHBoxLayout" name="_3" >
       <item>
        <widget class="QCheckBox" name="showSystemTrayIcon" >
         <property name="text" >
@@ -58,39 +58,10 @@
      </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 and private Notices:</string>
+      <string>Display User-Related Messages And Private Notices:</string>
      </property>
      <layout class="QVBoxLayout" >
       <item>
@@ -132,7 +103,7 @@
    <item>
     <widget class="QGroupBox" name="groupBox_2" >
      <property name="title" >
-      <string>Buffer view:</string>
+      <string>Buffer View</string>
      </property>
      <layout class="QVBoxLayout" >
       <item>
@@ -161,7 +132,7 @@
       <string>The suffix appended to a nick on completion via TAB. Default is ": "</string>
      </property>
      <property name="title" >
-      <string>Input Line:</string>
+      <string>Input Line</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout" >
       <item>