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

diff --git a/src/qtui/settingspages/generalsettingspage.ui b/src/qtui/settingspages/generalsettingspage.ui
index e24ebd88..9d52833a 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>453</width>
-    <height>632</height>
+    <width>434</width>
+    <height>495</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" >
@@ -59,70 +59,134 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="groupBox_3" >
+    <widget class="QGroupBox" name="groupBox" >
      <property name="title" >
-      <string>User Notification:</string>
+      <string>Message Redirection</string>
      </property>
-     <layout class="QGridLayout" >
-      <item row="0" column="0" >
-       <widget class="QCheckBox" name="animateTrayIcon" >
+     <layout class="QGridLayout" name="gridLayout_2" >
+      <item row="1" column="0" >
+       <widget class="QLabel" name="label_3" >
         <property name="text" >
-         <string>Animate tray icon</string>
-        </property>
-        <property name="checked" >
-         <bool>true</bool>
+         <string>User Notices:</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="0" >
-       <widget class="QCheckBox" name="displayPopupMessages" >
+      <item row="1" column="1" >
+       <widget class="QCheckBox" name="userNoticesInDefaultBuffer" >
+        <property name="enabled" >
+         <bool>true</bool>
+        </property>
         <property name="text" >
-         <string>Display pop-up messages</string>
+         <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>
-     </property>
-     <layout class="QVBoxLayout" >
-      <item>
-       <widget class="QCheckBox" name="userMessagesInStatusBuffer" >
+      <item row="1" column="2" >
+       <widget class="QCheckBox" name="userNoticesInStatusBuffer" >
         <property name="enabled" >
          <bool>true</bool>
         </property>
         <property name="text" >
-         <string>in status buffer</string>
+         <string/>
         </property>
         <property name="checked" >
-         <bool>true</bool>
+         <bool>false</bool>
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QCheckBox" name="userMessagesInQueryBuffer" >
+      <item row="1" column="3" >
+       <widget class="QCheckBox" name="userNoticesInCurrentBuffer" >
         <property name="enabled" >
          <bool>true</bool>
         </property>
         <property name="text" >
-         <string>in query buffer (if exists)</string>
+         <string/>
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QCheckBox" name="userMessagesInCurrentBuffer" >
-        <property name="enabled" >
+      <item row="2" column="0" >
+       <widget class="QLabel" name="label_4" >
+        <property name="text" >
+         <string>Server Notices:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" >
+       <widget class="QCheckBox" name="serverNoticesInDefaultBuffer" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QLabel" name="label_5" >
+        <property name="text" >
+         <string>Default Target</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QLabel" name="label_6" >
+        <property name="text" >
+         <string>Status Buffer</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3" >
+       <widget class="QLabel" name="label_7" >
+        <property name="text" >
+         <string>Current Buffer</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="label_8" >
+        <property name="text" >
+         <string>Errors:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2" >
+       <widget class="QCheckBox" name="serverNoticesInStatusBuffer" >
+        <property name="text" >
+         <string/>
+        </property>
+        <property name="checked" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="3" >
+       <widget class="QCheckBox" name="serverNoticesInCurrentBuffer" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" >
+       <widget class="QCheckBox" name="errorMsgsInDefaultBuffer" >
+        <property name="text" >
+         <string/>
+        </property>
+        <property name="checked" >
          <bool>true</bool>
         </property>
+       </widget>
+      </item>
+      <item row="3" column="2" >
+       <widget class="QCheckBox" name="errorMsgsInStatusBuffer" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="3" >
+       <widget class="QCheckBox" name="errorMsgsInCurrentBuffer" >
         <property name="text" >
-         <string>in current buffer</string>
+         <string/>
         </property>
        </widget>
       </item>
@@ -132,7 +196,7 @@
    <item>
     <widget class="QGroupBox" name="groupBox_2" >
      <property name="title" >
-      <string>Buffer view:</string>
+      <string>Buffer View</string>
      </property>
      <layout class="QVBoxLayout" >
       <item>
@@ -148,7 +212,7 @@
          <string>Mouse wheel changes displayed buffers</string>
         </property>
         <property name="checked" >
-         <bool>true</bool>
+         <bool>false</bool>
         </property>
        </widget>
       </item>
@@ -161,7 +225,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>
@@ -205,7 +269,7 @@
     </widget>
    </item>
    <item>
-    <spacer>
+    <spacer name="verticalSpacer" >
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
      </property>