From 74934cba48910e366d96e4e596e8676d8434fe24 Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete@nokia.com>
Date: Wed, 18 Mar 2009 17:29:19 +0100
Subject: Adding 2bpp support to qvfb

---
 tools/qvfb/config.ui    | 1655 ++++++++++++++++++++++-------------------------
 tools/qvfb/qvfb.cpp     |    3 +
 tools/qvfb/qvfbview.cpp |   61 ++
 3 files changed, 855 insertions(+), 864 deletions(-)

(limited to 'tools')

diff --git a/tools/qvfb/config.ui b/tools/qvfb/config.ui
index 7a45bfe0a4..ac91d3e4bf 100644
--- a/tools/qvfb/config.ui
+++ b/tools/qvfb/config.ui
@@ -1,4 +1,5 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <comment>*********************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
@@ -40,181 +41,145 @@
 **
 *********************************************************************</comment>
  <class>Config</class>
- <widget class="QDialog" name="Config" >
-  <property name="geometry" >
+ <widget class="QDialog" name="Config">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>600</width>
-    <height>650</height>
+    <height>665</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Configure</string>
   </property>
-  <property name="sizeGripEnabled" >
+  <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QVBoxLayout" >
-   <property name="spacing" >
+  <layout class="QVBoxLayout">
+   <property name="spacing">
     <number>6</number>
    </property>
-   <property name="leftMargin" >
-    <number>8</number>
-   </property>
-   <property name="topMargin" >
-    <number>8</number>
-   </property>
-   <property name="rightMargin" >
-    <number>8</number>
-   </property>
-   <property name="bottomMargin" >
+   <property name="margin">
     <number>8</number>
    </property>
    <item>
-    <layout class="QHBoxLayout" >
-     <property name="spacing" >
+    <layout class="QHBoxLayout">
+     <property name="spacing">
       <number>6</number>
      </property>
-     <property name="leftMargin" >
-      <number>0</number>
-     </property>
-     <property name="topMargin" >
-      <number>0</number>
-     </property>
-     <property name="rightMargin" >
-      <number>0</number>
-     </property>
-     <property name="bottomMargin" >
+     <property name="margin">
       <number>0</number>
      </property>
      <item>
-      <widget class="QGroupBox" name="ButtonGroup1" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+      <widget class="QGroupBox" name="ButtonGroup1">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="title" >
+       <property name="title">
         <string>Size</string>
        </property>
-       <layout class="QVBoxLayout" >
-        <property name="spacing" >
+       <layout class="QVBoxLayout">
+        <property name="spacing">
          <number>6</number>
         </property>
-        <property name="leftMargin" >
-         <number>11</number>
-        </property>
-        <property name="topMargin" >
-         <number>11</number>
-        </property>
-        <property name="rightMargin" >
-         <number>11</number>
-        </property>
-        <property name="bottomMargin" >
+        <property name="margin">
          <number>11</number>
         </property>
         <item>
-         <widget class="QRadioButton" name="size_176_220" >
-          <property name="text" >
-           <string>176x220 "SmartPhone"</string>
+         <widget class="QRadioButton" name="size_176_220">
+          <property name="text">
+           <string>176x220 &quot;SmartPhone&quot;</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="size_240_320" >
-          <property name="text" >
-           <string>240x320 "PDA"</string>
+         <widget class="QRadioButton" name="size_240_320">
+          <property name="text">
+           <string>240x320 &quot;PDA&quot;</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="size_320_240" >
-          <property name="text" >
-           <string>320x240 "TV" / "QVGA"</string>
+         <widget class="QRadioButton" name="size_320_240">
+          <property name="text">
+           <string>320x240 &quot;TV&quot; / &quot;QVGA&quot;</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="size_640_480" >
-          <property name="text" >
-           <string>640x480 "VGA"</string>
+         <widget class="QRadioButton" name="size_640_480">
+          <property name="text">
+           <string>640x480 &quot;VGA&quot;</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="size_800_600" >
-          <property name="text" >
+         <widget class="QRadioButton" name="size_800_600">
+          <property name="text">
            <string>800x600</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="size_1024_768" >
-          <property name="text" >
+         <widget class="QRadioButton" name="size_1024_768">
+          <property name="text">
            <string>1024x768</string>
           </property>
          </widget>
         </item>
         <item>
-         <layout class="QHBoxLayout" >
-          <property name="spacing" >
+         <layout class="QHBoxLayout">
+          <property name="spacing">
            <number>6</number>
           </property>
-          <property name="leftMargin" >
-           <number>0</number>
-          </property>
-          <property name="topMargin" >
-           <number>0</number>
-          </property>
-          <property name="rightMargin" >
-           <number>0</number>
-          </property>
-          <property name="bottomMargin" >
+          <property name="margin">
            <number>0</number>
           </property>
           <item>
-           <widget class="QRadioButton" name="size_custom" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+           <widget class="QRadioButton" name="size_custom">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>Custom</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QSpinBox" name="size_width" >
-            <property name="minimum" >
+           <widget class="QSpinBox" name="size_width">
+            <property name="minimum">
              <number>1</number>
             </property>
-            <property name="maximum" >
+            <property name="maximum">
              <number>1280</number>
             </property>
-            <property name="singleStep" >
+            <property name="singleStep">
              <number>16</number>
             </property>
-            <property name="value" >
+            <property name="value">
              <number>400</number>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QSpinBox" name="size_height" >
-            <property name="minimum" >
+           <widget class="QSpinBox" name="size_height">
+            <property name="minimum">
              <number>1</number>
             </property>
-            <property name="maximum" >
+            <property name="maximum">
              <number>1024</number>
             </property>
-            <property name="singleStep" >
+            <property name="singleStep">
              <number>16</number>
             </property>
-            <property name="value" >
+            <property name="value">
              <number>300</number>
             </property>
            </widget>
@@ -225,92 +190,84 @@
       </widget>
      </item>
      <item>
-      <widget class="QGroupBox" name="ButtonGroup2" >
-       <property name="title" >
+      <widget class="QGroupBox" name="ButtonGroup2">
+       <property name="title">
         <string>Depth</string>
        </property>
-       <layout class="QVBoxLayout" >
-        <property name="spacing" >
-         <number>6</number>
-        </property>
-        <property name="leftMargin" >
-         <number>11</number>
-        </property>
-        <property name="topMargin" >
-         <number>11</number>
-        </property>
-        <property name="rightMargin" >
-         <number>11</number>
-        </property>
-        <property name="bottomMargin" >
-         <number>11</number>
-        </property>
+       <layout class="QVBoxLayout" name="verticalLayout">
         <item>
-         <widget class="QRadioButton" name="depth_1" >
-          <property name="text" >
+         <widget class="QRadioButton" name="depth_1">
+          <property name="text">
            <string>1 bit monochrome</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="depth_4gray" >
-          <property name="text" >
+         <widget class="QRadioButton" name="depth_2gray">
+          <property name="text">
+           <string>2 bit grayscale</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="depth_4gray">
+          <property name="text">
            <string>4 bit grayscale</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="depth_8" >
-          <property name="text" >
+         <widget class="QRadioButton" name="depth_8">
+          <property name="text">
            <string>8 bit</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="depth_12" >
-          <property name="text" >
+         <widget class="QRadioButton" name="depth_12">
+          <property name="text">
            <string>12 (16) bit</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="depth_15" >
-          <property name="text" >
+         <widget class="QRadioButton" name="depth_15">
+          <property name="text">
            <string>15 bit</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="depth_16" >
-          <property name="text" >
+         <widget class="QRadioButton" name="depth_16">
+          <property name="text">
            <string>16 bit</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="depth_18" >
-          <property name="text" >
+         <widget class="QRadioButton" name="depth_18">
+          <property name="text">
            <string>18 bit</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="depth_24" >
-          <property name="text" >
+         <widget class="QRadioButton" name="depth_24">
+          <property name="text">
            <string>24 bit</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="depth_32" >
-          <property name="text" >
+         <widget class="QRadioButton" name="depth_32">
+          <property name="text">
            <string>32 bit</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="depth_32_argb" >
-          <property name="text" >
+         <widget class="QRadioButton" name="depth_32_argb">
+          <property name="text">
            <string>32 bit ARGB</string>
           </property>
          </widget>
@@ -321,39 +278,30 @@
     </layout>
    </item>
    <item>
-    <layout class="QHBoxLayout" >
-     <property name="spacing" >
+    <layout class="QHBoxLayout">
+     <property name="spacing">
       <number>6</number>
      </property>
-     <property name="leftMargin" >
-      <number>0</number>
-     </property>
-     <property name="topMargin" >
-      <number>0</number>
-     </property>
-     <property name="rightMargin" >
-      <number>0</number>
-     </property>
-     <property name="bottomMargin" >
+     <property name="margin">
       <number>0</number>
      </property>
      <item>
-      <widget class="QLabel" name="TextLabel1_3" >
-       <property name="text" >
+      <widget class="QLabel" name="TextLabel1_3">
+       <property name="text">
         <string>Skin</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QComboBox" name="skin" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+      <widget class="QComboBox" name="skin">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <item>
-        <property name="text" >
+        <property name="text">
          <string>None</string>
         </property>
        </item>
@@ -362,25 +310,25 @@
     </layout>
    </item>
    <item>
-    <widget class="QCheckBox" name="touchScreen" >
-     <property name="text" >
+    <widget class="QCheckBox" name="touchScreen">
+     <property name="text">
       <string>Emulate touch screen (no mouse move)</string>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QCheckBox" name="lcdScreen" >
-     <property name="text" >
+    <widget class="QCheckBox" name="lcdScreen">
+     <property name="text">
       <string>Emulate LCD screen (Only with fixed zoom of 3.0 times magnification)</string>
      </property>
     </widget>
    </item>
    <item>
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>10</height>
@@ -389,204 +337,192 @@
     </spacer>
    </item>
    <item>
-    <widget class="QLabel" name="TextLabel1" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+    <widget class="QLabel" name="TextLabel1">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="text" >
-      <string>&lt;p>Note that any applications using the virtual framebuffer will be terminated if you change the Size or Depth &lt;i>above&lt;/i>. You may freely modify the Gamma &lt;i>below&lt;/i>.</string>
+     <property name="text">
+      <string>&lt;p&gt;Note that any applications using the virtual framebuffer will be terminated if you change the Size or Depth &lt;i&gt;above&lt;/i&gt;. You may freely modify the Gamma &lt;i&gt;below&lt;/i&gt;.</string>
      </property>
-     <property name="wordWrap" >
+     <property name="wordWrap">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="GroupBox1" >
-     <property name="title" >
+    <widget class="QGroupBox" name="GroupBox1">
+     <property name="title">
       <string>Gamma</string>
      </property>
-     <layout class="QGridLayout" >
-      <property name="leftMargin" >
+     <layout class="QGridLayout">
+      <property name="margin">
        <number>11</number>
       </property>
-      <property name="topMargin" >
-       <number>11</number>
-      </property>
-      <property name="rightMargin" >
-       <number>11</number>
-      </property>
-      <property name="bottomMargin" >
-       <number>11</number>
-      </property>
-      <property name="horizontalSpacing" >
-       <number>6</number>
-      </property>
-      <property name="verticalSpacing" >
+      <property name="spacing">
        <number>6</number>
       </property>
-      <item row="6" column="0" >
-       <widget class="QLabel" name="TextLabel3" >
-        <property name="text" >
+      <item row="6" column="0">
+       <widget class="QLabel" name="TextLabel3">
+        <property name="text">
          <string>Blue</string>
         </property>
        </widget>
       </item>
-      <item row="6" column="1" >
-       <widget class="QSlider" name="bslider" >
-        <property name="palette" >
+      <item row="6" column="1">
+       <widget class="QSlider" name="bslider">
+        <property name="palette">
          <palette>
           <active>
-           <colorrole role="WindowText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="WindowText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Button" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Button">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Light" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Light">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>127</red>
               <green>127</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Midlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Midlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>38</red>
               <green>38</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Dark" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Dark">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>127</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Mid" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Mid">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>170</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Text" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Text">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="BrightText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="BrightText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="ButtonText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="ButtonText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Base" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Base">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Window" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Window">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>220</red>
               <green>220</green>
               <blue>220</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Shadow" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Shadow">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Highlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Highlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>10</red>
               <green>95</green>
               <blue>137</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="HighlightedText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="HighlightedText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Link" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Link">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="LinkVisited" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="LinkVisited">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="AlternateBase" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="AlternateBase">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>232</red>
               <green>232</green>
               <blue>232</blue>
@@ -595,153 +531,153 @@
            </colorrole>
           </active>
           <inactive>
-           <colorrole role="WindowText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="WindowText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Button" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Button">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Light" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Light">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>127</red>
               <green>127</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Midlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Midlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>38</red>
               <green>38</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Dark" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Dark">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>127</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Mid" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Mid">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>170</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Text" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Text">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="BrightText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="BrightText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="ButtonText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="ButtonText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Base" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Base">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Window" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Window">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>220</red>
               <green>220</green>
               <blue>220</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Shadow" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Shadow">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Highlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Highlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>10</red>
               <green>95</green>
               <blue>137</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="HighlightedText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="HighlightedText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Link" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Link">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="LinkVisited" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="LinkVisited">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="AlternateBase" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="AlternateBase">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>232</red>
               <green>232</green>
               <blue>232</blue>
@@ -750,153 +686,153 @@
            </colorrole>
           </inactive>
           <disabled>
-           <colorrole role="WindowText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="WindowText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Button" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Button">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Light" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Light">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>127</red>
               <green>127</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Midlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Midlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>38</red>
               <green>38</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Dark" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Dark">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>127</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Mid" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Mid">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>170</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Text" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Text">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="BrightText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="BrightText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="ButtonText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="ButtonText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Base" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Base">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Window" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Window">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>220</red>
               <green>220</green>
               <blue>220</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Shadow" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Shadow">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Highlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Highlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>10</red>
               <green>95</green>
               <blue>137</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="HighlightedText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="HighlightedText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Link" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Link">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="LinkVisited" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="LinkVisited">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="AlternateBase" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="AlternateBase">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>232</red>
               <green>232</green>
               <blue>232</blue>
@@ -906,183 +842,183 @@
           </disabled>
          </palette>
         </property>
-        <property name="maximum" >
+        <property name="maximum">
          <number>400</number>
         </property>
-        <property name="value" >
+        <property name="value">
          <number>100</number>
         </property>
-        <property name="orientation" >
+        <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
-      <item row="6" column="2" >
-       <widget class="QLabel" name="blabel" >
-        <property name="text" >
+      <item row="6" column="2">
+       <widget class="QLabel" name="blabel">
+        <property name="text">
          <string>1.0</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="0" >
-       <widget class="QLabel" name="TextLabel2" >
-        <property name="text" >
+      <item row="4" column="0">
+       <widget class="QLabel" name="TextLabel2">
+        <property name="text">
          <string>Green</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="1" >
-       <widget class="QSlider" name="gslider" >
-        <property name="palette" >
+      <item row="4" column="1">
+       <widget class="QSlider" name="gslider">
+        <property name="palette">
          <palette>
           <active>
-           <colorrole role="WindowText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="WindowText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Button" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Button">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>255</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Light" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Light">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>127</red>
               <green>255</green>
               <blue>127</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Midlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Midlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>38</red>
               <green>255</green>
               <blue>38</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Dark" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Dark">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>127</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Mid" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Mid">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>170</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Text" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Text">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="BrightText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="BrightText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="ButtonText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="ButtonText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Base" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Base">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Window" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Window">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>220</red>
               <green>220</green>
               <blue>220</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Shadow" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Shadow">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Highlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Highlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>10</red>
               <green>95</green>
               <blue>137</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="HighlightedText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="HighlightedText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Link" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Link">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="LinkVisited" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="LinkVisited">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="AlternateBase" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="AlternateBase">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>232</red>
               <green>232</green>
               <blue>232</blue>
@@ -1091,153 +1027,153 @@
            </colorrole>
           </active>
           <inactive>
-           <colorrole role="WindowText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="WindowText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Button" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Button">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>255</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Light" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Light">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>127</red>
               <green>255</green>
               <blue>127</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Midlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Midlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>38</red>
               <green>255</green>
               <blue>38</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Dark" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Dark">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>127</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Mid" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Mid">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>170</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Text" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Text">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="BrightText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="BrightText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="ButtonText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="ButtonText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Base" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Base">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Window" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Window">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>220</red>
               <green>220</green>
               <blue>220</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Shadow" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Shadow">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Highlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Highlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>10</red>
               <green>95</green>
               <blue>137</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="HighlightedText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="HighlightedText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Link" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Link">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="LinkVisited" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="LinkVisited">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="AlternateBase" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="AlternateBase">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>232</red>
               <green>232</green>
               <blue>232</blue>
@@ -1246,153 +1182,153 @@
            </colorrole>
           </inactive>
           <disabled>
-           <colorrole role="WindowText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="WindowText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Button" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Button">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>255</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Light" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Light">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>127</red>
               <green>255</green>
               <blue>127</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Midlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Midlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>38</red>
               <green>255</green>
               <blue>38</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Dark" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Dark">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>127</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Mid" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Mid">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>170</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Text" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Text">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="BrightText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="BrightText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="ButtonText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="ButtonText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Base" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Base">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Window" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Window">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>220</red>
               <green>220</green>
               <blue>220</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Shadow" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Shadow">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Highlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Highlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>10</red>
               <green>95</green>
               <blue>137</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="HighlightedText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="HighlightedText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Link" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Link">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="LinkVisited" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="LinkVisited">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="AlternateBase" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="AlternateBase">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>232</red>
               <green>232</green>
               <blue>232</blue>
@@ -1402,190 +1338,190 @@
           </disabled>
          </palette>
         </property>
-        <property name="maximum" >
+        <property name="maximum">
          <number>400</number>
         </property>
-        <property name="value" >
+        <property name="value">
          <number>100</number>
         </property>
-        <property name="orientation" >
+        <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
-      <item row="4" column="2" >
-       <widget class="QLabel" name="glabel" >
-        <property name="text" >
+      <item row="4" column="2">
+       <widget class="QLabel" name="glabel">
+        <property name="text">
          <string>1.0</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="TextLabel7" >
-        <property name="text" >
+      <item row="0" column="0">
+       <widget class="QLabel" name="TextLabel7">
+        <property name="text">
          <string>All</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="2" >
-       <widget class="QLabel" name="TextLabel8" >
-        <property name="text" >
+      <item row="0" column="2">
+       <widget class="QLabel" name="TextLabel8">
+        <property name="text">
          <string>1.0</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="1" >
-       <widget class="QSlider" name="gammaslider" >
-        <property name="palette" >
+      <item row="0" column="1">
+       <widget class="QSlider" name="gammaslider">
+        <property name="palette">
          <palette>
           <active>
-           <colorrole role="WindowText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="WindowText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Button" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Button">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Light" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Light">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Midlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Midlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Dark" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Dark">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>127</red>
               <green>127</green>
               <blue>127</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Mid" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Mid">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>170</red>
               <green>170</green>
               <blue>170</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Text" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Text">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="BrightText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="BrightText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="ButtonText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="ButtonText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Base" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Base">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Window" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Window">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>220</red>
               <green>220</green>
               <blue>220</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Shadow" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Shadow">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Highlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Highlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>10</red>
               <green>95</green>
               <blue>137</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="HighlightedText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="HighlightedText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Link" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Link">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="LinkVisited" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="LinkVisited">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="AlternateBase" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="AlternateBase">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>232</red>
               <green>232</green>
               <blue>232</blue>
@@ -1594,153 +1530,153 @@
            </colorrole>
           </active>
           <inactive>
-           <colorrole role="WindowText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="WindowText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Button" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Button">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Light" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Light">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Midlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Midlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Dark" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Dark">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>127</red>
               <green>127</green>
               <blue>127</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Mid" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Mid">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>170</red>
               <green>170</green>
               <blue>170</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Text" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Text">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="BrightText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="BrightText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="ButtonText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="ButtonText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Base" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Base">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Window" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Window">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>220</red>
               <green>220</green>
               <blue>220</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Shadow" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Shadow">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Highlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Highlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>10</red>
               <green>95</green>
               <blue>137</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="HighlightedText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="HighlightedText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Link" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Link">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="LinkVisited" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="LinkVisited">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="AlternateBase" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="AlternateBase">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>232</red>
               <green>232</green>
               <blue>232</blue>
@@ -1749,153 +1685,153 @@
            </colorrole>
           </inactive>
           <disabled>
-           <colorrole role="WindowText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="WindowText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Button" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Button">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Light" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Light">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Midlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Midlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Dark" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Dark">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>127</red>
               <green>127</green>
               <blue>127</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Mid" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Mid">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>170</red>
               <green>170</green>
               <blue>170</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Text" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Text">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="BrightText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="BrightText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="ButtonText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="ButtonText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Base" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Base">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Window" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Window">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>220</red>
               <green>220</green>
               <blue>220</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Shadow" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Shadow">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Highlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Highlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>10</red>
               <green>95</green>
               <blue>137</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="HighlightedText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="HighlightedText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Link" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Link">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="LinkVisited" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="LinkVisited">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="AlternateBase" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="AlternateBase">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>232</red>
               <green>232</green>
               <blue>232</blue>
@@ -1905,183 +1841,183 @@
           </disabled>
          </palette>
         </property>
-        <property name="maximum" >
+        <property name="maximum">
          <number>400</number>
         </property>
-        <property name="value" >
+        <property name="value">
          <number>100</number>
         </property>
-        <property name="orientation" >
+        <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
-      <item row="2" column="0" >
-       <widget class="QLabel" name="TextLabel1_2" >
-        <property name="text" >
+      <item row="2" column="0">
+       <widget class="QLabel" name="TextLabel1_2">
+        <property name="text">
          <string>Red</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="2" >
-       <widget class="QLabel" name="rlabel" >
-        <property name="text" >
+      <item row="2" column="2">
+       <widget class="QLabel" name="rlabel">
+        <property name="text">
          <string>1.0</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="1" >
-       <widget class="QSlider" name="rslider" >
-        <property name="palette" >
+      <item row="2" column="1">
+       <widget class="QSlider" name="rslider">
+        <property name="palette">
          <palette>
           <active>
-           <colorrole role="WindowText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="WindowText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Button" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Button">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Light" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Light">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>127</green>
               <blue>127</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Midlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Midlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>38</green>
               <blue>38</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Dark" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Dark">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>127</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Mid" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Mid">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>170</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Text" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Text">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="BrightText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="BrightText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="ButtonText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="ButtonText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Base" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Base">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Window" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Window">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>220</red>
               <green>220</green>
               <blue>220</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Shadow" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Shadow">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Highlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Highlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>10</red>
               <green>95</green>
               <blue>137</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="HighlightedText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="HighlightedText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Link" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Link">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="LinkVisited" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="LinkVisited">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="AlternateBase" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="AlternateBase">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>232</red>
               <green>232</green>
               <blue>232</blue>
@@ -2090,153 +2026,153 @@
            </colorrole>
           </active>
           <inactive>
-           <colorrole role="WindowText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="WindowText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Button" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Button">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Light" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Light">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>127</green>
               <blue>127</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Midlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Midlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>38</green>
               <blue>38</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Dark" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Dark">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>127</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Mid" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Mid">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>170</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Text" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Text">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="BrightText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="BrightText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="ButtonText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="ButtonText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Base" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Base">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Window" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Window">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>220</red>
               <green>220</green>
               <blue>220</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Shadow" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Shadow">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Highlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Highlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>10</red>
               <green>95</green>
               <blue>137</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="HighlightedText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="HighlightedText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Link" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Link">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="LinkVisited" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="LinkVisited">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="AlternateBase" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="AlternateBase">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>232</red>
               <green>232</green>
               <blue>232</blue>
@@ -2245,153 +2181,153 @@
            </colorrole>
           </inactive>
           <disabled>
-           <colorrole role="WindowText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="WindowText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Button" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Button">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Light" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Light">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>127</green>
               <blue>127</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Midlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Midlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>38</green>
               <blue>38</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Dark" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Dark">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>127</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Mid" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Mid">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>170</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Text" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Text">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="BrightText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="BrightText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="ButtonText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="ButtonText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Base" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Base">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Window" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Window">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>220</red>
               <green>220</green>
               <blue>220</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Shadow" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Shadow">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Highlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Highlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>10</red>
               <green>95</green>
               <blue>137</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="HighlightedText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="HighlightedText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Link" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Link">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="LinkVisited" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="LinkVisited">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="AlternateBase" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="AlternateBase">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>232</red>
               <green>232</green>
               <blue>232</blue>
@@ -2401,53 +2337,44 @@
           </disabled>
          </palette>
         </property>
-        <property name="maximum" >
+        <property name="maximum">
          <number>400</number>
         </property>
-        <property name="value" >
+        <property name="value">
          <number>100</number>
         </property>
-        <property name="orientation" >
+        <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
-      <item row="8" column="0" colspan="3" >
-       <widget class="QPushButton" name="PushButton3" >
-        <property name="text" >
+      <item row="8" column="0" colspan="3">
+       <widget class="QPushButton" name="PushButton3">
+        <property name="text">
          <string>Set all to 1.0</string>
         </property>
        </widget>
       </item>
-      <item rowspan="9" row="0" column="3" >
-       <widget class="GammaView" native="1" name="MyCustomWidget1" />
+      <item row="0" column="3" rowspan="9">
+       <widget class="GammaView" name="MyCustomWidget1" native="true"/>
       </item>
      </layout>
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout" >
-     <property name="spacing" >
+    <layout class="QHBoxLayout">
+     <property name="spacing">
       <number>6</number>
      </property>
-     <property name="leftMargin" >
-      <number>0</number>
-     </property>
-     <property name="topMargin" >
-      <number>0</number>
-     </property>
-     <property name="rightMargin" >
-      <number>0</number>
-     </property>
-     <property name="bottomMargin" >
+     <property name="margin">
       <number>0</number>
      </property>
      <item>
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
@@ -2456,24 +2383,24 @@
       </spacer>
      </item>
      <item>
-      <widget class="QPushButton" name="buttonOk" >
-       <property name="text" >
+      <widget class="QPushButton" name="buttonOk">
+       <property name="text">
         <string>&amp;OK</string>
        </property>
-       <property name="autoDefault" >
+       <property name="autoDefault">
         <bool>true</bool>
        </property>
-       <property name="default" >
+       <property name="default">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="buttonCancel" >
-       <property name="text" >
+      <widget class="QPushButton" name="buttonCancel">
+       <property name="text">
         <string>&amp;Cancel</string>
        </property>
-       <property name="autoDefault" >
+       <property name="autoDefault">
         <bool>true</bool>
        </property>
       </widget>
@@ -2482,7 +2409,7 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
    <class>GammaView</class>
@@ -2498,11 +2425,11 @@
    <receiver>size_custom</receiver>
    <slot>click()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>152</x>
      <y>193</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>94</x>
      <y>199</y>
     </hint>
@@ -2514,11 +2441,11 @@
    <receiver>size_custom</receiver>
    <slot>click()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>259</x>
      <y>196</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>64</x>
      <y>188</y>
     </hint>
diff --git a/tools/qvfb/qvfb.cpp b/tools/qvfb/qvfb.cpp
index 62149a1952..0fb35770cf 100644
--- a/tools/qvfb/qvfb.cpp
+++ b/tools/qvfb/qvfb.cpp
@@ -678,6 +678,8 @@ void QVFb::configure()
 	int d;
 	if ( config->depth_1->isChecked() )
 	    d=1;
+	else if ( config->depth_2gray->isChecked() )
+	    d=2;
 	else if ( config->depth_4gray->isChecked() )
 	    d=4;
 	else if ( config->depth_8->isChecked() )
@@ -741,6 +743,7 @@ void QVFb::chooseSize(const QSize& sz)
 void QVFb::chooseDepth(int depth, QVFbView::PixelFormat displayFormat)
 {
     config->depth_1->setChecked(depth==1);
+    config->depth_2gray->setChecked(depth==2);
     config->depth_4gray->setChecked(depth==4);
     config->depth_8->setChecked(depth==8);
     config->depth_12->setChecked(depth==12);
diff --git a/tools/qvfb/qvfbview.cpp b/tools/qvfb/qvfbview.cpp
index 53a5360e52..c2df8fd7ed 100644
--- a/tools/qvfb/qvfbview.cpp
+++ b/tools/qvfb/qvfbview.cpp
@@ -457,6 +457,67 @@ QImage QVFbView::getBuffer(const QRect &r, int &leading) const
         }
         break;
     }
+
+    case 2: {
+        if (requiredSize > buffer.size())
+            buffer.resize(requiredSize);
+
+        // XXX: hw: replace by drawhelper functionality
+
+        const int pixelsPerByte = 4;
+        quint8 *src = reinterpret_cast<quint8*>(mView->data())
+                      + r.y() * mView->linestep() + r.x() / pixelsPerByte;
+        const int align = qMin(r.width(), (4 - (r.x() & 3)) & 3);
+        const int doAlign = (align > 0 ? 1 : 0);
+        const int tail = qMin(r.width(), (r.width() - align) & 3);
+        const int doTail = (tail > 0 ? 1 : 0);
+        const int width8 = (r.width() - align) / pixelsPerByte;
+        const int stride = mView->linestep() - (width8 + doAlign);
+
+        uchar *b = reinterpret_cast<uchar*>(buffer.data());
+	img = QImage(b, r.width(), r.height(), QImage::Format_RGB32);
+	for (int y = 0; y < r.height(); ++y) {
+            quint32 *dest = reinterpret_cast<quint32*>(img.scanLine(y));
+            quint8 c;
+
+            if (doAlign) {
+                switch (align) {
+                case 3: c = ((*src & 0x30) >> 4) * 0x55;
+                        *dest++ = qRgb(c, c, c);
+                case 2: c = ((*src & 0x0c) >> 2) * 0x55;
+                        *dest++ = qRgb(c, c, c);
+                case 1: c = ((*src & 0x03)) * 0x55;
+                        *dest++ = qRgb(c, c, c);
+                }
+                ++src;
+            }
+            for (int i = 0; i < width8; ++i) {
+                c = ((*src & 0xc0) >> 6) * 0x55;
+                *dest++ = qRgb(c, c, c);
+                c = ((*src & 0x30) >> 4) * 0x55;
+                *dest++ = qRgb(c, c, c);
+                c = ((*src & 0x0c) >> 2) * 0x55;
+                *dest++ = qRgb(c, c, c);
+                c = ((*src & 0x03)) * 0x55;
+                *dest++ = qRgb(c, c, c);
+
+                ++src;
+            }
+            if (doTail) {
+                switch (tail) {
+                case 3: c = ((*src & 0x0c) >> 2) * 0x55;
+                        dest[2] = qRgb(c, c, c);
+                case 2: c = ((*src & 0x30) >> 4) * 0x55;
+                        dest[1] = qRgb(c, c, c);
+                case 1: c = ((*src & 0xc0) >> 6) * 0x55;
+                        dest[0] = qRgb(c, c, c);
+                }
+            }
+            src += stride;
+        }
+        break;
+    }
+
     case 4: {
         if (requiredSize > buffer.size())
             buffer.resize(requiredSize);
-- 
cgit v1.2.1