Merging r726:730 from trunk to branches/0.3. This forwardports everything except...

[quassel.git] / src / qtui / settingspages / colorsettingspage.ui

diff --git a/src/qtui/settingspages/colorsettingspage.ui b/src/qtui/settingspages/colorsettingspage.ui
index 112fe37..ab646f2 100644 (file)
--- a/src/qtui/settingspages/colorsettingspage.ui
+++ b/src/qtui/settingspages/colorsettingspage.ui
@@ -22,7 +22,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget" >
      <property name="currentIndex" >
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="bufferview" >
       <attribute name="title" >
@@ -74,6 +74,12 @@
           </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>
@@ -84,6 +90,12 @@
             <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>
@@ -513,7 +525,24 @@
              </property>
             </widget>
            </item>
-           <item row="5" column="1" >
+           <item row="5" column="0" colspan="2" >
+            <widget class="QLabel" name="label_10" >
+             <property name="text" >
+              <string>Highlight Message:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="5" column="2" >
+            <widget class="ColorButton" name="highlightColor" >
+             <property name="enabled" >
+              <bool>true</bool>
+             </property>
+             <property name="text" >
+              <string/>
+             </property>
+            </widget>
+           </item>
+           <item row="6" column="1" >
             <spacer>
              <property name="orientation" >
               <enum>Qt::Vertical</enum>