X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fcolorsettingspage.ui;h=932225cde0a104c8f66fe59ca03cd8f2faa98212;hp=f8772542a57c1ae3b58c764ef6a5b5197a76b03a;hb=23ba965cc6d1d9918d6d1ff08a1051e22ef9052d;hpb=b3ec58929bead822048a25f87f6a0d699c490b7a

diff --git a/src/qtui/settingspages/colorsettingspage.ui b/src/qtui/settingspages/colorsettingspage.ui
index f8772542..932225cd 100644
--- a/src/qtui/settingspages/colorsettingspage.ui
+++ b/src/qtui/settingspages/colorsettingspage.ui
@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>517</width>
-    <height>532</height>
+    <height>436</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -30,7 +30,7 @@
         <x>0</x>
         <y>0</y>
         <width>487</width>
-        <height>485</height>
+        <height>389</height>
        </rect>
       </property>
       <attribute name="title" >
@@ -61,122 +61,39 @@
             <property name="alignment" >
              <set>Qt::AlignCenter</set>
             </property>
+            <property name="NotInUse" stdset="0" >
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
           <item row="0" column="3" >
-           <widget class="QLabel" name="label_3" >
+           <widget class="QLabel" name="bufferViewUseBgLabel" >
             <property name="text" >
              <string>Use BG</string>
             </property>
             <property name="alignment" >
              <set>Qt::AlignCenter</set>
             </property>
-           </widget>
-          </item>
-          <item row="1" column="0" >
-           <widget class="QLabel" name="label_43" >
-            <property name="text" >
-             <string>Default:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1" >
-           <widget class="ColorButton" name="noActivityFG" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Maximum" hsizetype="Maximum" >
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text" >
-             <string/>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="2" >
-           <widget class="ColorButton" name="noActivityBG" >
-            <property name="enabled" >
-             <bool>false</bool>
-            </property>
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Maximum" hsizetype="Maximum" >
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text" >
-             <string/>
+            <property name="NotInUse" stdset="0" >
+             <bool>true</bool>
             </property>
            </widget>
           </item>
-          <item row="1" column="3" >
-           <widget class="QCheckBox" name="noActivityUseBG" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text" >
-             <string/>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0" >
-           <widget class="QLabel" name="label_42" >
-            <property name="text" >
-             <string>Inactive:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1" >
-           <widget class="ColorButton" name="inactiveActivityFG" >
-            <property name="text" >
-             <string/>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="2" >
-           <widget class="ColorButton" name="inactiveActivityBG" >
-            <property name="enabled" >
-             <bool>false</bool>
-            </property>
-            <property name="text" >
-             <string/>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="3" >
-           <widget class="QCheckBox" name="inactiveActivityUseBG" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="layoutDirection" >
-             <enum>Qt::LeftToRight</enum>
-            </property>
-            <property name="text" >
-             <string/>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="0" >
+          <item row="1" column="0" >
            <widget class="QLabel" name="label_39" >
             <property name="text" >
              <string>Highlight:</string>
             </property>
            </widget>
           </item>
-          <item row="3" column="1" >
+          <item row="1" column="1" >
            <widget class="ColorButton" name="highlightActivityFG" >
             <property name="text" >
              <string/>
             </property>
            </widget>
           </item>
-          <item row="3" column="2" >
+          <item row="1" column="2" >
            <widget class="ColorButton" name="highlightActivityBG" >
             <property name="enabled" >
              <bool>false</bool>
@@ -184,9 +101,12 @@
             <property name="text" >
              <string/>
             </property>
+            <property name="NotInUse" stdset="0" >
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
-          <item row="3" column="3" >
+          <item row="1" column="3" >
            <widget class="QCheckBox" name="highlightActivityUseBG" >
             <property name="sizePolicy" >
              <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
@@ -197,23 +117,26 @@
             <property name="text" >
              <string/>
             </property>
+            <property name="NotInUse" stdset="0" >
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
-          <item row="4" column="0" >
+          <item row="2" column="0" >
            <widget class="QLabel" name="label_40" >
             <property name="text" >
              <string>New Message:</string>
             </property>
            </widget>
           </item>
-          <item row="4" column="1" >
+          <item row="2" column="1" >
            <widget class="ColorButton" name="newMessageActivityFG" >
             <property name="text" >
              <string/>
             </property>
            </widget>
           </item>
-          <item row="4" column="2" >
+          <item row="2" column="2" >
            <widget class="ColorButton" name="newMessageActivityBG" >
             <property name="enabled" >
              <bool>false</bool>
@@ -221,9 +144,12 @@
             <property name="text" >
              <string/>
             </property>
+            <property name="NotInUse" stdset="0" >
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
-          <item row="4" column="3" >
+          <item row="2" column="3" >
            <widget class="QCheckBox" name="newMessageActivityUseBG" >
             <property name="sizePolicy" >
              <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
@@ -234,23 +160,26 @@
             <property name="text" >
              <string/>
             </property>
+            <property name="NotInUse" stdset="0" >
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
-          <item row="5" column="0" >
+          <item row="3" column="0" >
            <widget class="QLabel" name="label_41" >
             <property name="text" >
              <string>Other Activity:</string>
             </property>
            </widget>
           </item>
-          <item row="5" column="1" >
+          <item row="3" column="1" >
            <widget class="ColorButton" name="otherActivityFG" >
             <property name="text" >
              <string/>
             </property>
            </widget>
           </item>
-          <item row="5" column="2" >
+          <item row="3" column="2" >
            <widget class="ColorButton" name="otherActivityBG" >
             <property name="enabled" >
              <bool>false</bool>
@@ -258,9 +187,12 @@
             <property name="text" >
              <string/>
             </property>
+            <property name="NotInUse" stdset="0" >
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
-          <item row="5" column="3" >
+          <item row="3" column="3" >
            <widget class="QCheckBox" name="otherActivityUseBG" >
             <property name="sizePolicy" >
              <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
@@ -271,9 +203,12 @@
             <property name="text" >
              <string/>
             </property>
+            <property name="NotInUse" stdset="0" >
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
-          <item row="6" column="0" >
+          <item row="4" column="0" >
            <spacer>
             <property name="orientation" >
              <enum>Qt::Vertical</enum>
@@ -328,7 +263,7 @@
         <x>0</x>
         <y>0</y>
         <width>487</width>
-        <height>485</height>
+        <height>389</height>
        </rect>
       </property>
       <attribute name="title" >
@@ -387,6 +322,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" >
@@ -411,6 +349,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="1" column="3" >
@@ -427,6 +368,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="2" column="0" >
@@ -451,6 +395,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="2" column="3" >
@@ -467,6 +414,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="3" column="0" >
@@ -491,6 +441,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="3" column="3" >
@@ -507,6 +460,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="4" column="0" >
@@ -531,6 +487,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="4" column="3" >
@@ -547,6 +506,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="5" column="0" colspan="2" >
@@ -584,10 +546,10 @@
          <widget class="QWidget" name="tab_2" >
           <property name="geometry" >
            <rect>
-            <x>360</x>
-            <y>270</y>
-            <width>720</width>
-            <height>360</height>
+            <x>0</x>
+            <y>0</y>
+            <width>441</width>
+            <height>294</height>
            </rect>
           </property>
           <attribute name="title" >
@@ -612,6 +574,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" >
@@ -622,6 +587,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" >
@@ -646,6 +614,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="1" column="3" >
@@ -662,6 +633,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="2" column="0" >
@@ -686,6 +660,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="2" column="3" >
@@ -702,6 +679,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="3" column="0" >
@@ -726,6 +706,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="3" column="3" >
@@ -742,6 +725,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="4" column="0" >
@@ -766,6 +752,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="4" column="3" >
@@ -782,6 +771,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="5" column="0" >
@@ -806,6 +798,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="5" column="3" >
@@ -822,6 +817,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="6" column="0" >
@@ -846,6 +844,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="6" column="3" >
@@ -862,6 +863,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="7" column="0" >
@@ -886,6 +890,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="7" column="3" >
@@ -902,6 +909,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
           </layout>
@@ -909,10 +919,10 @@
          <widget class="QWidget" name="Seite_2" >
           <property name="geometry" >
            <rect>
-            <x>360</x>
-            <y>270</y>
-            <width>720</width>
-            <height>360</height>
+            <x>0</x>
+            <y>0</y>
+            <width>441</width>
+            <height>294</height>
            </rect>
           </property>
           <attribute name="title" >
@@ -937,6 +947,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" >
@@ -947,6 +960,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" >
@@ -971,6 +987,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="1" column="3" >
@@ -987,6 +1006,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="2" column="0" >
@@ -1011,6 +1033,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="2" column="3" >
@@ -1027,6 +1052,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="3" column="0" >
@@ -1051,6 +1079,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="3" column="3" >
@@ -1067,6 +1098,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="4" column="0" >
@@ -1091,6 +1125,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="4" column="3" >
@@ -1107,6 +1144,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="5" column="0" >
@@ -1131,6 +1171,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="5" column="3" >
@@ -1147,6 +1190,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="6" column="0" >
@@ -1171,6 +1217,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="6" column="3" >
@@ -1187,6 +1236,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="7" column="0" >
@@ -1211,6 +1263,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="7" column="3" >
@@ -1227,6 +1282,9 @@
              <property name="text" >
               <string/>
              </property>
+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item row="8" column="0" >
@@ -1247,24 +1305,6 @@
          </widget>
         </widget>
        </item>
-       <item>
-        <widget class="QGroupBox" name="groupBox_5" >
-         <property name="sizePolicy" >
-          <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="title" >
-          <string>Preview:</string>
-         </property>
-         <layout class="QHBoxLayout" >
-          <item>
-           <widget class="QWidget" native="1" name="chatviewPreview" />
-          </item>
-         </layout>
-        </widget>
-       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="Mirc" >
@@ -1273,7 +1313,7 @@
         <x>0</x>
         <y>0</y>
         <width>487</width>
-        <height>485</height>
+        <height>389</height>
        </rect>
       </property>
       <attribute name="title" >
@@ -1547,38 +1587,6 @@
  </customwidgets>
  <resources/>
  <connections>
-  <connection>
-   <sender>inactiveActivityUseBG</sender>
-   <signal>clicked(bool)</signal>
-   <receiver>inactiveActivityBG</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>249</x>
-     <y>111</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>197</x>
-     <y>111</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>noActivityUseBG</sender>
-   <signal>clicked(bool)</signal>
-   <receiver>noActivityBG</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>249</x>
-     <y>147</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>197</x>
-     <y>147</y>
-    </hint>
-   </hints>
-  </connection>
   <connection>
    <sender>highlightActivityUseBG</sender>
    <signal>clicked(bool)</signal>