X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fgeneralsettingspage.ui;h=45103dcdc0208d5d6712442cfd69226912e212ed;hb=1489728cd358f6bf7151bcdd87b9ea2cbdff7bec;hp=51cece6c743f74ada88c1a673d866afb95c0f16d;hpb=3ed7d3bb6e9123ff0aa77023b264a39d1f63bd90;p=quassel.git

diff --git a/src/qtui/settingspages/generalsettingspage.ui b/src/qtui/settingspages/generalsettingspage.ui
index 51cece6c..45103dcd 100644
--- a/src/qtui/settingspages/generalsettingspage.ui
+++ b/src/qtui/settingspages/generalsettingspage.ui
@@ -1,38 +1,32 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>GeneralSettingsPage</class>
- <widget class="QWidget" name="GeneralSettingsPage" >
-  <property name="geometry" >
+ <widget class="QWidget" name="GeneralSettingsPage">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>475</width>
-    <height>366</height>
+    <width>467</width>
+    <height>515</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
-    <widget class="QGroupBox" name="useSystemTrayIcon" >
-     <property name="title" >
-      <string>Use system tray icon:</string>
+    <widget class="QGroupBox" name="useSystemTrayIcon">
+     <property name="title">
+      <string>Show System Tray Icon</string>
      </property>
-     <property name="checkable" >
+     <property name="checkable">
       <bool>true</bool>
      </property>
-     <layout class="QVBoxLayout" >
+     <layout class="QVBoxLayout" name="_2">
       <item>
-       <widget class="QCheckBox" name="minimizeOnMinimize" >
-        <property name="text" >
-         <string>Minimize to tray on minimize button</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="minimizeOnClose" >
-        <property name="text" >
-         <string>Minimize to tray on close button</string>
+       <widget class="QCheckBox" name="minimizeOnClose">
+        <property name="text">
+         <string>Hide to tray on close button</string>
         </property>
        </widget>
       </item>
@@ -40,17 +34,17 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="macOnly" >
-     <property name="title" >
-      <string>Tray icon:</string>
+    <widget class="QGroupBox" name="macOnly">
+     <property name="title">
+      <string>Tray Icon</string>
      </property>
-     <layout class="QHBoxLayout" >
+     <layout class="QHBoxLayout" name="_3">
       <item>
-       <widget class="QCheckBox" name="showSystemTrayIcon" >
-        <property name="text" >
+       <widget class="QCheckBox" name="showSystemTrayIcon">
+        <property name="text">
          <string>Show system tray icon</string>
         </property>
-        <property name="checked" >
+        <property name="checked">
          <bool>true</bool>
         </property>
        </widget>
@@ -59,41 +53,134 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="groupBox" >
-     <property name="title" >
-      <string>Display user related messages:</string>
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Message Redirection</string>
      </property>
-     <layout class="QVBoxLayout" >
-      <item>
-       <widget class="QCheckBox" name="userMessagesInStatusBuffer" >
-        <property name="enabled" >
-         <bool>false</bool>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_3">
+        <property name="text">
+         <string>User Notices:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QCheckBox" name="userNoticesInDefaultBuffer">
+        <property name="enabled">
+         <bool>true</bool>
         </property>
-        <property name="text" >
-         <string>in status buffer</string>
+        <property name="text">
+         <string/>
         </property>
-        <property name="checked" >
+        <property name="checked">
          <bool>true</bool>
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QCheckBox" name="userMessagesInQueryBuffer" >
-        <property name="enabled" >
+      <item row="1" column="2">
+       <widget class="QCheckBox" name="userNoticesInStatusBuffer">
+        <property name="enabled">
+         <bool>true</bool>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="checked">
          <bool>false</bool>
         </property>
-        <property name="text" >
-         <string>in query buffer (if exists)</string>
+       </widget>
+      </item>
+      <item row="1" column="3">
+       <widget class="QCheckBox" name="userNoticesInCurrentBuffer">
+        <property name="enabled">
+         <bool>true</bool>
+        </property>
+        <property name="text">
+         <string/>
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QCheckBox" name="userMessagesInCurrentBuffer" >
-        <property name="enabled" >
-         <bool>false</bool>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_4">
+        <property name="text">
+         <string>Server Notices:</string>
         </property>
-        <property name="text" >
-         <string>in current buffer</string>
+       </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 Window</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3">
+       <widget class="QLabel" name="label_7">
+        <property name="text">
+         <string>Current Chat</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/>
         </property>
        </widget>
       </item>
@@ -101,14 +188,14 @@
     </widget>
    </item>
    <item>
-    <spacer>
-     <property name="orientation" >
+    <spacer name="verticalSpacer">
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" stdset="0">
       <size>
-       <width>457</width>
-       <height>51</height>
+       <width>20</width>
+       <height>40</height>
       </size>
      </property>
     </spacer>
@@ -116,38 +203,5 @@
   </layout>
  </widget>
  <resources/>
- <connections>
-  <connection>
-   <sender>showSystemTrayIcon</sender>
-   <signal>clicked(bool)</signal>
-   <receiver>useSystemTrayIcon</receiver>
-   <slot>setChecked(bool)</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>237</x>
-     <y>139</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>237</x>
-     <y>49</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>useSystemTrayIcon</sender>
-   <signal>clicked(bool)</signal>
-   <receiver>showSystemTrayIcon</receiver>
-   <slot>setChecked(bool)</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>237</x>
-     <y>49</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>237</x>
-     <y>139</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
+ <connections/>
 </ui>