Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qchannelmanagerwidget.ui
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qchannelmanagerwidget.ui	(revision 2)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qchannelmanagerwidget.ui	(revision 42)
@@ -1,92 +1,89 @@
-<ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>QChannelManagerWidget</class>
- <widget class="QWidget" name="QChannelManagerWidget" >
-  <property name="geometry" >
+ <widget class="QWidget" name="QChannelManagerWidget">
+  <property name="geometry">
    <rect>
-	<x>0</x>
-	<y>0</y>
-	<width>223</width>
-	<height>236</height>
+    <x>0</x>
+    <y>0</y>
+    <width>223</width>
+    <height>236</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Channel Manager</string>
   </property>
-  <layout class="QHBoxLayout" >
-   <property name="margin" >
-	<number>0</number>
+  <layout class="QHBoxLayout">
+   <property name="spacing">
+    <number>6</number>
    </property>
-   <property name="spacing" >
-	<number>6</number>
+   <property name="margin">
+    <number>0</number>
    </property>
    <item>
-	<layout class="QVBoxLayout" >
-	 <property name="margin" >
-	  <number>0</number>
-	 </property>
-	 <property name="spacing" >
-	  <number>6</number>
-	 </property>
-	 <item>
-	  <widget class="QTableWidget" name="channelTable" >
-	   <property name="selectionMode" >
-		<enum>QAbstractItemView::SingleSelection</enum>
-	   </property>
-	   <property name="selectionBehavior" >
-		<enum>QAbstractItemView::SelectRows</enum>
-	   </property>
-	  </widget>
-	 </item>
-	 <item>
-	  <layout class="QHBoxLayout" >
-	   <property name="margin" >
-		<number>0</number>
-	   </property>
-	   <property name="spacing" >
-		<number>6</number>
-	   </property>
-	   <item>
-		<spacer>
-		 <property name="orientation" >
-		  <enum>Qt::Horizontal</enum>
-		 </property>
-		 <property name="sizeHint" >
-		  <size>
-		   <width>16</width>
-		   <height>20</height>
-		  </size>
-		 </property>
-		</spacer>
-	   </item>
-	   <item>
-		<widget class="QPushButton" name="addButton" >
-		 <property name="focusPolicy" >
-		  <enum>Qt::NoFocus</enum>
-		 </property>
-		 <property name="text" >
-		  <string>Add</string>
-		 </property>
-		</widget>
-	   </item>
-	   <item>
-		<widget class="QPushButton" name="removeButton" >
-		 <property name="focusPolicy" >
-		  <enum>Qt::NoFocus</enum>
-		 </property>
-		 <property name="text" >
-		  <string>Remove</string>
-		 </property>
-		</widget>
-	   </item>
-	  </layout>
-	 </item>
-	</layout>
+    <layout class="QVBoxLayout">
+     <property name="spacing">
+      <number>6</number>
+     </property>
+     <property name="margin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QTableWidget" name="channelTable">
+       <property name="selectionMode">
+        <enum>QAbstractItemView::SingleSelection</enum>
+       </property>
+       <property name="selectionBehavior">
+        <enum>QAbstractItemView::SelectRows</enum>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QHBoxLayout">
+       <property name="spacing">
+        <number>6</number>
+       </property>
+       <property name="margin">
+        <number>0</number>
+       </property>
+       <item>
+        <spacer>
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>16</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QPushButton" name="addButton">
+         <property name="focusPolicy">
+          <enum>Qt::NoFocus</enum>
+         </property>
+         <property name="text">
+          <string>Add</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="removeButton">
+         <property name="focusPolicy">
+          <enum>Qt::NoFocus</enum>
+         </property>
+         <property name="text">
+          <string>Remove</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>
- <pixmapfunction></pixmapfunction>
  <resources/>
  <connections/>
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qchannelwidget.ui
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qchannelwidget.ui	(revision 2)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qchannelwidget.ui	(revision 42)
@@ -1,6 +1,7 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>QChannelWidget</class>
- <widget class="QWidget" name="QChannelWidget" >
-  <property name="geometry" >
+ <widget class="QWidget" name="QChannelWidget">
+  <property name="geometry">
    <rect>
     <x>0</x>
@@ -10,25 +11,25 @@
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Channel Settings</string>
   </property>
-  <layout class="QVBoxLayout" >
-   <property name="spacing" >
+  <layout class="QVBoxLayout">
+   <property name="spacing">
     <number>6</number>
    </property>
-   <property name="margin" >
+   <property name="margin">
     <number>0</number>
    </property>
    <item>
-    <layout class="QHBoxLayout" >
-     <property name="spacing" >
+    <layout class="QHBoxLayout">
+     <property name="spacing">
       <number>6</number>
      </property>
-     <property name="margin" >
+     <property name="margin">
       <number>0</number>
      </property>
      <item>
-      <widget class="QLabel" name="nameLabel" >
-       <property name="text" >
+      <widget class="QLabel" name="nameLabel">
+       <property name="text">
         <string>Name</string>
        </property>
@@ -36,12 +37,12 @@
      </item>
      <item>
-      <widget class="QLineEdit" name="nameEdit" />
+      <widget class="QLineEdit" name="nameEdit"/>
      </item>
      <item>
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" stdset="0" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
@@ -54,26 +55,26 @@
    </item>
    <item>
-    <widget class="QGroupBox" name="overlayGroupBox" >
-     <property name="title" >
+    <widget class="QGroupBox" name="overlayGroupBox">
+     <property name="title">
       <string>Overlay</string>
      </property>
-     <layout class="QHBoxLayout" >
-      <property name="spacing" >
+     <layout class="QHBoxLayout">
+      <property name="spacing">
        <number>6</number>
       </property>
-      <property name="margin" >
+      <property name="margin">
        <number>4</number>
       </property>
       <item>
-       <layout class="QVBoxLayout" >
-        <property name="spacing" >
+       <layout class="QVBoxLayout">
+        <property name="spacing">
          <number>6</number>
         </property>
-        <property name="margin" >
+        <property name="margin">
          <number>0</number>
         </property>
         <item>
-         <widget class="QCheckBox" name="overlayNameCheckBox" >
-          <property name="text" >
+         <widget class="QCheckBox" name="overlayNameCheckBox">
+          <property name="text">
            <string>Channel name</string>
           </property>
@@ -81,14 +82,14 @@
         </item>
         <item>
-         <layout class="QHBoxLayout" >
-          <property name="spacing" >
+         <layout class="QHBoxLayout">
+          <property name="spacing">
            <number>6</number>
           </property>
-          <property name="margin" >
+          <property name="margin">
            <number>0</number>
           </property>
           <item>
-           <widget class="QLabel" name="overlayImageLabel" >
-            <property name="text" >
+           <widget class="QLabel" name="overlayImageLabel">
+            <property name="text">
              <string>Image</string>
             </property>
@@ -96,7 +97,7 @@
           </item>
           <item>
-           <widget class="QLineEdit" name="overlayImageEdit" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
+           <widget class="QLineEdit" name="overlayImageEdit">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
@@ -106,12 +107,12 @@
           </item>
           <item>
-           <widget class="QPushButton" name="overlayImageBrowseButton" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+           <widget class="QPushButton" name="overlayImageBrowseButton">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="maximumSize" >
+            <property name="maximumSize">
              <size>
               <width>23</width>
@@ -119,5 +120,5 @@
              </size>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>...</string>
             </property>
@@ -132,49 +133,49 @@
    </item>
    <item>
-    <widget class="QToolBox" name="toolBox" >
-     <property name="autoFillBackground" >
+    <widget class="QToolBox" name="toolBox">
+     <property name="autoFillBackground">
       <bool>true</bool>
      </property>
-     <property name="currentIndex" >
+     <property name="currentIndex">
       <number>1</number>
      </property>
-     <widget class="QWidget" name="page" >
-      <property name="geometry" >
+     <widget class="QWidget" name="page">
+      <property name="geometry">
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>232</width>
-        <height>198</height>
+        <width>158</width>
+        <height>58</height>
        </rect>
       </property>
-      <attribute name="label" >
+      <attribute name="label">
        <string>Remote Settings</string>
       </attribute>
-      <layout class="QHBoxLayout" >
-       <property name="spacing" >
+      <layout class="QHBoxLayout">
+       <property name="spacing">
         <number>6</number>
        </property>
-       <property name="margin" >
+       <property name="margin">
         <number>0</number>
        </property>
        <item>
-        <layout class="QVBoxLayout" >
-         <property name="spacing" >
+        <layout class="QVBoxLayout">
+         <property name="spacing">
           <number>6</number>
          </property>
-         <property name="margin" >
+         <property name="margin">
           <number>0</number>
          </property>
          <item>
-          <layout class="QHBoxLayout" >
-           <property name="spacing" >
+          <layout class="QHBoxLayout">
+           <property name="spacing">
             <number>6</number>
            </property>
-           <property name="margin" >
+           <property name="margin">
             <number>0</number>
            </property>
            <item>
-            <widget class="QLabel" name="remoteHostNameLabel" >
-             <property name="text" >
+            <widget class="QLabel" name="remoteHostNameLabel">
+             <property name="text">
               <string>Host name</string>
              </property>
@@ -182,19 +183,19 @@
            </item>
            <item>
-            <widget class="QLineEdit" name="remoteHostNameEdit" />
+            <widget class="QLineEdit" name="remoteHostNameEdit"/>
            </item>
           </layout>
          </item>
          <item>
-          <layout class="QHBoxLayout" >
-           <property name="spacing" >
+          <layout class="QHBoxLayout">
+           <property name="spacing">
             <number>6</number>
            </property>
-           <property name="margin" >
+           <property name="margin">
             <number>0</number>
            </property>
            <item>
-            <widget class="QCheckBox" name="remoteFullScreenCheckBox" >
-             <property name="text" >
+            <widget class="QCheckBox" name="remoteFullScreenCheckBox">
+             <property name="text">
               <string>Full screen</string>
              </property>
@@ -202,6 +203,6 @@
            </item>
            <item>
-            <widget class="QLabel" name="remoteScreenLabel" >
-             <property name="text" >
+            <widget class="QLabel" name="remoteScreenLabel">
+             <property name="text">
               <string> Screen</string>
              </property>
@@ -209,22 +210,22 @@
            </item>
            <item>
-            <widget class="QComboBox" name="remoteScreenComboBox" >
+            <widget class="QComboBox" name="remoteScreenComboBox">
              <item>
-              <property name="text" >
+              <property name="text">
                <string>1</string>
               </property>
              </item>
              <item>
-              <property name="text" >
+              <property name="text">
                <string>2</string>
               </property>
              </item>
              <item>
-              <property name="text" >
+              <property name="text">
                <string>3</string>
               </property>
              </item>
              <item>
-              <property name="text" >
+              <property name="text">
                <string>4</string>
               </property>
@@ -236,8 +237,8 @@
          <item>
           <spacer>
-           <property name="orientation" >
+           <property name="orientation">
             <enum>Qt::Vertical</enum>
            </property>
-           <property name="sizeHint" stdset="0" >
+           <property name="sizeHint" stdset="0">
             <size>
              <width>20</width>
@@ -251,34 +252,34 @@
       </layout>
      </widget>
-     <widget class="QWidget" name="page_2" >
-      <property name="geometry" >
+     <widget class="QWidget" name="page_2">
+      <property name="geometry">
        <rect>
         <x>0</x>
         <y>0</y>
         <width>232</width>
-        <height>262</height>
+        <height>267</height>
        </rect>
       </property>
-      <attribute name="label" >
+      <attribute name="label">
        <string>Projector</string>
       </attribute>
-      <layout class="QVBoxLayout" >
-       <property name="spacing" >
+      <layout class="QVBoxLayout">
+       <property name="spacing">
         <number>0</number>
        </property>
-       <property name="margin" >
+       <property name="margin">
         <number>0</number>
        </property>
        <item>
-        <layout class="QHBoxLayout" >
-         <property name="spacing" >
+        <layout class="QHBoxLayout">
+         <property name="spacing">
           <number>6</number>
          </property>
-         <property name="margin" >
+         <property name="margin">
           <number>0</number>
          </property>
          <item>
-          <widget class="QLabel" name="pluginLabel" >
-           <property name="text" >
+          <widget class="QLabel" name="pluginLabel">
+           <property name="text">
             <string>Plugin</string>
            </property>
@@ -286,12 +287,12 @@
          </item>
          <item>
-          <widget class="QComboBox" name="pluginComboBox" />
+          <widget class="QComboBox" name="pluginComboBox"/>
          </item>
          <item>
           <spacer>
-           <property name="orientation" >
+           <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
-           <property name="sizeHint" stdset="0" >
+           <property name="sizeHint" stdset="0">
             <size>
              <width>40</width>
@@ -304,6 +305,6 @@
        </item>
        <item>
-        <widget class="QStackedWidget" name="stackedWidget" >
-         <property name="minimumSize" >
+        <widget class="QStackedWidget" name="stackedWidget">
+         <property name="minimumSize">
           <size>
            <width>0</width>
@@ -314,6 +315,6 @@
        </item>
        <item>
-        <widget class="projection::QTransformMatrixWidget" native="1" name="projectionTransformWidget" >
-         <property name="focusPolicy" >
+        <widget class="projection::QTransformMatrixWidget" name="projectionTransformWidget" native="true">
+         <property name="focusPolicy">
           <enum>Qt::StrongFocus</enum>
          </property>
@@ -321,26 +322,26 @@
        </item>
        <item>
-        <widget class="QGroupBox" name="warpGroupBox" >
-         <property name="title" >
+        <widget class="QGroupBox" name="warpGroupBox">
+         <property name="title">
           <string>Warp</string>
          </property>
-         <layout class="QHBoxLayout" >
-          <property name="spacing" >
+         <layout class="QHBoxLayout">
+          <property name="spacing">
            <number>6</number>
           </property>
-          <property name="margin" >
+          <property name="margin">
            <number>4</number>
           </property>
           <item>
-           <layout class="QHBoxLayout" >
-            <property name="spacing" >
+           <layout class="QHBoxLayout">
+            <property name="spacing">
              <number>6</number>
             </property>
-            <property name="margin" >
+            <property name="margin">
              <number>0</number>
             </property>
             <item>
-             <widget class="QCheckBox" name="warpCheckBox" >
-              <property name="text" >
+             <widget class="QCheckBox" name="warpCheckBox">
+              <property name="text">
                <string>Enable</string>
               </property>
@@ -348,6 +349,6 @@
             </item>
             <item>
-             <widget class="QLabel" name="warpResLabel" >
-              <property name="text" >
+             <widget class="QLabel" name="warpResLabel">
+              <property name="text">
                <string>Res.</string>
               </property>
@@ -355,6 +356,6 @@
             </item>
             <item>
-             <widget class="QSpinBox" name="warpResSpinBox" >
-              <property name="maximumSize" >
+             <widget class="QSpinBox" name="warpResSpinBox">
+              <property name="maximumSize">
                <size>
                 <width>32</width>
@@ -362,8 +363,8 @@
                </size>
               </property>
-              <property name="minimum" >
+              <property name="minimum">
                <number>2</number>
               </property>
-              <property name="maximum" >
+              <property name="maximum">
                <number>8</number>
               </property>
@@ -371,6 +372,6 @@
             </item>
             <item>
-             <widget class="QPushButton" name="warpResetButton" >
-              <property name="maximumSize" >
+             <widget class="QPushButton" name="warpResetButton">
+              <property name="maximumSize">
                <size>
                 <width>50</width>
@@ -378,5 +379,5 @@
                </size>
               </property>
-              <property name="text" >
+              <property name="text">
                <string>Reset</string>
               </property>
@@ -389,17 +390,17 @@
        </item>
        <item>
-        <layout class="QHBoxLayout" >
-         <property name="spacing" >
+        <layout class="QHBoxLayout">
+         <property name="spacing">
           <number>0</number>
          </property>
-         <property name="margin" >
+         <property name="margin">
           <number>0</number>
          </property>
          <item>
           <spacer>
-           <property name="orientation" >
+           <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
-           <property name="sizeHint" stdset="0" >
+           <property name="sizeHint" stdset="0">
             <size>
              <width>40</width>
@@ -410,9 +411,9 @@
          </item>
          <item>
-          <widget class="QPushButton" name="calibrateButton" >
-           <property name="enabled" >
+          <widget class="QPushButton" name="calibrateButton">
+           <property name="enabled">
             <bool>false</bool>
            </property>
-           <property name="text" >
+           <property name="text">
             <string>Calibrate...</string>
            </property>
@@ -423,8 +424,8 @@
        <item>
         <spacer>
-         <property name="orientation" >
+         <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeHint" stdset="0" >
+         <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
@@ -436,34 +437,34 @@
       </layout>
      </widget>
-     <widget class="QWidget" name="page_3" >
-      <property name="geometry" >
+     <widget class="QWidget" name="page_3">
+      <property name="geometry">
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>232</width>
-        <height>349</height>
+        <width>98</width>
+        <height>28</height>
        </rect>
       </property>
-      <attribute name="label" >
+      <attribute name="label">
        <string>View</string>
       </attribute>
-      <layout class="QVBoxLayout" >
-       <property name="spacing" >
+      <layout class="QVBoxLayout">
+       <property name="spacing">
         <number>0</number>
        </property>
-       <property name="margin" >
+       <property name="margin">
         <number>0</number>
        </property>
        <item>
-        <layout class="QVBoxLayout" >
-         <property name="spacing" >
+        <layout class="QVBoxLayout">
+         <property name="spacing">
           <number>0</number>
          </property>
-         <property name="margin" >
+         <property name="margin">
           <number>0</number>
          </property>
          <item>
-          <widget class="projection::QProjectionMatrixWidget" native="1" name="viewProjectionWidget" >
-           <property name="focusPolicy" >
+          <widget class="projection::QProjectionMatrixWidget" name="viewProjectionWidget" native="true">
+           <property name="focusPolicy">
             <enum>Qt::StrongFocus</enum>
            </property>
@@ -471,6 +472,6 @@
          </item>
          <item>
-          <widget class="projection::QTransformMatrixWidget" native="1" name="viewTransformWidget" >
-           <property name="focusPolicy" >
+          <widget class="projection::QTransformMatrixWidget" name="viewTransformWidget" native="true">
+           <property name="focusPolicy">
             <enum>Qt::StrongFocus</enum>
            </property>
@@ -478,17 +479,17 @@
          </item>
          <item>
-          <layout class="QHBoxLayout" >
-           <property name="spacing" >
+          <layout class="QHBoxLayout">
+           <property name="spacing">
             <number>0</number>
            </property>
-           <property name="margin" >
+           <property name="margin">
             <number>0</number>
            </property>
            <item>
             <spacer>
-             <property name="orientation" >
+             <property name="orientation">
               <enum>Qt::Horizontal</enum>
              </property>
-             <property name="sizeHint" stdset="0" >
+             <property name="sizeHint" stdset="0">
               <size>
                <width>40</width>
@@ -499,9 +500,9 @@
            </item>
            <item>
-            <widget class="QPushButton" name="fitButton" >
-             <property name="enabled" >
+            <widget class="QPushButton" name="fitButton">
+             <property name="enabled">
               <bool>false</bool>
              </property>
-             <property name="text" >
+             <property name="text">
               <string>Fit to Projector</string>
              </property>
@@ -512,8 +513,8 @@
          <item>
           <spacer>
-           <property name="orientation" >
+           <property name="orientation">
             <enum>Qt::Vertical</enum>
            </property>
-           <property name="sizeHint" stdset="0" >
+           <property name="sizeHint" stdset="0">
             <size>
              <width>20</width>
@@ -531,11 +532,11 @@
    <item>
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeType" >
+     <property name="sizeType">
       <enum>QSizePolicy::Fixed</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>190</width>
@@ -546,17 +547,17 @@
    </item>
    <item>
-    <layout class="QHBoxLayout" >
-     <property name="spacing" >
+    <layout class="QHBoxLayout">
+     <property name="spacing">
       <number>6</number>
      </property>
-     <property name="margin" >
+     <property name="margin">
       <number>0</number>
      </property>
      <item>
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" stdset="0" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
@@ -567,15 +568,15 @@
      </item>
      <item>
-      <widget class="QPushButton" name="windowButton" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+      <widget class="QPushButton" name="windowButton">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="focusPolicy" >
+       <property name="focusPolicy">
         <enum>Qt::NoFocus</enum>
        </property>
-       <property name="text" >
+       <property name="text">
         <string>Open Window...</string>
        </property>
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qclientwindow.ui
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qclientwindow.ui	(revision 2)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qclientwindow.ui	(revision 42)
@@ -1,9 +1,7 @@
-<ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>QClientWindow</class>
- <widget class="QMainWindow" name="QClientWindow" >
-  <property name="geometry" >
+ <widget class="QMainWindow" name="QClientWindow">
+  <property name="geometry">
    <rect>
     <x>0</x>
@@ -13,24 +11,24 @@
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Projection Designer</string>
   </property>
-  <widget class="QWidget" name="centralWidget" >
-   <layout class="QHBoxLayout" >
-    <property name="margin" >
+  <widget class="QWidget" name="centralWidget">
+   <layout class="QHBoxLayout">
+    <property name="spacing">
+     <number>6</number>
+    </property>
+    <property name="margin">
      <number>2</number>
     </property>
-    <property name="spacing" >
-     <number>6</number>
-    </property>
     <item>
-     <widget class="QTextEdit" name="logEdit" >
-      <property name="acceptDrops" >
+     <widget class="QTextEdit" name="logEdit">
+      <property name="acceptDrops">
        <bool>false</bool>
       </property>
-      <property name="readOnly" >
+      <property name="readOnly">
        <bool>true</bool>
       </property>
-      <property name="acceptRichText" >
+      <property name="acceptRichText">
        <bool>false</bool>
       </property>
@@ -39,28 +37,27 @@
    </layout>
   </widget>
-  <widget class="QMenuBar" name="menuBar" >
-   <property name="geometry" >
+  <widget class="QMenuBar" name="menuBar">
+   <property name="geometry">
     <rect>
      <x>0</x>
      <y>0</y>
      <width>344</width>
-     <height>18</height>
+     <height>21</height>
     </rect>
    </property>
-   <widget class="QMenu" name="menu_File" >
-    <property name="title" >
+   <widget class="QMenu" name="menu_File">
+    <property name="title">
      <string>&amp;File</string>
     </property>
-    <addaction name="actionFileExit" />
+    <addaction name="actionFileExit"/>
    </widget>
-   <addaction name="menu_File" />
+   <addaction name="menu_File"/>
   </widget>
-  <action name="actionFileExit" >
-   <property name="text" >
+  <action name="actionFileExit">
+   <property name="text">
     <string>E&amp;xit</string>
    </property>
   </action>
  </widget>
- <pixmapfunction></pixmapfunction>
  <resources/>
  <connections/>
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qdesignviewwindow.ui
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qdesignviewwindow.ui	(revision 2)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qdesignviewwindow.ui	(revision 42)
@@ -1,6 +1,7 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>QDesignViewWindow</class>
- <widget class="QMainWindow" name="QDesignViewWindow" >
-  <property name="geometry" >
+ <widget class="QMainWindow" name="QDesignViewWindow">
+  <property name="geometry">
    <rect>
     <x>0</x>
@@ -10,27 +11,27 @@
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Projection Designer</string>
   </property>
-  <property name="windowIcon" >
-   <iconset resource="../../projdesigner.qrc" >
+  <property name="windowIcon">
+   <iconset resource="../../projdesigner.qrc">
     <normaloff>:/new/prefix1/Resources/projDesigner.png</normaloff>:/new/prefix1/Resources/projDesigner.png</iconset>
   </property>
-  <widget class="QWidget" name="centralWidget" >
-   <layout class="QHBoxLayout" >
-    <property name="spacing" >
+  <widget class="QWidget" name="centralWidget">
+   <layout class="QHBoxLayout">
+    <property name="spacing">
      <number>6</number>
     </property>
-    <property name="margin" >
+    <property name="margin">
      <number>0</number>
     </property>
     <item>
-     <widget class="QSplitter" name="splitter" >
-      <property name="orientation" >
+     <widget class="QSplitter" name="splitter">
+      <property name="orientation">
        <enum>Qt::Horizontal</enum>
       </property>
-      <widget class="projection::QDesignViewWidget" native="1" name="designViewWidget" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="MinimumExpanding" hsizetype="Ignored" >
+      <widget class="projection::QDesignViewWidget" name="designViewWidget" native="true">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Ignored" vsizetype="MinimumExpanding">
          <horstretch>1</horstretch>
          <verstretch>0</verstretch>
@@ -38,7 +39,7 @@
        </property>
       </widget>
-      <widget class="projection::QPanelWidget" native="1" name="panelWidget" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="MinimumExpanding" hsizetype="Preferred" >
+      <widget class="projection::QPanelWidget" name="panelWidget" native="true">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
@@ -50,331 +51,331 @@
    </layout>
   </widget>
-  <widget class="QMenuBar" name="menuBar" >
-   <property name="geometry" >
+  <widget class="QMenuBar" name="menuBar">
+   <property name="geometry">
     <rect>
      <x>0</x>
      <y>0</y>
      <width>960</width>
-     <height>22</height>
+     <height>21</height>
     </rect>
    </property>
-   <widget class="QMenu" name="menuEdit" >
-    <property name="title" >
+   <widget class="QMenu" name="menuEdit">
+    <property name="title">
      <string>&amp;Edit</string>
     </property>
-    <addaction name="actionEditDesignDistortionMap" />
-    <addaction name="actionEditDesignBlendMap" />
-    <addaction name="separator" />
-    <addaction name="actionEditPreference" />
+    <addaction name="actionEditDesignDistortionMap"/>
+    <addaction name="actionEditDesignBlendMap"/>
+    <addaction name="separator"/>
+    <addaction name="actionEditPreference"/>
    </widget>
-   <widget class="QMenu" name="menuView" >
-    <property name="title" >
+   <widget class="QMenu" name="menuView">
+    <property name="title">
      <string>&amp;View</string>
     </property>
-    <addaction name="actionViewPerspective" />
-    <addaction name="actionViewCenter" />
-    <addaction name="actionViewFront" />
-    <addaction name="actionViewTop" />
-    <addaction name="actionViewSide" />
-    <addaction name="separator" />
-    <addaction name="actionViewAxis" />
-    <addaction name="actionViewGrid" />
-    <addaction name="actionViewInfo" />
-    <addaction name="separator" />
-    <addaction name="actionViewViewAll" />
+    <addaction name="actionViewPerspective"/>
+    <addaction name="actionViewCenter"/>
+    <addaction name="actionViewFront"/>
+    <addaction name="actionViewTop"/>
+    <addaction name="actionViewSide"/>
+    <addaction name="separator"/>
+    <addaction name="actionViewAxis"/>
+    <addaction name="actionViewGrid"/>
+    <addaction name="actionViewInfo"/>
+    <addaction name="separator"/>
+    <addaction name="actionViewViewAll"/>
    </widget>
-   <widget class="QMenu" name="menuWindow" >
-    <property name="title" >
+   <widget class="QMenu" name="menuWindow">
+    <property name="title">
      <string>&amp;Window</string>
     </property>
-    <addaction name="actionWindowSceneViewer" />
-    <addaction name="separator" />
-    <addaction name="actionWindowSceneDialog" />
-    <addaction name="actionWindowScreenDialog" />
-    <addaction name="actionWindowChannelManager" />
+    <addaction name="actionWindowSceneViewer"/>
+    <addaction name="separator"/>
+    <addaction name="actionWindowSceneDialog"/>
+    <addaction name="actionWindowScreenDialog"/>
+    <addaction name="actionWindowChannelManager"/>
    </widget>
-   <widget class="QMenu" name="menuFile" >
-    <property name="title" >
+   <widget class="QMenu" name="menuFile">
+    <property name="title">
      <string>&amp;File</string>
     </property>
-    <addaction name="actionFileNew" />
-    <addaction name="actionFileOpen" />
-    <addaction name="actionFileSave" />
-    <addaction name="actionFileSaveAs" />
-    <addaction name="separator" />
-    <addaction name="actionFileExportDataset" />
-    <addaction name="separator" />
-    <addaction name="actionFileSyncClients" />
+    <addaction name="actionFileNew"/>
+    <addaction name="actionFileOpen"/>
+    <addaction name="actionFileSave"/>
+    <addaction name="actionFileSaveAs"/>
+    <addaction name="separator"/>
+    <addaction name="actionFileExportDataset"/>
+    <addaction name="separator"/>
+    <addaction name="actionFileSyncClients"/>
    </widget>
-   <widget class="QMenu" name="menuHelp" >
-    <property name="title" >
+   <widget class="QMenu" name="menuHelp">
+    <property name="title">
      <string>&amp;Help</string>
     </property>
-    <addaction name="actionHelpHelp" />
-    <addaction name="actionHelpPlugins" />
-    <addaction name="separator" />
-    <addaction name="actionHelpAbout" />
-    <addaction name="actionHelpAbout_Qt" />
+    <addaction name="actionHelpHelp"/>
+    <addaction name="actionHelpPlugins"/>
+    <addaction name="separator"/>
+    <addaction name="actionHelpAbout"/>
+    <addaction name="actionHelpAbout_Qt"/>
    </widget>
-   <addaction name="menuFile" />
-   <addaction name="menuEdit" />
-   <addaction name="menuView" />
-   <addaction name="menuWindow" />
-   <addaction name="menuHelp" />
+   <addaction name="menuFile"/>
+   <addaction name="menuEdit"/>
+   <addaction name="menuView"/>
+   <addaction name="menuWindow"/>
+   <addaction name="menuHelp"/>
   </widget>
-  <action name="actionFileNew" >
-   <property name="icon" >
-    <iconset resource="../../projdesigner.qrc" >
+  <action name="actionFileNew">
+   <property name="icon">
+    <iconset resource="../../projdesigner.qrc">
      <normaloff>:/new/prefix1/Resources/new.png</normaloff>:/new/prefix1/Resources/new.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>&amp;New Project</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+N</string>
    </property>
   </action>
-  <action name="actionFileOpen" >
-   <property name="icon" >
-    <iconset resource="../../projdesigner.qrc" >
+  <action name="actionFileOpen">
+   <property name="icon">
+    <iconset resource="../../projdesigner.qrc">
      <normaloff>:/new/prefix1/Resources/open.png</normaloff>:/new/prefix1/Resources/open.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>&amp;Open Project...</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+O</string>
    </property>
   </action>
-  <action name="actionFileSave" >
-   <property name="icon" >
-    <iconset resource="../../projdesigner.qrc" >
+  <action name="actionFileSave">
+   <property name="icon">
+    <iconset resource="../../projdesigner.qrc">
      <normaloff>:/new/prefix1/Resources/save.png</normaloff>:/new/prefix1/Resources/save.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>&amp;Save Project</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+S</string>
    </property>
   </action>
-  <action name="actionFileSaveAs" >
-   <property name="icon" >
-    <iconset resource="../../projdesigner.qrc" >
+  <action name="actionFileSaveAs">
+   <property name="icon">
+    <iconset resource="../../projdesigner.qrc">
      <normaloff>:/new/prefix1/Resources/saveAs.png</normaloff>:/new/prefix1/Resources/saveAs.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>Save Project &amp;As...</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+A</string>
    </property>
   </action>
-  <action name="actionFileSyncClients" >
-   <property name="icon" >
-    <iconset resource="../../projdesigner.qrc" >
+  <action name="actionFileSyncClients">
+   <property name="icon">
+    <iconset resource="../../projdesigner.qrc">
      <normaloff>:/new/prefix1/Resources/sync.png</normaloff>:/new/prefix1/Resources/sync.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>Sync Clients</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+Y</string>
    </property>
   </action>
-  <action name="actionFileExit" >
-   <property name="icon" >
-    <iconset resource="../../projdesigner.qrc" >
+  <action name="actionFileExit">
+   <property name="icon">
+    <iconset resource="../../projdesigner.qrc">
      <normaloff>:/new/prefix1/Resources/exit.png</normaloff>:/new/prefix1/Resources/exit.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>Exit</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+Q</string>
    </property>
   </action>
-  <action name="actionFileExitAll" >
-   <property name="icon" >
-    <iconset resource="../../projdesigner.qrc" >
+  <action name="actionFileExitAll">
+   <property name="icon">
+    <iconset resource="../../projdesigner.qrc">
      <normaloff>:/new/prefix1/Resources/exitAll.png</normaloff>:/new/prefix1/Resources/exitAll.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>Exit All</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+W</string>
    </property>
   </action>
-  <action name="actionEditDesignDistortionMap" >
-   <property name="icon" >
-    <iconset resource="../../projdesigner.qrc" >
+  <action name="actionEditDesignDistortionMap">
+   <property name="icon">
+    <iconset resource="../../projdesigner.qrc">
      <normaloff>:/new/prefix1/Resources/distortionMode.png</normaloff>:/new/prefix1/Resources/distortionMode.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>&amp;Distortion Map</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Alt+D</string>
    </property>
-   <property name="shortcutContext" >
+   <property name="shortcutContext">
     <enum>Qt::ApplicationShortcut</enum>
    </property>
   </action>
-  <action name="actionEditDesignBlendMap" >
-   <property name="icon" >
-    <iconset resource="../../projdesigner.qrc" >
+  <action name="actionEditDesignBlendMap">
+   <property name="icon">
+    <iconset resource="../../projdesigner.qrc">
      <normaloff>:/new/prefix1/Resources/blendMode.png</normaloff>:/new/prefix1/Resources/blendMode.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>Blend Map</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Alt+B</string>
    </property>
-   <property name="shortcutContext" >
+   <property name="shortcutContext">
     <enum>Qt::ApplicationShortcut</enum>
    </property>
   </action>
-  <action name="actionEditPreference" >
-   <property name="icon" >
-    <iconset resource="../../projdesigner.qrc" >
+  <action name="actionEditPreference">
+   <property name="icon">
+    <iconset resource="../../projdesigner.qrc">
      <normaloff>:/new/prefix1/Resources/settings.png</normaloff>:/new/prefix1/Resources/settings.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>Preferences</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Preferences</string>
    </property>
-   <property name="toolTip" >
+   <property name="toolTip">
     <string>Preferences</string>
    </property>
-   <property name="statusTip" >
+   <property name="statusTip">
     <string>Opens the preferences dialog</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Alt+P</string>
    </property>
-   <property name="shortcutContext" >
+   <property name="shortcutContext">
     <enum>Qt::ApplicationShortcut</enum>
    </property>
   </action>
-  <action name="actionViewPerspective" >
-   <property name="text" >
+  <action name="actionViewPerspective">
+   <property name="text">
     <string>&amp;Perspective</string>
    </property>
   </action>
-  <action name="actionViewCenter" >
-   <property name="text" >
+  <action name="actionViewCenter">
+   <property name="text">
     <string>&amp;Center</string>
    </property>
   </action>
-  <action name="actionViewTop" >
-   <property name="text" >
+  <action name="actionViewTop">
+   <property name="text">
     <string>Top</string>
    </property>
   </action>
-  <action name="actionViewSide" >
-   <property name="text" >
+  <action name="actionViewSide">
+   <property name="text">
     <string>Side</string>
    </property>
   </action>
-  <action name="actionViewFront" >
-   <property name="text" >
+  <action name="actionViewFront">
+   <property name="text">
     <string>Front</string>
    </property>
   </action>
-  <action name="actionViewAxis" >
-   <property name="text" >
+  <action name="actionViewAxis">
+   <property name="text">
     <string>&amp;Axis</string>
    </property>
   </action>
-  <action name="actionViewGrid" >
-   <property name="text" >
+  <action name="actionViewGrid">
+   <property name="text">
     <string>&amp;Grid</string>
    </property>
   </action>
-  <action name="actionViewInfo" >
-   <property name="text" >
+  <action name="actionViewInfo">
+   <property name="text">
     <string>&amp;Info</string>
    </property>
   </action>
-  <action name="actionViewViewAll" >
-   <property name="text" >
+  <action name="actionViewViewAll">
+   <property name="text">
     <string>View All</string>
    </property>
   </action>
-  <action name="actionWindowSceneViewer" >
-   <property name="text" >
+  <action name="actionWindowSceneViewer">
+   <property name="text">
     <string>Scene Viewer</string>
    </property>
   </action>
-  <action name="actionWindowSceneDialog" >
-   <property name="text" >
+  <action name="actionWindowSceneDialog">
+   <property name="text">
     <string>Scene</string>
    </property>
   </action>
-  <action name="actionWindowScreenDialog" >
-   <property name="text" >
+  <action name="actionWindowScreenDialog">
+   <property name="text">
     <string>Screen</string>
    </property>
   </action>
-  <action name="actionWindowChannelManager" >
-   <property name="text" >
+  <action name="actionWindowChannelManager">
+   <property name="text">
     <string>Channels</string>
    </property>
   </action>
-  <action name="actionHelpHelp" >
-   <property name="icon" >
-    <iconset resource="../../projdesigner.qrc" >
+  <action name="actionHelpHelp">
+   <property name="icon">
+    <iconset resource="../../projdesigner.qrc">
      <normaloff>:/new/prefix1/Resources/help.png</normaloff>:/new/prefix1/Resources/help.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>Help...</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>F1</string>
    </property>
   </action>
-  <action name="actionHelpAbout" >
-   <property name="icon" >
-    <iconset resource="../../projdesigner.qrc" >
+  <action name="actionHelpAbout">
+   <property name="icon">
+    <iconset resource="../../projdesigner.qrc">
      <normaloff>:/new/prefix1/Resources/projDesigner.png</normaloff>:/new/prefix1/Resources/projDesigner.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>About Projection Designer</string>
    </property>
   </action>
-  <action name="actionFileExportDataset" >
-   <property name="icon" >
-    <iconset resource="../../projdesigner.qrc" >
+  <action name="actionFileExportDataset">
+   <property name="icon">
+    <iconset resource="../../projdesigner.qrc">
      <normaloff>:/new/prefix1/Resources/export.png</normaloff>:/new/prefix1/Resources/export.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>Export Data set</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+E</string>
    </property>
   </action>
-  <action name="actionHelpPlugins" >
-   <property name="icon" >
-    <iconset resource="../../projdesigner.qrc" >
+  <action name="actionHelpPlugins">
+   <property name="icon">
+    <iconset resource="../../projdesigner.qrc">
      <normaloff>:/new/prefix1/Resources/plugins.png</normaloff>:/new/prefix1/Resources/plugins.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>Plugins...</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+Alt+P</string>
    </property>
   </action>
-  <action name="actionHelpAbout_Qt" >
-   <property name="icon" >
-    <iconset resource="../../projdesigner.qrc" >
+  <action name="actionHelpAbout_Qt">
+   <property name="icon">
+    <iconset resource="../../projdesigner.qrc">
      <normaloff>:/new/prefix1/Resources/aboutQt.png</normaloff>:/new/prefix1/Resources/aboutQt.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>About Qt</string>
    </property>
@@ -394,5 +395,5 @@
  </customwidgets>
  <resources>
-  <include location="../../projdesigner.qrc" />
+  <include location="../../projdesigner.qrc"/>
  </resources>
  <connections/>
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qpanelwidget.ui
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qpanelwidget.ui	(revision 2)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qpanelwidget.ui	(revision 42)
@@ -1,9 +1,7 @@
-<ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>QPanelWidget</class>
- <widget class="QWidget" name="QPanelWidget" >
-  <property name="geometry" >
+ <widget class="QWidget" name="QPanelWidget">
+  <property name="geometry">
    <rect>
     <x>0</x>
@@ -13,38 +11,38 @@
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Projection Designer</string>
   </property>
-  <layout class="QHBoxLayout" >
-   <property name="margin" >
+  <layout class="QHBoxLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="margin">
     <number>0</number>
    </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
    <item>
-    <widget class="QTabWidget" name="tabWidget" >
-     <widget class="QWidget" name="channelsTab" >
-      <attribute name="title" >
+    <widget class="QTabWidget" name="tabWidget">
+     <widget class="QWidget" name="channelsTab">
+      <attribute name="title">
        <string>Channels</string>
       </attribute>
-      <layout class="QHBoxLayout" >
-       <property name="margin" >
+      <layout class="QHBoxLayout">
+       <property name="spacing">
+        <number>6</number>
+       </property>
+       <property name="margin">
         <number>4</number>
        </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
        <item>
-        <layout class="QVBoxLayout" >
-         <property name="margin" >
+        <layout class="QVBoxLayout">
+         <property name="spacing">
+          <number>6</number>
+         </property>
+         <property name="margin">
           <number>0</number>
          </property>
-         <property name="spacing" >
-          <number>6</number>
-         </property>
          <item>
-          <widget class="projection::QChannelManagerWidget" name="channelManager" >
-           <property name="maximumSize" >
+          <widget class="projection::QChannelManagerWidget" name="channelManager" native="true">
+           <property name="maximumSize">
             <size>
              <width>16777215</width>
@@ -52,5 +50,5 @@
             </size>
            </property>
-           <property name="focusPolicy" >
+           <property name="focusPolicy">
             <enum>Qt::StrongFocus</enum>
            </property>
@@ -58,26 +56,24 @@
          </item>
          <item>
-          <widget class="QGroupBox" name="channelGroup" >
-           <property name="sizePolicy" >
-            <sizepolicy>
-             <hsizetype>5</hsizetype>
-             <vsizetype>5</vsizetype>
+          <widget class="QGroupBox" name="channelGroup">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
-           <property name="title" >
+           <property name="title">
             <string>Channel</string>
            </property>
-           <layout class="QHBoxLayout" >
-            <property name="margin" >
+           <layout class="QHBoxLayout">
+            <property name="spacing">
+             <number>6</number>
+            </property>
+            <property name="margin">
              <number>4</number>
             </property>
-            <property name="spacing" >
-             <number>6</number>
-            </property>
             <item>
-             <widget class="projection::QChannelWidget" name="channel" >
-              <property name="focusPolicy" >
+             <widget class="projection::QChannelWidget" name="channel" native="true">
+              <property name="focusPolicy">
                <enum>Qt::StrongFocus</enum>
               </property>
@@ -89,8 +85,8 @@
          <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>
@@ -104,24 +100,24 @@
       </layout>
      </widget>
-     <widget class="QWidget" name="screenTab" >
-      <attribute name="title" >
+     <widget class="QWidget" name="screenTab">
+      <attribute name="title">
        <string>Screen</string>
       </attribute>
-      <layout class="QVBoxLayout" >
-       <property name="margin" >
+      <layout class="QVBoxLayout">
+       <property name="spacing">
+        <number>6</number>
+       </property>
+       <property name="margin">
         <number>0</number>
        </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
        <item>
-        <widget class="projection::QScreenWidget" name="screen" />
+        <widget class="projection::QScreenWidget" name="screen" native="true"/>
        </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>
@@ -133,24 +129,24 @@
       </layout>
      </widget>
-     <widget class="QWidget" name="sceneTab" >
-      <attribute name="title" >
+     <widget class="QWidget" name="sceneTab">
+      <attribute name="title">
        <string>Scene</string>
       </attribute>
-      <layout class="QVBoxLayout" >
-       <property name="margin" >
+      <layout class="QVBoxLayout">
+       <property name="spacing">
+        <number>6</number>
+       </property>
+       <property name="margin">
         <number>0</number>
        </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
        <item>
-        <widget class="projection::QSceneWidget" name="scene" />
+        <widget class="projection::QSceneWidget" name="scene" native="true"/>
        </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>
@@ -166,5 +162,4 @@
   </layout>
  </widget>
- <pixmapfunction></pixmapfunction>
  <customwidgets>
   <customwidget>
@@ -172,6 +167,4 @@
    <extends>QWidget</extends>
    <header>gui/QChannelManagerWidget.h</header>
-   <container>0</container>
-   <pixmap></pixmap>
   </customwidget>
   <customwidget>
@@ -179,6 +172,4 @@
    <extends>QWidget</extends>
    <header>gui/QScreenWidget.h</header>
-   <container>0</container>
-   <pixmap></pixmap>
   </customwidget>
   <customwidget>
@@ -186,6 +177,4 @@
    <extends>QWidget</extends>
    <header>gui/QChannelWidget.h</header>
-   <container>0</container>
-   <pixmap></pixmap>
   </customwidget>
   <customwidget>
@@ -193,6 +182,4 @@
    <extends>QWidget</extends>
    <header>gui/QSceneWidget.h</header>
-   <container>0</container>
-   <pixmap></pixmap>
   </customwidget>
  </customwidgets>
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qpreferencedialog.ui
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qpreferencedialog.ui	(revision 2)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qpreferencedialog.ui	(revision 42)
@@ -1,6 +1,7 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>QPreferenceDialog</class>
- <widget class="QDialog" name="QPreferenceDialog" >
-  <property name="geometry" >
+ <widget class="QDialog" name="QPreferenceDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
@@ -10,49 +11,49 @@
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Preference</string>
   </property>
-  <property name="windowIcon" >
-   <iconset resource="../../projdesigner.qrc" >
+  <property name="windowIcon">
+   <iconset resource="../../projdesigner.qrc">
     <normaloff>:/new/prefix1/Resources/settings.png</normaloff>:/new/prefix1/Resources/settings.png</iconset>
   </property>
-  <layout class="QHBoxLayout" >
-   <property name="spacing" >
+  <layout class="QHBoxLayout">
+   <property name="spacing">
     <number>6</number>
    </property>
-   <property name="margin" >
+   <property name="margin">
     <number>4</number>
    </property>
    <item>
-    <layout class="QVBoxLayout" >
-     <property name="spacing" >
+    <layout class="QVBoxLayout">
+     <property name="spacing">
       <number>6</number>
      </property>
-     <property name="margin" >
+     <property name="margin">
       <number>0</number>
      </property>
      <item>
-      <widget class="QGroupBox" name="gridGroupBox" >
-       <property name="title" >
+      <widget class="QGroupBox" name="gridGroupBox">
+       <property name="title">
         <string>Grid</string>
        </property>
-       <layout class="QHBoxLayout" >
-        <property name="spacing" >
+       <layout class="QHBoxLayout">
+        <property name="spacing">
          <number>6</number>
         </property>
-        <property name="margin" >
+        <property name="margin">
          <number>4</number>
         </property>
         <item>
-         <layout class="QHBoxLayout" >
-          <property name="spacing" >
+         <layout class="QHBoxLayout">
+          <property name="spacing">
            <number>6</number>
           </property>
-          <property name="margin" >
+          <property name="margin">
            <number>0</number>
           </property>
           <item>
-           <widget class="QLabel" name="gridSizeLabel" >
-            <property name="text" >
+           <widget class="QLabel" name="gridSizeLabel">
+            <property name="text">
              <string>Size</string>
             </property>
@@ -60,6 +61,6 @@
           </item>
           <item>
-           <widget class="QLineEdit" name="gridSizeEdit" >
-            <property name="minimumSize" >
+           <widget class="QLineEdit" name="gridSizeEdit">
+            <property name="minimumSize">
              <size>
               <width>64</width>
@@ -67,5 +68,5 @@
              </size>
             </property>
-            <property name="maximumSize" >
+            <property name="maximumSize">
              <size>
               <width>64</width>
@@ -76,6 +77,6 @@
           </item>
           <item>
-           <widget class="QLabel" name="gridSubdivLabel" >
-            <property name="text" >
+           <widget class="QLabel" name="gridSubdivLabel">
+            <property name="text">
              <string>Subdivision</string>
             </property>
@@ -83,12 +84,12 @@
           </item>
           <item>
-           <widget class="QSpinBox" name="gridSubdivSpinBox" />
+           <widget class="QSpinBox" name="gridSubdivSpinBox"/>
           </item>
           <item>
            <spacer>
-            <property name="orientation" >
+            <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeHint" stdset="0" >
+            <property name="sizeHint" stdset="0">
              <size>
               <width>40</width>
@@ -104,34 +105,34 @@
      </item>
      <item>
-      <widget class="QGroupBox" name="offscreenSceneRenderingGroupBox" >
-       <property name="title" >
+      <widget class="QGroupBox" name="offscreenSceneRenderingGroupBox">
+       <property name="title">
         <string>Off-screen Scene Rendering</string>
        </property>
-       <layout class="QHBoxLayout" >
-        <property name="spacing" >
+       <layout class="QHBoxLayout">
+        <property name="spacing">
          <number>6</number>
         </property>
-        <property name="margin" >
+        <property name="margin">
          <number>4</number>
         </property>
         <item>
-         <layout class="QVBoxLayout" >
-          <property name="spacing" >
+         <layout class="QVBoxLayout">
+          <property name="spacing">
            <number>6</number>
           </property>
-          <property name="margin" >
+          <property name="margin">
            <number>0</number>
           </property>
           <item>
-           <layout class="QHBoxLayout" >
-            <property name="spacing" >
+           <layout class="QHBoxLayout">
+            <property name="spacing">
              <number>6</number>
             </property>
-            <property name="margin" >
+            <property name="margin">
              <number>0</number>
             </property>
             <item>
-             <widget class="QLabel" name="bufferSizeLabel" >
-              <property name="text" >
+             <widget class="QLabel" name="bufferSizeLabel">
+              <property name="text">
                <string>Buffer size</string>
               </property>
@@ -139,32 +140,32 @@
             </item>
             <item>
-             <widget class="QComboBox" name="bufferWidthComboBox" >
-              <item>
-               <property name="text" >
+             <widget class="QComboBox" name="bufferWidthComboBox">
+              <item>
+               <property name="text">
                 <string>128</string>
                </property>
               </item>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>256</string>
                </property>
               </item>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>512</string>
                </property>
               </item>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>1024</string>
                </property>
               </item>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>2048</string>
                </property>
               </item>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>4096</string>
                </property>
@@ -173,32 +174,32 @@
             </item>
             <item>
-             <widget class="QComboBox" name="bufferHeightComboBox" >
-              <item>
-               <property name="text" >
+             <widget class="QComboBox" name="bufferHeightComboBox">
+              <item>
+               <property name="text">
                 <string>128</string>
                </property>
               </item>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>256</string>
                </property>
               </item>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>512</string>
                </property>
               </item>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>1024</string>
                </property>
               </item>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>2048</string>
                </property>
               </item>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>4096</string>
                </property>
@@ -208,8 +209,8 @@
             <item>
              <spacer>
-              <property name="orientation" >
+              <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
-              <property name="sizeHint" stdset="0" >
+              <property name="sizeHint" stdset="0">
                <size>
                 <width>40</width>
@@ -227,34 +228,34 @@
      </item>
      <item>
-      <widget class="QGroupBox" name="blendMapGroupBox" >
-       <property name="title" >
+      <widget class="QGroupBox" name="blendMapGroupBox">
+       <property name="title">
         <string>Blend Map</string>
        </property>
-       <layout class="QHBoxLayout" >
-        <property name="spacing" >
+       <layout class="QHBoxLayout">
+        <property name="spacing">
          <number>6</number>
         </property>
-        <property name="margin" >
+        <property name="margin">
          <number>4</number>
         </property>
         <item>
-         <layout class="QVBoxLayout" >
-          <property name="spacing" >
+         <layout class="QVBoxLayout">
+          <property name="spacing">
            <number>6</number>
           </property>
-          <property name="margin" >
+          <property name="margin">
            <number>0</number>
           </property>
           <item>
-           <layout class="QHBoxLayout" >
-            <property name="spacing" >
+           <layout class="QHBoxLayout">
+            <property name="spacing">
              <number>6</number>
             </property>
-            <property name="margin" >
+            <property name="margin">
              <number>0</number>
             </property>
             <item>
-             <widget class="QCheckBox" name="softEdgeCheckBox" >
-              <property name="text" >
+             <widget class="QCheckBox" name="softEdgeCheckBox">
+              <property name="text">
                <string>Soft edge</string>
               </property>
@@ -262,12 +263,12 @@
             </item>
             <item>
-             <widget class="QLabel" name="blendEdgeWidthLabel" >
-              <property name="sizePolicy" >
-               <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
+             <widget class="QLabel" name="blendEdgeWidthLabel">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
-              <property name="text" >
+              <property name="text">
                <string> Width</string>
               </property>
@@ -275,9 +276,9 @@
             </item>
             <item>
-             <widget class="QSpinBox" name="blendEdgeWidthSpinBox" />
-            </item>
-            <item>
-             <widget class="QLabel" name="blendEdgeExponentLabel" >
-              <property name="text" >
+             <widget class="QSpinBox" name="blendEdgeWidthSpinBox"/>
+            </item>
+            <item>
+             <widget class="QLabel" name="blendEdgeExponentLabel">
+              <property name="text">
                <string>Exponent</string>
               </property>
@@ -285,6 +286,6 @@
             </item>
             <item>
-             <widget class="QLineEdit" name="blendEdgeExponentEdit" >
-              <property name="maximumSize" >
+             <widget class="QLineEdit" name="blendEdgeExponentEdit">
+              <property name="maximumSize">
                <size>
                 <width>32</width>
@@ -296,8 +297,8 @@
             <item>
              <spacer>
-              <property name="orientation" >
+              <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
-              <property name="sizeHint" stdset="0" >
+              <property name="sizeHint" stdset="0">
                <size>
                 <width>20</width>
@@ -315,34 +316,34 @@
      </item>
      <item>
-      <widget class="QGroupBox" name="exportGroupBox" >
-       <property name="title" >
+      <widget class="QGroupBox" name="exportGroupBox">
+       <property name="title">
         <string>Export</string>
        </property>
-       <layout class="QHBoxLayout" >
-        <property name="spacing" >
+       <layout class="QHBoxLayout">
+        <property name="spacing">
          <number>6</number>
         </property>
-        <property name="margin" >
+        <property name="margin">
          <number>4</number>
         </property>
         <item>
-         <layout class="QVBoxLayout" >
-          <property name="spacing" >
+         <layout class="QVBoxLayout">
+          <property name="spacing">
            <number>6</number>
           </property>
-          <property name="margin" >
+          <property name="margin">
            <number>0</number>
           </property>
           <item>
-           <layout class="QHBoxLayout" >
-            <property name="spacing" >
+           <layout class="QHBoxLayout">
+            <property name="spacing">
              <number>6</number>
             </property>
-            <property name="margin" >
+            <property name="margin">
              <number>0</number>
             </property>
             <item>
-             <widget class="QLabel" name="exportSizeLabel" >
-              <property name="text" >
+             <widget class="QLabel" name="exportSizeLabel">
+              <property name="text">
                <string>Image size</string>
               </property>
@@ -350,25 +351,25 @@
             </item>
             <item>
-             <widget class="QComboBox" name="exportWidthComboBox" >
-              <property name="editable" >
+             <widget class="QComboBox" name="exportWidthComboBox">
+              <property name="editable">
                <bool>true</bool>
               </property>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>256</string>
                </property>
               </item>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>512</string>
                </property>
               </item>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>1024</string>
                </property>
               </item>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>2048</string>
                </property>
@@ -377,25 +378,25 @@
             </item>
             <item>
-             <widget class="QComboBox" name="exportHeightComboBox" >
-              <property name="editable" >
+             <widget class="QComboBox" name="exportHeightComboBox">
+              <property name="editable">
                <bool>true</bool>
               </property>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>256</string>
                </property>
               </item>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>512</string>
                </property>
               </item>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>1024</string>
                </property>
               </item>
               <item>
-               <property name="text" >
+               <property name="text">
                 <string>2048</string>
                </property>
@@ -405,8 +406,8 @@
             <item>
              <spacer>
-              <property name="orientation" >
+              <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
-              <property name="sizeHint" stdset="0" >
+              <property name="sizeHint" stdset="0">
                <size>
                 <width>40</width>
@@ -419,6 +420,6 @@
           </item>
           <item>
-           <widget class="QLabel" name="exportFileNamePatternLabel" >
-            <property name="text" >
+           <widget class="QLabel" name="exportFileNamePatternLabel">
+            <property name="text">
              <string>Export file name pattern</string>
             </property>
@@ -426,20 +427,20 @@
           </item>
           <item>
-           <layout class="QHBoxLayout" >
-            <property name="spacing" >
+           <layout class="QHBoxLayout">
+            <property name="spacing">
              <number>6</number>
             </property>
-            <property name="margin" >
+            <property name="margin">
              <number>0</number>
             </property>
             <item>
              <spacer>
-              <property name="orientation" >
+              <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
-              <property name="sizeType" >
+              <property name="sizeType">
                <enum>QSizePolicy::Fixed</enum>
               </property>
-              <property name="sizeHint" stdset="0" >
+              <property name="sizeHint" stdset="0">
                <size>
                 <width>10</width>
@@ -450,28 +451,28 @@
             </item>
             <item>
-             <layout class="QGridLayout" >
-              <property name="margin" >
+             <layout class="QGridLayout">
+              <property name="margin">
                <number>0</number>
               </property>
-              <property name="spacing" >
+              <property name="spacing">
                <number>6</number>
               </property>
-              <item row="0" column="0" >
-               <widget class="QLabel" name="exportDistortMapPatternLabel" >
-                <property name="text" >
+              <item row="0" column="0">
+               <widget class="QLabel" name="exportDistortMapPatternLabel">
+                <property name="text">
                  <string>Distortion map file</string>
                 </property>
                </widget>
               </item>
-              <item row="2" column="0" >
-               <widget class="QLabel" name="exportViewMatrixPatternLabel" >
-                <property name="text" >
+              <item row="2" column="0">
+               <widget class="QLabel" name="exportViewMatrixPatternLabel">
+                <property name="text">
                  <string>View matrix file</string>
                 </property>
                </widget>
               </item>
-              <item row="0" column="1" >
-               <widget class="QLineEdit" name="exportDistortMapPatternEdit" >
-                <property name="minimumSize" >
+              <item row="0" column="1">
+               <widget class="QLineEdit" name="exportDistortMapPatternEdit">
+                <property name="minimumSize">
                  <size>
                   <width>180</width>
@@ -481,13 +482,13 @@
                </widget>
               </item>
-              <item row="2" column="1" >
-               <widget class="QLineEdit" name="exportViewMatrixPatternEdit" />
-              </item>
-              <item row="1" column="1" >
-               <widget class="QLineEdit" name="exportBlendMapPatternEdit" />
-              </item>
-              <item row="1" column="0" >
-               <widget class="QLabel" name="exportBlendMapPatternLabel" >
-                <property name="text" >
+              <item row="2" column="1">
+               <widget class="QLineEdit" name="exportViewMatrixPatternEdit"/>
+              </item>
+              <item row="1" column="1">
+               <widget class="QLineEdit" name="exportBlendMapPatternEdit"/>
+              </item>
+              <item row="1" column="0">
+               <widget class="QLabel" name="exportBlendMapPatternLabel">
+                <property name="text">
                  <string>Blend map file</string>
                 </property>
@@ -498,8 +499,8 @@
             <item>
              <spacer>
-              <property name="orientation" >
+              <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
-              <property name="sizeHint" stdset="0" >
+              <property name="sizeHint" stdset="0">
                <size>
                 <width>40</width>
@@ -518,8 +519,8 @@
      <item>
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Vertical</enum>
        </property>
-       <property name="sizeHint" stdset="0" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>325</width>
@@ -530,6 +531,6 @@
      </item>
      <item>
-      <widget class="QPushButton" name="pB_ClosePrefDiag" >
-       <property name="text" >
+      <widget class="QPushButton" name="pB_ClosePrefDiag">
+       <property name="text">
         <string>Close</string>
        </property>
@@ -541,5 +542,5 @@
  </widget>
  <resources>
-  <include location="../../projdesigner.qrc" />
+  <include location="../../projdesigner.qrc"/>
  </resources>
  <connections>
@@ -550,9 +551,9 @@
    <slot>close()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>172</x>
      <y>345</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>172</x>
      <y>181</y>
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qprojectionmatrixwidget.ui
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qprojectionmatrixwidget.ui	(revision 2)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qprojectionmatrixwidget.ui	(revision 42)
@@ -1,57 +1,55 @@
-<ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>QProjectionMatrixWidget</class>
- <widget class="QWidget" name="QProjectionMatrixWidget" >
-  <property name="geometry" >
+ <widget class="QWidget" name="QProjectionMatrixWidget">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>169</width>
+    <width>190</width>
     <height>110</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Projection Settings</string>
   </property>
-  <layout class="QHBoxLayout" >
-   <property name="margin" >
+  <layout class="QHBoxLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="margin">
     <number>0</number>
    </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
    <item>
-    <widget class="QGroupBox" name="projectionGroup" >
-     <property name="title" >
+    <widget class="QGroupBox" name="projectionGroup">
+     <property name="title">
       <string>Projection</string>
      </property>
-     <layout class="QHBoxLayout" >
-      <property name="margin" >
+     <layout class="QHBoxLayout">
+      <property name="spacing">
+       <number>6</number>
+      </property>
+      <property name="margin">
        <number>0</number>
       </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
       <item>
-       <layout class="QVBoxLayout" >
-        <property name="margin" >
+       <layout class="QVBoxLayout">
+        <property name="spacing">
+         <number>6</number>
+        </property>
+        <property name="margin">
          <number>4</number>
         </property>
-        <property name="spacing" >
-         <number>6</number>
-        </property>
         <item>
-         <layout class="QHBoxLayout" >
-          <property name="margin" >
+         <layout class="QHBoxLayout">
+          <property name="spacing">
+           <number>6</number>
+          </property>
+          <property name="margin">
            <number>0</number>
           </property>
-          <property name="spacing" >
-           <number>6</number>
-          </property>
           <item>
-           <widget class="QLabel" name="fovLabel" >
-            <property name="text" >
+           <widget class="QLabel" name="fovLabel">
+            <property name="text">
              <string>FOV</string>
             </property>
@@ -59,9 +57,9 @@
           </item>
           <item>
-           <widget class="QLineEdit" name="fovEdit" />
+           <widget class="QLineEdit" name="fovEdit"/>
           </item>
           <item>
-           <widget class="QLabel" name="aspectLabel" >
-            <property name="text" >
+           <widget class="QLabel" name="aspectLabel">
+            <property name="text">
              <string>Aspect</string>
             </property>
@@ -69,19 +67,19 @@
           </item>
           <item>
-           <widget class="QLineEdit" name="aspectRatioEdit" />
+           <widget class="QLineEdit" name="aspectRatioEdit"/>
           </item>
          </layout>
         </item>
         <item>
-         <layout class="QHBoxLayout" >
-          <property name="margin" >
+         <layout class="QHBoxLayout">
+          <property name="spacing">
+           <number>6</number>
+          </property>
+          <property name="margin">
            <number>0</number>
           </property>
-          <property name="spacing" >
-           <number>6</number>
-          </property>
           <item>
-           <widget class="QLabel" name="nearLabel" >
-            <property name="text" >
+           <widget class="QLabel" name="nearLabel">
+            <property name="text">
              <string>Near</string>
             </property>
@@ -89,9 +87,9 @@
           </item>
           <item>
-           <widget class="QLineEdit" name="nearEdit" />
+           <widget class="QLineEdit" name="nearEdit"/>
           </item>
           <item>
-           <widget class="QLabel" name="farLabel" >
-            <property name="text" >
+           <widget class="QLabel" name="farLabel">
+            <property name="text">
              <string>Far</string>
             </property>
@@ -99,19 +97,19 @@
           </item>
           <item>
-           <widget class="QLineEdit" name="farEdit" />
+           <widget class="QLineEdit" name="farEdit"/>
           </item>
          </layout>
         </item>
         <item>
-         <layout class="QHBoxLayout" >
-          <property name="margin" >
+         <layout class="QHBoxLayout">
+          <property name="spacing">
+           <number>6</number>
+          </property>
+          <property name="margin">
            <number>0</number>
           </property>
-          <property name="spacing" >
-           <number>6</number>
-          </property>
           <item>
-           <widget class="QLabel" name="offaxisLabel" >
-            <property name="text" >
+           <widget class="QLabel" name="offaxisLabel">
+            <property name="text">
              <string>Off-axis </string>
             </property>
@@ -119,6 +117,6 @@
           </item>
           <item>
-           <widget class="QLabel" name="offaxisXLabel" >
-            <property name="text" >
+           <widget class="QLabel" name="offaxisXLabel">
+            <property name="text">
              <string>X</string>
             </property>
@@ -126,9 +124,9 @@
           </item>
           <item>
-           <widget class="QLineEdit" name="offaxisXEdit" />
+           <widget class="QLineEdit" name="offaxisXEdit"/>
           </item>
           <item>
-           <widget class="QLabel" name="offaxisYLabel" >
-            <property name="text" >
+           <widget class="QLabel" name="offaxisYLabel">
+            <property name="text">
              <string>Y</string>
             </property>
@@ -136,5 +134,5 @@
           </item>
           <item>
-           <widget class="QLineEdit" name="offaxisYEdit" />
+           <widget class="QLineEdit" name="offaxisYEdit"/>
           </item>
          </layout>
@@ -147,5 +145,4 @@
   </layout>
  </widget>
- <pixmapfunction></pixmapfunction>
  <tabstops>
   <tabstop>fovEdit</tabstop>
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qscenewidget.ui
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qscenewidget.ui	(revision 2)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qscenewidget.ui	(revision 42)
@@ -1,6 +1,7 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>QSceneWidget</class>
- <widget class="QWidget" name="QSceneWidget" >
-  <property name="geometry" >
+ <widget class="QWidget" name="QSceneWidget">
+  <property name="geometry">
    <rect>
     <x>0</x>
@@ -10,25 +11,25 @@
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Scene Settings</string>
   </property>
-  <layout class="QHBoxLayout" >
-   <property name="margin" >
+  <layout class="QHBoxLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="margin">
     <number>4</number>
    </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
    <item>
-    <layout class="QVBoxLayout" >
-     <property name="margin" >
+    <layout class="QVBoxLayout">
+     <property name="spacing">
+      <number>6</number>
+     </property>
+     <property name="margin">
       <number>0</number>
      </property>
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <item>
-      <widget class="projection::QTransformMatrixWidget" native="1" name="transformWidget" >
-       <property name="focusPolicy" >
+     <item>
+      <widget class="projection::QTransformMatrixWidget" name="transformWidget" native="true">
+       <property name="focusPolicy">
         <enum>Qt::StrongFocus</enum>
        </property>
@@ -36,34 +37,34 @@
      </item>
      <item>
-      <widget class="QGroupBox" name="contentGroup" >
-       <property name="title" >
+      <widget class="QGroupBox" name="contentGroup">
+       <property name="title">
         <string>Content</string>
        </property>
-       <layout class="QHBoxLayout" >
-        <property name="margin" >
+       <layout class="QHBoxLayout">
+        <property name="spacing">
+         <number>6</number>
+        </property>
+        <property name="margin">
          <number>4</number>
         </property>
-        <property name="spacing" >
-         <number>6</number>
-        </property>
         <item>
-         <layout class="QVBoxLayout" >
-          <property name="margin" >
+         <layout class="QVBoxLayout">
+          <property name="spacing">
+           <number>6</number>
+          </property>
+          <property name="margin">
            <number>0</number>
           </property>
-          <property name="spacing" >
-           <number>6</number>
-          </property>
           <item>
-           <layout class="QHBoxLayout" >
-            <property name="margin" >
+           <layout class="QHBoxLayout">
+            <property name="spacing">
+             <number>6</number>
+            </property>
+            <property name="margin">
              <number>0</number>
             </property>
-            <property name="spacing" >
-             <number>6</number>
-            </property>
             <item>
-             <widget class="QLabel" name="typeLabel" >
-              <property name="text" >
+             <widget class="QLabel" name="typeLabel">
+              <property name="text">
                <string>Type</string>
               </property>
@@ -71,6 +72,6 @@
             </item>
             <item>
-             <widget class="QComboBox" name="typeComboBox" >
-              <property name="minimumSize" >
+             <widget class="QComboBox" name="typeComboBox">
+              <property name="minimumSize">
                <size>
                 <width>96</width>
@@ -82,8 +83,8 @@
             <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>
@@ -96,9 +97,9 @@
           </item>
           <item>
-           <widget class="QStackedWidget" name="stackedWidget" >
-            <property name="focusPolicy" >
+           <widget class="QStackedWidget" name="stackedWidget">
+            <property name="focusPolicy">
              <enum>Qt::StrongFocus</enum>
             </property>
-            <property name="currentIndex" >
+            <property name="currentIndex">
              <number>-1</number>
             </property>
@@ -111,6 +112,6 @@
      </item>
      <item>
-      <widget class="QCheckBox" name="showInDesignViewCheckBox" >
-       <property name="text" >
+      <widget class="QCheckBox" name="showInDesignViewCheckBox">
+       <property name="text">
         <string>Show in Design View</string>
        </property>
@@ -118,14 +119,14 @@
      </item>
      <item>
-      <layout class="QHBoxLayout" >
-       <property name="margin" >
+      <layout class="QHBoxLayout">
+       <property name="spacing">
+        <number>6</number>
+       </property>
+       <property name="margin">
         <number>0</number>
        </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
-       <item>
-        <widget class="QLabel" name="sceneSizeLabel" >
-         <property name="text" >
+       <item>
+        <widget class="QLabel" name="sceneSizeLabel">
+         <property name="text">
           <string>Scene size</string>
          </property>
@@ -133,6 +134,6 @@
        </item>
        <item>
-        <widget class="QLineEdit" name="sceneSizeEdit" >
-         <property name="maximumSize" >
+        <widget class="QLineEdit" name="sceneSizeEdit">
+         <property name="maximumSize">
           <size>
            <width>64</width>
@@ -144,8 +145,8 @@
        <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>
@@ -158,14 +159,14 @@
      </item>
      <item>
-      <layout class="QHBoxLayout" >
-       <property name="margin" >
+      <layout class="QHBoxLayout">
+       <property name="spacing">
+        <number>6</number>
+       </property>
+       <property name="margin">
         <number>0</number>
        </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
-       <item>
-        <widget class="QCheckBox" name="gridCheckBox" >
-         <property name="text" >
+       <item>
+        <widget class="QCheckBox" name="gridCheckBox">
+         <property name="text">
           <string>Grid</string>
          </property>
@@ -173,6 +174,6 @@
        </item>
        <item>
-        <widget class="QLabel" name="gridSizeLabel" >
-         <property name="text" >
+        <widget class="QLabel" name="gridSizeLabel">
+         <property name="text">
           <string>Size</string>
          </property>
@@ -180,6 +181,6 @@
        </item>
        <item>
-        <widget class="QLineEdit" name="gridSizeEdit" >
-         <property name="maximumSize" >
+        <widget class="QLineEdit" name="gridSizeEdit">
+         <property name="maximumSize">
           <size>
            <width>64</width>
@@ -191,8 +192,8 @@
        <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>
@@ -205,17 +206,17 @@
      </item>
      <item>
-      <layout class="QHBoxLayout" >
-       <property name="margin" >
+      <layout class="QHBoxLayout">
+       <property name="spacing">
+        <number>6</number>
+       </property>
+       <property name="margin">
         <number>0</number>
        </property>
-       <property name="spacing" >
-        <number>6</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>
@@ -226,6 +227,6 @@
        </item>
        <item>
-        <widget class="QPushButton" name="centerViewButton" >
-         <property name="text" >
+        <widget class="QPushButton" name="centerViewButton">
+         <property name="text">
           <string>Center View</string>
          </property>
@@ -233,6 +234,6 @@
        </item>
        <item>
-        <widget class="QPushButton" name="viewAllButton" >
-         <property name="text" >
+        <widget class="QPushButton" name="viewAllButton">
+         <property name="text">
           <string>ViewAll</string>
          </property>
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qscreenwidget.ui
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qscreenwidget.ui	(revision 2)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qscreenwidget.ui	(revision 42)
@@ -1,603 +1,598 @@
-<ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>QScreenWidget</class>
- <widget class="QWidget" name="QScreenWidget" >
-  <property name="geometry" >
+ <widget class="QWidget" name="QScreenWidget">
+  <property name="geometry">
    <rect>
-	<x>0</x>
-	<y>0</y>
-	<width>183</width>
-	<height>222</height>
+    <x>0</x>
+    <y>0</y>
+    <width>197</width>
+    <height>242</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Screen Settings</string>
   </property>
-  <layout class="QHBoxLayout" >
-   <property name="margin" >
-	<number>4</number>
+  <layout class="QHBoxLayout">
+   <property name="spacing">
+    <number>6</number>
    </property>
-   <property name="spacing" >
-	<number>6</number>
+   <property name="margin">
+    <number>4</number>
    </property>
    <item>
-	<layout class="QVBoxLayout" >
-	 <property name="margin" >
-	  <number>0</number>
-	 </property>
-	 <property name="spacing" >
-	  <number>6</number>
-	 </property>
-	 <item>
-	  <widget class="projection::QTransformMatrixWidget" name="transformWidget" >
-	   <property name="focusPolicy" >
-		<enum>Qt::StrongFocus</enum>
-	   </property>
-	  </widget>
-	 </item>
-	 <item>
-	  <widget class="QGroupBox" name="shapeGroup" >
-	   <property name="title" >
-		<string>Shape</string>
-	   </property>
-	   <layout class="QHBoxLayout" >
-		<property name="margin" >
-		 <number>4</number>
-		</property>
-		<property name="spacing" >
-		 <number>6</number>
-		</property>
-		<item>
-		 <layout class="QVBoxLayout" >
-		  <property name="margin" >
-		   <number>0</number>
-		  </property>
-		  <property name="spacing" >
-		   <number>6</number>
-		  </property>
-		  <item>
-		   <layout class="QHBoxLayout" >
-			<property name="margin" >
-			 <number>0</number>
-			</property>
-			<property name="spacing" >
-			 <number>6</number>
-			</property>
-			<item>
-			 <widget class="QLabel" name="typeLabel" >
-			  <property name="text" >
-			   <string>Type</string>
-			  </property>
-			 </widget>
-			</item>
-			<item>
-			 <widget class="QComboBox" name="typeComboBox" >
-			  <property name="minimumSize" >
-			   <size>
-				<width>96</width>
-				<height>0</height>
-			   </size>
-			  </property>
-			  <item>
-			   <property name="text" >
-				<string>Dome</string>
-			   </property>
-			  </item>
-			  <item>
-			   <property name="text" >
-				<string>Plane</string>
-			   </property>
-			  </item>
-			  <item>
-			   <property name="text" >
-				<string>Box</string>
-			   </property>
-			  </item>
-			 </widget>
-			</item>
-			<item>
-			 <spacer>
-			  <property name="orientation" >
-			   <enum>Qt::Horizontal</enum>
-			  </property>
-			  <property name="sizeHint" >
-			   <size>
-				<width>40</width>
-				<height>20</height>
-			   </size>
-			  </property>
-			 </spacer>
-			</item>
-		   </layout>
-		  </item>
-		  <item>
-		   <widget class="QStackedWidget" name="stackedWidget" >
-			<property name="currentIndex" >
-			 <number>0</number>
-			</property>
-			<widget class="QWidget" name="domePage" >
-			 <layout class="QHBoxLayout" >
-			  <property name="margin" >
-			   <number>4</number>
-			  </property>
-			  <property name="spacing" >
-			   <number>6</number>
-			  </property>
-			  <item>
-			   <layout class="QVBoxLayout" >
-				<property name="margin" >
-				 <number>0</number>
-				</property>
-				<property name="spacing" >
-				 <number>6</number>
-				</property>
-				<item>
-				 <layout class="QHBoxLayout" >
-				  <property name="margin" >
-				   <number>0</number>
-				  </property>
-				  <property name="spacing" >
-				   <number>6</number>
-				  </property>
-				  <item>
-				   <widget class="QLabel" name="domeRadiusLabel" >
-					<property name="text" >
-					 <string>Radius</string>
-					</property>
-				   </widget>
-				  </item>
-				  <item>
-				   <widget class="QLineEdit" name="domeRadiusEdit" />
-				  </item>
-				 </layout>
-				</item>
-				<item>
-				 <layout class="QHBoxLayout" >
-				  <property name="margin" >
-				   <number>0</number>
-				  </property>
-				  <property name="spacing" >
-				   <number>6</number>
-				  </property>
-				  <item>
-				   <widget class="QLabel" name="domeAzimResLabel" >
-					<property name="text" >
-					 <string>Azimuth Res.</string>
-					</property>
-				   </widget>
-				  </item>
-				  <item>
-				   <widget class="QSpinBox" name="domeAzimResSpinBox" >
-					<property name="maximum" >
-					 <number>128</number>
-					</property>
-					<property name="minimum" >
-					 <number>2</number>
-					</property>
-				   </widget>
-				  </item>
-				 </layout>
-				</item>
-				<item>
-				 <layout class="QHBoxLayout" >
-				  <property name="margin" >
-				   <number>0</number>
-				  </property>
-				  <property name="spacing" >
-				   <number>6</number>
-				  </property>
-				  <item>
-				   <widget class="QLabel" name="domeElevResLabel" >
-					<property name="text" >
-					 <string>Elevation Res.</string>
-					</property>
-				   </widget>
-				  </item>
-				  <item>
-				   <widget class="QSpinBox" name="domeElevResSpinBox" >
-					<property name="maximum" >
-					 <number>128</number>
-					</property>
-					<property name="minimum" >
-					 <number>2</number>
-					</property>
-				   </widget>
-				  </item>
-				 </layout>
-				</item>
-				<item>
-				 <layout class="QHBoxLayout" >
-				  <property name="margin" >
-				   <number>0</number>
-				  </property>
-				  <property name="spacing" >
-				   <number>6</number>
-				  </property>
-				  <item>
-				   <widget class="QLabel" name="domeSubdivLabel" >
-					<property name="text" >
-					 <string>Subdivision</string>
-					</property>
-				   </widget>
-				  </item>
-				  <item>
-				   <widget class="QSpinBox" name="domeSubdivSpinBox" >
-					<property name="maximum" >
-					 <number>8</number>
-					</property>
-					<property name="minimum" >
-					 <number>1</number>
-					</property>
-				   </widget>
-				  </item>
-				 </layout>
-				</item>
-				<item>
-				 <widget class="QCheckBox" name="domeFullDomeCheckBox" >
-				  <property name="text" >
-				   <string>Full dome</string>
-				  </property>
-				 </widget>
-				</item>
-				<item>
-				 <spacer>
-				  <property name="orientation" >
-				   <enum>Qt::Vertical</enum>
-				  </property>
-				  <property name="sizeHint" >
-				   <size>
-					<width>20</width>
-					<height>40</height>
-				   </size>
-				  </property>
-				 </spacer>
-				</item>
-			   </layout>
-			  </item>
-			 </layout>
-			</widget>
-			<widget class="QWidget" name="planePage" >
-			 <layout class="QHBoxLayout" >
-			  <property name="margin" >
-			   <number>4</number>
-			  </property>
-			  <property name="spacing" >
-			   <number>6</number>
-			  </property>
-			  <item>
-			   <layout class="QVBoxLayout" >
-				<property name="margin" >
-				 <number>0</number>
-				</property>
-				<property name="spacing" >
-				 <number>6</number>
-				</property>
-				<item>
-				 <layout class="QGridLayout" >
-				  <property name="margin" >
-				   <number>0</number>
-				  </property>
-				  <property name="spacing" >
-				   <number>6</number>
-				  </property>
-				  <item row="1" column="0" >
-				   <widget class="QLabel" name="planeHeightLabel" >
-					<property name="text" >
-					 <string>Height</string>
-					</property>
-				   </widget>
-				  </item>
-				  <item row="0" column="2" >
-				   <widget class="QLabel" name="planeHorResLabel" >
-					<property name="text" >
-					 <string>Res.</string>
-					</property>
-				   </widget>
-				  </item>
-				  <item row="0" column="3" >
-				   <widget class="QSpinBox" name="planeHorResSpinBox" >
-					<property name="maximum" >
-					 <number>128</number>
-					</property>
-					<property name="minimum" >
-					 <number>1</number>
-					</property>
-				   </widget>
-				  </item>
-				  <item row="1" column="2" >
-				   <widget class="QLabel" name="planeVertResLabel" >
-					<property name="text" >
-					 <string>Res.</string>
-					</property>
-				   </widget>
-				  </item>
-				  <item row="0" column="1" >
-				   <widget class="QLineEdit" name="planeWidthEdit" />
-				  </item>
-				  <item row="0" column="0" >
-				   <widget class="QLabel" name="planeWidthLabel" >
-					<property name="text" >
-					 <string>Width</string>
-					</property>
-				   </widget>
-				  </item>
-				  <item row="1" column="1" >
-				   <widget class="QLineEdit" name="planeHeightEdit" />
-				  </item>
-				  <item row="1" column="3" >
-				   <widget class="QSpinBox" name="planeVertResSpinBox" >
-					<property name="maximum" >
-					 <number>128</number>
-					</property>
-					<property name="minimum" >
-					 <number>1</number>
-					</property>
-				   </widget>
-				  </item>
-				 </layout>
-				</item>
-				<item>
-				 <spacer>
-				  <property name="orientation" >
-				   <enum>Qt::Vertical</enum>
-				  </property>
-				  <property name="sizeHint" >
-				   <size>
-					<width>20</width>
-					<height>40</height>
-				   </size>
-				  </property>
-				 </spacer>
-				</item>
-			   </layout>
-			  </item>
-			 </layout>
-			</widget>
-			<widget class="QWidget" name="boxPage" >
-			 <layout class="QHBoxLayout" >
-			  <property name="margin" >
-			   <number>4</number>
-			  </property>
-			  <property name="spacing" >
-			   <number>6</number>
-			  </property>
-			  <item>
-			   <layout class="QVBoxLayout" >
-				<property name="margin" >
-				 <number>0</number>
-				</property>
-				<property name="spacing" >
-				 <number>6</number>
-				</property>
-				<item>
-				 <layout class="QGridLayout" >
-				  <property name="margin" >
-				   <number>0</number>
-				  </property>
-				  <property name="spacing" >
-				   <number>6</number>
-				  </property>
-				  <item row="1" column="3" >
-				   <widget class="QSpinBox" name="boxVertResSpinBox" >
-					<property name="maximum" >
-					 <number>128</number>
-					</property>
-					<property name="minimum" >
-					 <number>1</number>
-					</property>
-				   </widget>
-				  </item>
-				  <item row="0" column="2" >
-				   <widget class="QLabel" name="boxHorResLabel" >
-					<property name="text" >
-					 <string>Res.</string>
-					</property>
-				   </widget>
-				  </item>
-				  <item row="2" column="2" >
-				   <widget class="QLabel" name="boxDepthResLabel" >
-					<property name="text" >
-					 <string>Res.</string>
-					</property>
-				   </widget>
-				  </item>
-				  <item row="1" column="0" >
-				   <widget class="QLabel" name="boxHeightLabel" >
-					<property name="text" >
-					 <string>Height</string>
-					</property>
-				   </widget>
-				  </item>
-				  <item row="0" column="0" >
-				   <widget class="QLabel" name="boxWidthLabel" >
-					<property name="text" >
-					 <string>Width</string>
-					</property>
-				   </widget>
-				  </item>
-				  <item row="0" column="1" >
-				   <widget class="QLineEdit" name="boxWidthEdit" />
-				  </item>
-				  <item row="0" column="3" >
-				   <widget class="QSpinBox" name="boxHorResSpinBox" >
-					<property name="maximum" >
-					 <number>128</number>
-					</property>
-					<property name="minimum" >
-					 <number>1</number>
-					</property>
-				   </widget>
-				  </item>
-				  <item row="2" column="3" >
-				   <widget class="QSpinBox" name="boxDepthResSpinBox" >
-					<property name="maximum" >
-					 <number>128</number>
-					</property>
-					<property name="minimum" >
-					 <number>1</number>
-					</property>
-				   </widget>
-				  </item>
-				  <item row="1" column="2" >
-				   <widget class="QLabel" name="boxVertResLabel" >
-					<property name="text" >
-					 <string>Res.</string>
-					</property>
-				   </widget>
-				  </item>
-				  <item row="2" column="1" >
-				   <widget class="QLineEdit" name="boxDepthEdit" />
-				  </item>
-				  <item row="2" column="0" >
-				   <widget class="QLabel" name="boxDepthLabel" >
-					<property name="text" >
-					 <string>Depth</string>
-					</property>
-				   </widget>
-				  </item>
-				  <item row="1" column="1" >
-				   <widget class="QLineEdit" name="boxHeightEdit" />
-				  </item>
-				 </layout>
-				</item>
-				<item>
-				 <spacer>
-				  <property name="orientation" >
-				   <enum>Qt::Vertical</enum>
-				  </property>
-				  <property name="sizeHint" >
-				   <size>
-					<width>20</width>
-					<height>40</height>
-				   </size>
-				  </property>
-				 </spacer>
-				</item>
-			   </layout>
-			  </item>
-			 </layout>
-			</widget>
-			<widget class="QWidget" name="modelPage" >
-			 <layout class="QHBoxLayout" >
-			  <property name="margin" >
-			   <number>4</number>
-			  </property>
-			  <property name="spacing" >
-			   <number>6</number>
-			  </property>
-			  <item>
-			   <layout class="QVBoxLayout" >
-				<property name="margin" >
-				 <number>0</number>
-				</property>
-				<property name="spacing" >
-				 <number>6</number>
-				</property>
-				<item>
-				 <layout class="QHBoxLayout" >
-				  <property name="margin" >
-				   <number>0</number>
-				  </property>
-				  <property name="spacing" >
-				   <number>6</number>
-				  </property>
-				  <item>
-				   <widget class="QLabel" name="modelFileNameLabel" >
-					<property name="text" >
-					 <string>File</string>
-					</property>
-				   </widget>
-				  </item>
-				  <item>
-				   <widget class="QLineEdit" name="modelFileNameEdit" />
-				  </item>
-				  <item>
-				   <widget class="QPushButton" name="modelBrowseButton" >
-					<property name="sizePolicy" >
-					 <sizepolicy>
-					  <hsizetype>0</hsizetype>
-					  <vsizetype>0</vsizetype>
-					  <horstretch>0</horstretch>
-					  <verstretch>0</verstretch>
-					 </sizepolicy>
-					</property>
-					<property name="maximumSize" >
-					 <size>
-					  <width>23</width>
-					  <height>16777215</height>
-					 </size>
-					</property>
-					<property name="text" >
-					 <string>...</string>
-					</property>
-				   </widget>
-				  </item>
-				 </layout>
-				</item>
-				<item>
-				 <spacer>
-				  <property name="orientation" >
-				   <enum>Qt::Vertical</enum>
-				  </property>
-				  <property name="sizeHint" >
-				   <size>
-					<width>20</width>
-					<height>40</height>
-				   </size>
-				  </property>
-				 </spacer>
-				</item>
-			   </layout>
-			  </item>
-			 </layout>
-			</widget>
-		   </widget>
-		  </item>
-		 </layout>
-		</item>
-	   </layout>
-	  </widget>
-	 </item>
-	 <item>
-	  <layout class="QHBoxLayout" >
-	   <property name="margin" >
-		<number>0</number>
-	   </property>
-	   <property name="spacing" >
-		<number>6</number>
-	   </property>
-	   <item>
-		<widget class="QCheckBox" name="frameCheckBox" >
-		 <property name="text" >
-		  <string>Wireframe</string>
-		 </property>
-		</widget>
-	   </item>
-	   <item>
-		<widget class="QLabel" name="frameLineWidthLabel" >
-		 <property name="text" >
-		  <string>Width</string>
-		 </property>
-		</widget>
-	   </item>
-	   <item>
-		<widget class="QSpinBox" name="frameLineWidthSpinBox" >
-		 <property name="maximum" >
-		  <number>4</number>
-		 </property>
-		 <property name="minimum" >
-		  <number>1</number>
-		 </property>
-		</widget>
-	   </item>
-	  </layout>
-	 </item>
-	</layout>
+    <layout class="QVBoxLayout">
+     <property name="spacing">
+      <number>6</number>
+     </property>
+     <property name="margin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="projection::QTransformMatrixWidget" name="transformWidget" native="true">
+       <property name="focusPolicy">
+        <enum>Qt::StrongFocus</enum>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QGroupBox" name="shapeGroup">
+       <property name="title">
+        <string>Shape</string>
+       </property>
+       <layout class="QHBoxLayout">
+        <property name="spacing">
+         <number>6</number>
+        </property>
+        <property name="margin">
+         <number>4</number>
+        </property>
+        <item>
+         <layout class="QVBoxLayout">
+          <property name="spacing">
+           <number>6</number>
+          </property>
+          <property name="margin">
+           <number>0</number>
+          </property>
+          <item>
+           <layout class="QHBoxLayout">
+            <property name="spacing">
+             <number>6</number>
+            </property>
+            <property name="margin">
+             <number>0</number>
+            </property>
+            <item>
+             <widget class="QLabel" name="typeLabel">
+              <property name="text">
+               <string>Type</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QComboBox" name="typeComboBox">
+              <property name="minimumSize">
+               <size>
+                <width>96</width>
+                <height>0</height>
+               </size>
+              </property>
+              <item>
+               <property name="text">
+                <string>Dome</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Plane</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Box</string>
+               </property>
+              </item>
+             </widget>
+            </item>
+            <item>
+             <spacer>
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <widget class="QStackedWidget" name="stackedWidget">
+            <property name="currentIndex">
+             <number>0</number>
+            </property>
+            <widget class="QWidget" name="domePage">
+             <layout class="QHBoxLayout">
+              <property name="spacing">
+               <number>6</number>
+              </property>
+              <property name="margin">
+               <number>4</number>
+              </property>
+              <item>
+               <layout class="QVBoxLayout">
+                <property name="spacing">
+                 <number>6</number>
+                </property>
+                <property name="margin">
+                 <number>0</number>
+                </property>
+                <item>
+                 <layout class="QHBoxLayout">
+                  <property name="spacing">
+                   <number>6</number>
+                  </property>
+                  <property name="margin">
+                   <number>0</number>
+                  </property>
+                  <item>
+                   <widget class="QLabel" name="domeRadiusLabel">
+                    <property name="text">
+                     <string>Radius</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QLineEdit" name="domeRadiusEdit"/>
+                  </item>
+                 </layout>
+                </item>
+                <item>
+                 <layout class="QHBoxLayout">
+                  <property name="spacing">
+                   <number>6</number>
+                  </property>
+                  <property name="margin">
+                   <number>0</number>
+                  </property>
+                  <item>
+                   <widget class="QLabel" name="domeAzimResLabel">
+                    <property name="text">
+                     <string>Azimuth Res.</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QSpinBox" name="domeAzimResSpinBox">
+                    <property name="minimum">
+                     <number>2</number>
+                    </property>
+                    <property name="maximum">
+                     <number>128</number>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
+                </item>
+                <item>
+                 <layout class="QHBoxLayout">
+                  <property name="spacing">
+                   <number>6</number>
+                  </property>
+                  <property name="margin">
+                   <number>0</number>
+                  </property>
+                  <item>
+                   <widget class="QLabel" name="domeElevResLabel">
+                    <property name="text">
+                     <string>Elevation Res.</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QSpinBox" name="domeElevResSpinBox">
+                    <property name="minimum">
+                     <number>2</number>
+                    </property>
+                    <property name="maximum">
+                     <number>128</number>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
+                </item>
+                <item>
+                 <layout class="QHBoxLayout">
+                  <property name="spacing">
+                   <number>6</number>
+                  </property>
+                  <property name="margin">
+                   <number>0</number>
+                  </property>
+                  <item>
+                   <widget class="QLabel" name="domeSubdivLabel">
+                    <property name="text">
+                     <string>Subdivision</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QSpinBox" name="domeSubdivSpinBox">
+                    <property name="minimum">
+                     <number>1</number>
+                    </property>
+                    <property name="maximum">
+                     <number>8</number>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
+                </item>
+                <item>
+                 <widget class="QCheckBox" name="domeFullDomeCheckBox">
+                  <property name="text">
+                   <string>Full dome</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <spacer>
+                  <property name="orientation">
+                   <enum>Qt::Vertical</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0">
+                   <size>
+                    <width>20</width>
+                    <height>40</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+               </layout>
+              </item>
+             </layout>
+            </widget>
+            <widget class="QWidget" name="planePage">
+             <layout class="QHBoxLayout">
+              <property name="spacing">
+               <number>6</number>
+              </property>
+              <property name="margin">
+               <number>4</number>
+              </property>
+              <item>
+               <layout class="QVBoxLayout">
+                <property name="spacing">
+                 <number>6</number>
+                </property>
+                <property name="margin">
+                 <number>0</number>
+                </property>
+                <item>
+                 <layout class="QGridLayout">
+                  <property name="margin">
+                   <number>0</number>
+                  </property>
+                  <property name="spacing">
+                   <number>6</number>
+                  </property>
+                  <item row="1" column="0">
+                   <widget class="QLabel" name="planeHeightLabel">
+                    <property name="text">
+                     <string>Height</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="0" column="2">
+                   <widget class="QLabel" name="planeHorResLabel">
+                    <property name="text">
+                     <string>Res.</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="0" column="3">
+                   <widget class="QSpinBox" name="planeHorResSpinBox">
+                    <property name="minimum">
+                     <number>1</number>
+                    </property>
+                    <property name="maximum">
+                     <number>128</number>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="1" column="2">
+                   <widget class="QLabel" name="planeVertResLabel">
+                    <property name="text">
+                     <string>Res.</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="0" column="1">
+                   <widget class="QLineEdit" name="planeWidthEdit"/>
+                  </item>
+                  <item row="0" column="0">
+                   <widget class="QLabel" name="planeWidthLabel">
+                    <property name="text">
+                     <string>Width</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="1" column="1">
+                   <widget class="QLineEdit" name="planeHeightEdit"/>
+                  </item>
+                  <item row="1" column="3">
+                   <widget class="QSpinBox" name="planeVertResSpinBox">
+                    <property name="minimum">
+                     <number>1</number>
+                    </property>
+                    <property name="maximum">
+                     <number>128</number>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
+                </item>
+                <item>
+                 <spacer>
+                  <property name="orientation">
+                   <enum>Qt::Vertical</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0">
+                   <size>
+                    <width>20</width>
+                    <height>40</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+               </layout>
+              </item>
+             </layout>
+            </widget>
+            <widget class="QWidget" name="boxPage">
+             <layout class="QHBoxLayout">
+              <property name="spacing">
+               <number>6</number>
+              </property>
+              <property name="margin">
+               <number>4</number>
+              </property>
+              <item>
+               <layout class="QVBoxLayout">
+                <property name="spacing">
+                 <number>6</number>
+                </property>
+                <property name="margin">
+                 <number>0</number>
+                </property>
+                <item>
+                 <layout class="QGridLayout">
+                  <property name="margin">
+                   <number>0</number>
+                  </property>
+                  <property name="spacing">
+                   <number>6</number>
+                  </property>
+                  <item row="1" column="3">
+                   <widget class="QSpinBox" name="boxVertResSpinBox">
+                    <property name="minimum">
+                     <number>1</number>
+                    </property>
+                    <property name="maximum">
+                     <number>128</number>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="0" column="2">
+                   <widget class="QLabel" name="boxHorResLabel">
+                    <property name="text">
+                     <string>Res.</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="2" column="2">
+                   <widget class="QLabel" name="boxDepthResLabel">
+                    <property name="text">
+                     <string>Res.</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="1" column="0">
+                   <widget class="QLabel" name="boxHeightLabel">
+                    <property name="text">
+                     <string>Height</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="0" column="0">
+                   <widget class="QLabel" name="boxWidthLabel">
+                    <property name="text">
+                     <string>Width</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="0" column="1">
+                   <widget class="QLineEdit" name="boxWidthEdit"/>
+                  </item>
+                  <item row="0" column="3">
+                   <widget class="QSpinBox" name="boxHorResSpinBox">
+                    <property name="minimum">
+                     <number>1</number>
+                    </property>
+                    <property name="maximum">
+                     <number>128</number>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="2" column="3">
+                   <widget class="QSpinBox" name="boxDepthResSpinBox">
+                    <property name="minimum">
+                     <number>1</number>
+                    </property>
+                    <property name="maximum">
+                     <number>128</number>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="1" column="2">
+                   <widget class="QLabel" name="boxVertResLabel">
+                    <property name="text">
+                     <string>Res.</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="2" column="1">
+                   <widget class="QLineEdit" name="boxDepthEdit"/>
+                  </item>
+                  <item row="2" column="0">
+                   <widget class="QLabel" name="boxDepthLabel">
+                    <property name="text">
+                     <string>Depth</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="1" column="1">
+                   <widget class="QLineEdit" name="boxHeightEdit"/>
+                  </item>
+                 </layout>
+                </item>
+                <item>
+                 <spacer>
+                  <property name="orientation">
+                   <enum>Qt::Vertical</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0">
+                   <size>
+                    <width>20</width>
+                    <height>40</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+               </layout>
+              </item>
+             </layout>
+            </widget>
+            <widget class="QWidget" name="modelPage">
+             <layout class="QHBoxLayout">
+              <property name="spacing">
+               <number>6</number>
+              </property>
+              <property name="margin">
+               <number>4</number>
+              </property>
+              <item>
+               <layout class="QVBoxLayout">
+                <property name="spacing">
+                 <number>6</number>
+                </property>
+                <property name="margin">
+                 <number>0</number>
+                </property>
+                <item>
+                 <layout class="QHBoxLayout">
+                  <property name="spacing">
+                   <number>6</number>
+                  </property>
+                  <property name="margin">
+                   <number>0</number>
+                  </property>
+                  <item>
+                   <widget class="QLabel" name="modelFileNameLabel">
+                    <property name="text">
+                     <string>File</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QLineEdit" name="modelFileNameEdit"/>
+                  </item>
+                  <item>
+                   <widget class="QPushButton" name="modelBrowseButton">
+                    <property name="sizePolicy">
+                     <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                      <horstretch>0</horstretch>
+                      <verstretch>0</verstretch>
+                     </sizepolicy>
+                    </property>
+                    <property name="maximumSize">
+                     <size>
+                      <width>23</width>
+                      <height>16777215</height>
+                     </size>
+                    </property>
+                    <property name="text">
+                     <string>...</string>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
+                </item>
+                <item>
+                 <spacer>
+                  <property name="orientation">
+                   <enum>Qt::Vertical</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0">
+                   <size>
+                    <width>20</width>
+                    <height>40</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+               </layout>
+              </item>
+             </layout>
+            </widget>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <layout class="QHBoxLayout">
+       <property name="spacing">
+        <number>6</number>
+       </property>
+       <property name="margin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QCheckBox" name="frameCheckBox">
+         <property name="text">
+          <string>Wireframe</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="frameLineWidthLabel">
+         <property name="text">
+          <string>Width</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QSpinBox" name="frameLineWidthSpinBox">
+         <property name="minimum">
+          <number>1</number>
+         </property>
+         <property name="maximum">
+          <number>4</number>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>
- <pixmapfunction></pixmapfunction>
  <customwidgets>
   <customwidget>
@@ -605,6 +600,4 @@
    <extends>QWidget</extends>
    <header>gui/QTransformMatrixWidget.h</header>
-   <container>0</container>
-   <pixmap></pixmap>
   </customwidget>
  </customwidgets>
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qsetupdialog.ui
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qsetupdialog.ui	(revision 2)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qsetupdialog.ui	(revision 42)
@@ -1,9 +1,7 @@
-<ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>QSetupDialog</class>
- <widget class="QWidget" name="QSetupDialog" >
-  <property name="geometry" >
+ <widget class="QWidget" name="QSetupDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
@@ -13,38 +11,38 @@
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Multichannel Projection Designer</string>
   </property>
-  <layout class="QHBoxLayout" >
-   <property name="margin" >
+  <layout class="QHBoxLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="margin">
     <number>0</number>
    </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
    <item>
-    <widget class="QTabWidget" name="tabWidget" >
-     <widget class="QWidget" name="channelsTab" >
-      <attribute name="title" >
+    <widget class="QTabWidget" name="tabWidget">
+     <widget class="QWidget" name="channelsTab">
+      <attribute name="title">
        <string>Channels</string>
       </attribute>
-      <layout class="QHBoxLayout" >
-       <property name="margin" >
+      <layout class="QHBoxLayout">
+       <property name="spacing">
+        <number>6</number>
+       </property>
+       <property name="margin">
         <number>4</number>
        </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
        <item>
-        <layout class="QVBoxLayout" >
-         <property name="margin" >
+        <layout class="QVBoxLayout">
+         <property name="spacing">
+          <number>6</number>
+         </property>
+         <property name="margin">
           <number>0</number>
          </property>
-         <property name="spacing" >
-          <number>6</number>
-         </property>
          <item>
-          <widget class="projection::QChannelManagerWidget" name="channelManager" >
-           <property name="maximumSize" >
+          <widget class="projection::QChannelManagerWidget" name="channelManager" native="true">
+           <property name="maximumSize">
             <size>
              <width>16777215</width>
@@ -52,5 +50,5 @@
             </size>
            </property>
-           <property name="focusPolicy" >
+           <property name="focusPolicy">
             <enum>Qt::StrongFocus</enum>
            </property>
@@ -58,26 +56,24 @@
          </item>
          <item>
-          <widget class="QGroupBox" name="channelGroup" >
-           <property name="sizePolicy" >
-            <sizepolicy>
-             <hsizetype>5</hsizetype>
-             <vsizetype>5</vsizetype>
+          <widget class="QGroupBox" name="channelGroup">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
              <horstretch>0</horstretch>
              <verstretch>1</verstretch>
             </sizepolicy>
            </property>
-           <property name="title" >
+           <property name="title">
             <string>Channel</string>
            </property>
-           <layout class="QHBoxLayout" >
-            <property name="margin" >
+           <layout class="QHBoxLayout">
+            <property name="spacing">
+             <number>6</number>
+            </property>
+            <property name="margin">
              <number>4</number>
             </property>
-            <property name="spacing" >
-             <number>6</number>
-            </property>
             <item>
-             <widget class="projection::QChannelWidget" name="channel" >
-              <property name="focusPolicy" >
+             <widget class="projection::QChannelWidget" name="channel" native="true">
+              <property name="focusPolicy">
                <enum>Qt::StrongFocus</enum>
               </property>
@@ -89,8 +85,8 @@
          <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>
@@ -104,24 +100,24 @@
       </layout>
      </widget>
-     <widget class="QWidget" name="screenTab" >
-      <attribute name="title" >
+     <widget class="QWidget" name="screenTab">
+      <attribute name="title">
        <string>Screen</string>
       </attribute>
-      <layout class="QVBoxLayout" >
-       <property name="margin" >
+      <layout class="QVBoxLayout">
+       <property name="spacing">
+        <number>6</number>
+       </property>
+       <property name="margin">
         <number>0</number>
        </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
        <item>
-        <widget class="projection::QScreenWidget" name="screen" />
+        <widget class="projection::QScreenWidget" name="screen" native="true"/>
        </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>
@@ -133,24 +129,24 @@
       </layout>
      </widget>
-     <widget class="QWidget" name="sceneTab" >
-      <attribute name="title" >
+     <widget class="QWidget" name="sceneTab">
+      <attribute name="title">
        <string>Scene</string>
       </attribute>
-      <layout class="QVBoxLayout" >
-       <property name="margin" >
+      <layout class="QVBoxLayout">
+       <property name="spacing">
+        <number>6</number>
+       </property>
+       <property name="margin">
         <number>0</number>
        </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
        <item>
-        <widget class="projection::QSceneWidget" name="scene" />
+        <widget class="projection::QSceneWidget" name="scene" native="true"/>
        </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>
@@ -166,5 +162,4 @@
   </layout>
  </widget>
- <pixmapfunction></pixmapfunction>
  <customwidgets>
   <customwidget>
@@ -172,6 +167,4 @@
    <extends>QWidget</extends>
    <header>gui/QChannelManagerWidget.h</header>
-   <container>0</container>
-   <pixmap></pixmap>
   </customwidget>
   <customwidget>
@@ -179,6 +172,4 @@
    <extends>QWidget</extends>
    <header>gui/QScreenWidget.h</header>
-   <container>0</container>
-   <pixmap></pixmap>
   </customwidget>
   <customwidget>
@@ -186,6 +177,4 @@
    <extends>QWidget</extends>
    <header>gui/QChannelWidget.h</header>
-   <container>0</container>
-   <pixmap></pixmap>
   </customwidget>
   <customwidget>
@@ -193,6 +182,4 @@
    <extends>QWidget</extends>
    <header>gui/QSceneWidget.h</header>
-   <container>0</container>
-   <pixmap></pixmap>
   </customwidget>
  </customwidgets>
Index: projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qtransformmatrixwidget.ui
===================================================================
--- projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qtransformmatrixwidget.ui	(revision 2)
+++ projectionDesigner/tag/ProjectionDesigner_1.1.5/projdesigner/include/gui/qtransformmatrixwidget.ui	(revision 42)
@@ -1,93 +1,91 @@
-<ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>QTransformMatrixWidget</class>
- <widget class="QWidget" name="QTransformMatrixWidget" >
-  <property name="geometry" >
+ <widget class="QWidget" name="QTransformMatrixWidget">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>179</width>
-    <height>78</height>
+    <width>203</width>
+    <height>95</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Matrix Settings</string>
   </property>
-  <layout class="QHBoxLayout" >
-   <property name="margin" >
+  <layout class="QHBoxLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="margin">
     <number>0</number>
    </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
    <item>
-    <widget class="QGroupBox" name="transformGroup" >
-     <property name="title" >
+    <widget class="QGroupBox" name="transformGroup">
+     <property name="title">
       <string>Transform</string>
      </property>
-     <layout class="QHBoxLayout" >
-      <property name="margin" >
+     <layout class="QHBoxLayout">
+      <property name="spacing">
+       <number>6</number>
+      </property>
+      <property name="margin">
        <number>0</number>
       </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
       <item>
-       <layout class="QGridLayout" >
-        <property name="margin" >
+       <layout class="QGridLayout">
+        <property name="margin">
          <number>4</number>
         </property>
-        <property name="spacing" >
+        <property name="spacing">
          <number>6</number>
         </property>
-        <item row="0" column="3" >
-         <widget class="QLineEdit" name="posZEdit" />
+        <item row="0" column="3">
+         <widget class="QLineEdit" name="posZEdit"/>
         </item>
-        <item row="1" column="1" >
-         <widget class="QLineEdit" name="rotHEdit" />
+        <item row="1" column="1">
+         <widget class="QLineEdit" name="rotHEdit"/>
         </item>
-        <item row="0" column="0" >
-         <widget class="QLabel" name="posLabel" >
-          <property name="text" >
+        <item row="0" column="0">
+         <widget class="QLabel" name="posLabel">
+          <property name="text">
            <string>Pos</string>
           </property>
          </widget>
         </item>
-        <item row="1" column="0" >
-         <widget class="QLabel" name="rotLabel" >
-          <property name="text" >
+        <item row="1" column="0">
+         <widget class="QLabel" name="rotLabel">
+          <property name="text">
            <string>Rot</string>
           </property>
          </widget>
         </item>
-        <item row="0" column="1" >
-         <widget class="QLineEdit" name="posXEdit" />
+        <item row="0" column="1">
+         <widget class="QLineEdit" name="posXEdit"/>
         </item>
-        <item row="1" column="3" >
-         <widget class="QLineEdit" name="rotREdit" />
+        <item row="1" column="3">
+         <widget class="QLineEdit" name="rotREdit"/>
         </item>
-        <item row="1" column="2" >
-         <widget class="QLineEdit" name="rotPEdit" />
+        <item row="1" column="2">
+         <widget class="QLineEdit" name="rotPEdit"/>
         </item>
-        <item row="0" column="2" >
-         <widget class="QLineEdit" name="posYEdit" />
+        <item row="0" column="2">
+         <widget class="QLineEdit" name="posYEdit"/>
         </item>
-        <item row="2" column="0" >
-         <widget class="QLabel" name="scaleLabel" >
-          <property name="text" >
+        <item row="2" column="0">
+         <widget class="QLabel" name="scaleLabel">
+          <property name="text">
            <string>Scale</string>
           </property>
          </widget>
         </item>
-        <item row="2" column="1" >
-         <widget class="QLineEdit" name="scaleXEdit" />
+        <item row="2" column="1">
+         <widget class="QLineEdit" name="scaleXEdit"/>
         </item>
-        <item row="2" column="2" >
-         <widget class="QLineEdit" name="scaleYEdit" />
+        <item row="2" column="2">
+         <widget class="QLineEdit" name="scaleYEdit"/>
         </item>
-        <item row="2" column="3" >
-         <widget class="QLineEdit" name="scaleZEdit" />
+        <item row="2" column="3">
+         <widget class="QLineEdit" name="scaleZEdit"/>
         </item>
        </layout>
@@ -98,5 +96,4 @@
   </layout>
  </widget>
- <pixmapfunction></pixmapfunction>
  <tabstops>
   <tabstop>posXEdit</tabstop>
