X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fcolorsettingspage.ui;h=bc55f9559e4e1f9e7d37d53523e01b8f3aa5b8e4;hb=d37bdc91c5474603e1417c2cd9c40c02e1ad5ee6;hp=ab646f20072af9bfa9efa5b13c49cc3bedf4aa49;hpb=56c684447058042182308ad35cd9446601779016;p=quassel.git

diff --git a/src/qtui/settingspages/colorsettingspage.ui b/src/qtui/settingspages/colorsettingspage.ui
index ab646f20..bc55f955 100644
--- a/src/qtui/settingspages/colorsettingspage.ui
+++ b/src/qtui/settingspages/colorsettingspage.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>448</width>
-    <height>532</height>
+    <width>516</width>
+    <height>401</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -22,7 +22,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget" >
      <property name="currentIndex" >
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="bufferview" >
       <attribute name="title" >
@@ -53,6 +53,9 @@
             <property name="alignment" >
              <set>Qt::AlignCenter</set>
             </property>
+            <property name="NotInUse" stdset="0" >
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
           <item row="0" column="3" >
@@ -63,6 +66,9 @@
             <property name="alignment" >
              <set>Qt::AlignCenter</set>
             </property>
+            <property name="NotInUse" stdset="0" >
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
           <item row="1" column="0" >
@@ -99,6 +105,9 @@
             <property name="text" >
              <string/>
             </property>
+            <property name="NotInUse" stdset="0" >
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
           <item row="1" column="3" >
@@ -112,6 +121,9 @@
             <property name="text" >
              <string/>
             </property>
+            <property name="NotInUse" stdset="0" >
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
           <item row="2" column="0" >
@@ -136,6 +148,9 @@
             <property name="text" >
              <string/>
             </property>
+            <property name="NotInUse" stdset="0" >
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
           <item row="2" column="3" >
@@ -152,6 +167,9 @@
             <property name="text" >
              <string/>
             </property>
+            <property name="NotInUse" stdset="0" >
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
           <item row="3" column="0" >
@@ -176,6 +194,9 @@
             <property name="text" >
              <string/>
             </property>
+            <property name="NotInUse" stdset="0" >
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
           <item row="3" column="3" >
@@ -189,6 +210,9 @@
             <property name="text" >
              <string/>
             </property>
+            <property name="NotInUse" stdset="0" >
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
           <item row="4" column="0" >
@@ -213,6 +237,9 @@
             <property name="text" >
              <string/>
             </property>
+            <property name="NotInUse" stdset="0" >
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
           <item row="4" column="3" >
@@ -226,6 +253,9 @@
             <property name="text" >
              <string/>
             </property>
+            <property name="NotInUse" stdset="0" >
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
           <item row="5" column="0" >
@@ -250,6 +280,9 @@
             <property name="text" >
              <string/>
             </property>
+            <property name="NotInUse" stdset="0" >
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
           <item row="5" column="3" >
@@ -263,6 +296,9 @@
             <property name="text" >
              <string/>
             </property>
+            <property name="NotInUse" stdset="0" >
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
           <item row="6" column="0" >
@@ -270,7 +306,7 @@
             <property name="orientation" >
              <enum>Qt::Vertical</enum>
             </property>
-            <property name="sizeHint" >
+            <property name="sizeHint" stdset="0" >
              <size>
               <width>20</width>
               <height>40</height>
@@ -304,7 +340,7 @@
          <property name="orientation" >
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeHint" >
+         <property name="sizeHint" stdset="0" >
           <size>
            <width>318</width>
            <height>171</height>
@@ -363,6 +399,9 @@
              <property name="alignment" >
               <set>Qt::AlignCenter</set>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="1" column="0" >
@@ -387,6 +426,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="1" column="3" >
@@ -403,6 +445,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="2" column="0" >
@@ -427,6 +472,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="2" column="3" >
@@ -443,6 +491,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="3" column="0" >
@@ -467,6 +518,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="3" column="3" >
@@ -483,6 +537,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="4" column="0" >
@@ -507,6 +564,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="4" column="3" >
@@ -523,6 +583,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="5" column="0" colspan="2" >
@@ -547,7 +610,7 @@
              <property name="orientation" >
               <enum>Qt::Vertical</enum>
              </property>
-             <property name="sizeHint" >
+             <property name="sizeHint" stdset="0" >
               <size>
                <width>20</width>
                <height>40</height>
@@ -556,6 +619,28 @@
             </spacer>
            </item>
           </layout>
+          <zorder>label_44</zorder>
+          <zorder>label_45</zorder>
+          <zorder>label_7</zorder>
+          <zorder>label_20</zorder>
+          <zorder>errorMessageFG</zorder>
+          <zorder>errorMessageBG</zorder>
+          <zorder>errorMessageUseBG</zorder>
+          <zorder>label_18</zorder>
+          <zorder>noticeMessageFG</zorder>
+          <zorder>noticeMessageBG</zorder>
+          <zorder>noticeMessageUseBG</zorder>
+          <zorder>label_17</zorder>
+          <zorder>plainMessageFG</zorder>
+          <zorder>plainMessageBG</zorder>
+          <zorder>plainMessageUseBG</zorder>
+          <zorder>label_19</zorder>
+          <zorder>serverMessageFG</zorder>
+          <zorder>serverMessageBG</zorder>
+          <zorder>serverMessageUseBG</zorder>
+          <zorder>label_10</zorder>
+          <zorder>highlightColor</zorder>
+          <zorder>groupBox_5</zorder>
          </widget>
          <widget class="QWidget" name="tab_2" >
           <attribute name="title" >
@@ -580,6 +665,9 @@
              <property name="alignment" >
               <set>Qt::AlignCenter</set>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="0" column="3" >
@@ -590,6 +678,9 @@
              <property name="alignment" >
               <set>Qt::AlignCenter</set>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="1" column="0" >
@@ -614,6 +705,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="1" column="3" >
@@ -630,6 +724,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="2" column="0" >
@@ -654,6 +751,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="2" column="3" >
@@ -670,6 +770,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="3" column="0" >
@@ -694,6 +797,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="3" column="3" >
@@ -710,6 +816,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="4" column="0" >
@@ -734,6 +843,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="4" column="3" >
@@ -750,6 +862,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="5" column="0" >
@@ -774,6 +889,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="5" column="3" >
@@ -790,6 +908,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="6" column="0" >
@@ -814,6 +935,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="6" column="3" >
@@ -830,6 +954,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="7" column="0" >
@@ -854,6 +981,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="7" column="3" >
@@ -870,6 +1000,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
           </layout>
@@ -897,6 +1030,9 @@
              <property name="alignment" >
               <set>Qt::AlignCenter</set>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="0" column="3" >
@@ -907,6 +1043,9 @@
              <property name="alignment" >
               <set>Qt::AlignCenter</set>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="1" column="0" >
@@ -931,6 +1070,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="1" column="3" >
@@ -947,6 +1089,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="2" column="0" >
@@ -971,6 +1116,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="2" column="3" >
@@ -987,6 +1135,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="3" column="0" >
@@ -1011,6 +1162,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="3" column="3" >
@@ -1027,6 +1181,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="4" column="0" >
@@ -1051,6 +1208,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="4" column="3" >
@@ -1067,6 +1227,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="5" column="0" >
@@ -1091,6 +1254,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="5" column="3" >
@@ -1107,6 +1273,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="6" column="0" >
@@ -1131,6 +1300,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="6" column="3" >
@@ -1147,6 +1319,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="7" column="0" >
@@ -1171,6 +1346,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="7" column="3" >
@@ -1187,6 +1365,23 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
+            </widget>
+           </item>
+           <item row="8" column="0" >
+            <widget class="QLabel" name="label_11" >
+             <property name="text" >
+              <string>New Message Marker:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="8" column="1" >
+            <widget class="ColorButton" name="newMsgMarkerFG" >
+             <property name="text" >
+              <string/>
+             </property>
             </widget>
            </item>
           </layout>
@@ -1194,22 +1389,17 @@
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="groupBox_5" >
-         <property name="sizePolicy" >
-          <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
+        <spacer name="verticalSpacer" >
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
          </property>
-         <property name="title" >
-          <string>Preview:</string>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
          </property>
-         <layout class="QHBoxLayout" >
-          <item>
-           <widget class="QWidget" native="1" name="chatviewPreview" />
-          </item>
-         </layout>
-        </widget>
+        </spacer>
        </item>
       </layout>
      </widget>
@@ -1462,7 +1652,7 @@
          <property name="orientation" >
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeHint" >
+         <property name="sizeHint" stdset="0" >
           <size>
            <width>140</width>
            <height>291</height>
@@ -1477,7 +1667,7 @@
        <string>Nickview</string>
       </attribute>
       <layout class="QGridLayout" >
-       <item row="0" column="0" >
+       <item row="0" column="0" colspan="2" >
         <widget class="QGroupBox" name="groupBox_8" >
          <property name="title" >
           <string>Nick status:</string>
@@ -1501,6 +1691,9 @@
             <property name="alignment" >
              <set>Qt::AlignCenter</set>
             </property>
+            <property name="NotInUse" stdset="0" >
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
           <item row="0" column="3" >
@@ -1511,6 +1704,9 @@
             <property name="alignment" >
              <set>Qt::AlignCenter</set>
             </property>
+            <property name="NotInUse" stdset="0" >
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
           <item row="1" column="0" >
@@ -1535,6 +1731,9 @@
             <property name="text" >
              <string/>
             </property>
+            <property name="NotInUse" stdset="0" >
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
           <item row="1" column="3" >
@@ -1551,6 +1750,9 @@
             <property name="text" >
              <string/>
             </property>
+            <property name="NotInUse" stdset="0" >
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
           <item row="2" column="0" >
@@ -1575,6 +1777,9 @@
             <property name="text" >
              <string/>
             </property>
+            <property name="NotInUse" stdset="0" >
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
           <item row="2" column="3" >
@@ -1588,6 +1793,9 @@
             <property name="text" >
              <string/>
             </property>
+            <property name="NotInUse" stdset="0" >
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
           <item row="3" column="0" >
@@ -1595,7 +1803,7 @@
             <property name="orientation" >
              <enum>Qt::Vertical</enum>
             </property>
-            <property name="sizeHint" >
+            <property name="sizeHint" stdset="0" >
              <size>
               <width>20</width>
               <height>40</height>
@@ -1606,30 +1814,12 @@
          </layout>
         </widget>
        </item>
-       <item row="0" column="1" >
-        <widget class="QGroupBox" name="groupBox_9" >
-         <property name="title" >
-          <string>Preview:</string>
-         </property>
-         <layout class="QVBoxLayout" >
-          <item>
-           <widget class="QTreeWidget" name="nickviewPreview" >
-            <column>
-             <property name="text" >
-              <string>1</string>
-             </property>
-            </column>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
        <item row="1" column="0" colspan="2" >
         <spacer>
          <property name="orientation" >
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeHint" >
+         <property name="sizeHint" stdset="0" >
           <size>
            <width>261</width>
            <height>151</height>