qtnx: import qtnx to openembedded

* added id-path.patch from debian
* added pro and scroll.patch, which are my work
* final commit for nx-client support in oe
* only compile tested against qt-embedded

4 files changed, 1746 insertions, 0 deletions

diff --git a/packages/qtnx/files/.mtn2git_empty b/packages/qtnx/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qtnx/files/.mtn2git_empty
diff --git a/packages/qtnx/files/id-path.patch b/packages/qtnx/files/id-path.patch
new file mode 100644
index 0000000000..e6b75cac9b
--- /dev/null
+++ b/packages/qtnx/files/id-path.patch
@@ -0,0 +1,24 @@
+fix from latest debian unstable package
+
+
+Index: qtnx-0.9/qtnxwindow.cpp
+===================================================================
+--- qtnx-0.9.orig/qtnxwindow.cpp	2008-09-02 22:11:45.015711881 +0200
++++ qtnx-0.9/qtnxwindow.cpp	2008-09-02 22:24:27.168968002 +0200
+@@ -290,7 +290,7 @@
+ 
+     m_NXClient->setDepth(getDepth());
+ 
+-    QString keyPath = "id.key";
++    QString keyPath = "/usr/share/qtnx/id.key";
+ 
+ #ifdef Q_WS_MAC
+     keyPath = binaryPath + "/id.key";
+@@ -405,6 +405,7 @@
+ 
+     connect(settingsDialog, SIGNAL(closing(QString)), this, SLOT(configureClosed(QString)));
+ 
++
+     settingsDialog->show();
+ }
+ 
diff --git a/packages/qtnx/files/pro.patch b/packages/qtnx/files/pro.patch
new file mode 100644
index 0000000000..2e1b10ca3a
--- /dev/null
+++ b/packages/qtnx/files/pro.patch
@@ -0,0 +1,27 @@
+patch by Henning Heinold
+
+Index: qtnx-0.9/qtnx.pro
+===================================================================
+--- qtnx-0.9.orig/qtnx.pro	2008-09-04 11:42:19.000000000 +0200
++++ qtnx-0.9/qtnx.pro	2008-09-04 11:42:32.000000000 +0200
+@@ -24,6 +24,6 @@
+ DEPENDPATH	+= $(QTDIR)/include
+ 
+ 
+-QT += ui xml
++QT += gui xml
+ 
+ TARGET		= qtnx
+Index: qtnx-0.9/qtnxwin32.pro
+===================================================================
+--- qtnx-0.9.orig/qtnxwin32.pro	2008-03-07 12:13:15.000000000 +0100
++++ qtnx-0.9/qtnxwin32.pro	2008-09-04 11:42:41.000000000 +0200
+@@ -14,7 +14,7 @@
+ 
+ QMAKE_LFLAGS += -Wl,-subsystem,windows
+ 
+-QT += ui xml
++QT += gui xml
+ 
+ TARGET		= qtnx
+ 
diff --git a/packages/qtnx/files/scroll.patch b/packages/qtnx/files/scroll.patch
new file mode 100644
index 0000000000..107c7177c6
--- /dev/null
+++ b/packages/qtnx/files/scroll.patch
@@ -0,0 +1,1695 @@
+patch by Henning Heinold, so the configure-widget is
+scrollable
+
+Index: qtnx-0.9/settingsdialog.ui
+===================================================================
+--- qtnx-0.9.orig/settingsdialog.ui	2008-09-03 21:32:51.716503112 +0200
++++ qtnx-0.9/settingsdialog.ui	2008-09-03 21:34:56.943160459 +0200
+@@ -5,8 +5,8 @@
+    <rect>
+     <x>0</x>
+     <y>0</y>
+-    <width>468</width>
+-    <height>546</height>
++    <width>480</width>
++    <height>543</height>
+    </rect>
+   </property>
+   <property name="windowTitle" >
+@@ -19,923 +19,787 @@
+    <property name="spacing" >
+     <number>6</number>
+    </property>
+-   <property name="leftMargin" >
+-    <number>9</number>
+-   </property>
+-   <property name="topMargin" >
+-    <number>9</number>
+-   </property>
+-   <property name="rightMargin" >
+-    <number>9</number>
+-   </property>
+-   <property name="bottomMargin" >
++   <property name="margin" >
+     <number>9</number>
+    </property>
+    <item>
+-    <widget class="QTabWidget" name="layoutTabs" >
+-     <property name="currentIndex" >
+-      <number>0</number>
++    <widget class="QScrollArea" name="scrollArea" >
++     <property name="widgetResizable" >
++      <bool>true</bool>
+      </property>
+-     <widget class="QWidget" name="basicTab" >
+-      <attribute name="title" >
+-       <string>Basic</string>
+-      </attribute>
+-      <layout class="QVBoxLayout" >
+-       <property name="spacing" >
+-        <number>6</number>
+-       </property>
+-       <property name="leftMargin" >
+-        <number>9</number>
+-       </property>
+-       <property name="topMargin" >
+-        <number>9</number>
+-       </property>
+-       <property name="rightMargin" >
+-        <number>9</number>
+-       </property>
+-       <property name="bottomMargin" >
+-        <number>9</number>
+-       </property>
+-       <item>
+-        <widget class="QGroupBox" name="generalGroup" >
+-         <property name="title" >
+-          <string>General</string>
+-         </property>
+-         <layout class="QVBoxLayout" >
+-          <property name="spacing" >
+-           <number>6</number>
+-          </property>
+-          <property name="leftMargin" >
+-           <number>9</number>
+-          </property>
+-          <property name="topMargin" >
+-           <number>9</number>
+-          </property>
+-          <property name="rightMargin" >
+-           <number>9</number>
+-          </property>
+-          <property name="bottomMargin" >
+-           <number>9</number>
+-          </property>
+-          <item>
+-           <layout class="QHBoxLayout" >
+-            <property name="spacing" >
+-             <number>6</number>
+-            </property>
+-            <property name="leftMargin" >
+-             <number>0</number>
+-            </property>
+-            <property name="topMargin" >
+-             <number>0</number>
+-            </property>
+-            <property name="rightMargin" >
+-             <number>0</number>
+-            </property>
+-            <property name="bottomMargin" >
+-             <number>0</number>
+-            </property>
+-            <item>
+-             <widget class="QLabel" name="sessionNameLabel" >
+-              <property name="sizePolicy" >
+-               <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
+-                <horstretch>0</horstretch>
+-                <verstretch>0</verstretch>
+-               </sizepolicy>
+-              </property>
+-              <property name="text" >
+-               <string>Session Name:</string>
+-              </property>
+-             </widget>
+-            </item>
+-            <item>
+-             <widget class="QLineEdit" name="sessionName" />
+-            </item>
+-           </layout>
+-          </item>
+-         </layout>
+-        </widget>
+-       </item>
+-       <item>
+-        <widget class="QGroupBox" name="serverGroup" >
+-         <property name="title" >
+-          <string>Server</string>
+-         </property>
+-         <layout class="QVBoxLayout" >
+-          <property name="spacing" >
+-           <number>6</number>
+-          </property>
+-          <property name="leftMargin" >
+-           <number>9</number>
+-          </property>
+-          <property name="topMargin" >
+-           <number>9</number>
+-          </property>
+-          <property name="rightMargin" >
+-           <number>9</number>
+-          </property>
+-          <property name="bottomMargin" >
+-           <number>9</number>
+-          </property>
+-          <item>
+-           <layout class="QHBoxLayout" >
+-            <property name="spacing" >
+-             <number>6</number>
+-            </property>
+-            <property name="leftMargin" >
+-             <number>0</number>
+-            </property>
+-            <property name="topMargin" >
+-             <number>0</number>
+-            </property>
+-            <property name="rightMargin" >
+-             <number>0</number>
+-            </property>
+-            <property name="bottomMargin" >
+-             <number>0</number>
+-            </property>
+-            <item>
+-             <widget class="QLabel" name="hostnameLabel" >
+-              <property name="sizePolicy" >
+-               <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
+-                <horstretch>0</horstretch>
+-                <verstretch>0</verstretch>
+-               </sizepolicy>
+-              </property>
+-              <property name="text" >
+-               <string>Hostname:</string>
+-              </property>
+-             </widget>
+-            </item>
+-            <item>
+-             <widget class="QLineEdit" name="hostname" />
+-            </item>
+-            <item>
+-             <widget class="QLabel" name="portLabel" >
+-              <property name="sizePolicy" >
+-               <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
+-                <horstretch>0</horstretch>
+-                <verstretch>0</verstretch>
+-               </sizepolicy>
+-              </property>
+-              <property name="text" >
+-               <string>Port:</string>
+-              </property>
+-             </widget>
+-            </item>
+-            <item>
+-             <widget class="QSpinBox" name="port" >
+-              <property name="minimum" >
+-               <number>1</number>
+-              </property>
+-              <property name="maximum" >
+-               <number>65535</number>
+-              </property>
+-              <property name="value" >
+-               <number>22</number>
+-              </property>
+-             </widget>
+-            </item>
+-           </layout>
+-          </item>
+-          <item>
+-           <layout class="QHBoxLayout" >
+-            <property name="spacing" >
+-             <number>6</number>
+-            </property>
+-            <property name="leftMargin" >
+-             <number>0</number>
+-            </property>
+-            <property name="topMargin" >
+-             <number>0</number>
+-            </property>
+-            <property name="rightMargin" >
+-             <number>0</number>
+-            </property>
+-            <property name="bottomMargin" >
+-             <number>0</number>
+-            </property>
+-            <item>
+-             <widget class="QCheckBox" name="defaultKey" >
+-              <property name="text" >
+-               <string>Use default key</string>
+-              </property>
+-              <property name="checked" >
+-               <bool>true</bool>
+-              </property>
+-             </widget>
+-            </item>
+-            <item>
+-             <widget class="QPushButton" name="setAuthKeyButton" >
+-              <property name="enabled" >
+-               <bool>false</bool>
+-              </property>
+-              <property name="text" >
+-               <string>&amp;Set Authentication Key...</string>
+-              </property>
+-             </widget>
+-            </item>
+-           </layout>
+-          </item>
+-         </layout>
+-        </widget>
+-       </item>
+-       <item>
+-        <widget class="QGroupBox" name="desktopGroup" >
+-         <property name="title" >
+-          <string>Desktop</string>
+-         </property>
+-         <layout class="QVBoxLayout" >
+-          <property name="spacing" >
+-           <number>6</number>
+-          </property>
+-          <property name="leftMargin" >
+-           <number>9</number>
+-          </property>
+-          <property name="topMargin" >
+-           <number>9</number>
+-          </property>
+-          <property name="rightMargin" >
+-           <number>9</number>
+-          </property>
+-          <property name="bottomMargin" >
+-           <number>9</number>
+-          </property>
+-          <item>
+-           <layout class="QHBoxLayout" >
+-            <property name="spacing" >
+-             <number>6</number>
+-            </property>
+-            <property name="leftMargin" >
+-             <number>0</number>
+-            </property>
+-            <property name="topMargin" >
+-             <number>0</number>
+-            </property>
+-            <property name="rightMargin" >
+-             <number>0</number>
+-            </property>
+-            <property name="bottomMargin" >
+-             <number>0</number>
+-            </property>
+-            <item>
+-             <widget class="QLabel" name="platformLabel" >
+-              <property name="sizePolicy" >
+-               <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
+-                <horstretch>0</horstretch>
+-                <verstretch>0</verstretch>
+-               </sizepolicy>
+-              </property>
+-              <property name="text" >
+-               <string>Platform:</string>
+-              </property>
+-             </widget>
+-            </item>
+-            <item>
+-             <widget class="QComboBox" name="platform" >
+-              <item>
+-               <property name="text" >
+-                <string>UNIX</string>
+-               </property>
+-              </item>
+-              <item>
+-               <property name="text" >
+-                <string>Windows</string>
+-               </property>
+-              </item>
+-              <item>
+-               <property name="text" >
+-                <string>VNC Proxy</string>
+-               </property>
+-              </item>
+-             </widget>
+-            </item>
+-            <item>
+-             <widget class="QLabel" name="typeLabel" >
+-              <property name="sizePolicy" >
+-               <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
+-                <horstretch>0</horstretch>
+-                <verstretch>0</verstretch>
+-               </sizepolicy>
+-              </property>
+-              <property name="text" >
+-               <string>Type:</string>
+-              </property>
+-             </widget>
+-            </item>
+-            <item>
+-             <widget class="QComboBox" name="type" >
+-              <item>
+-               <property name="text" >
+-                <string>KDE</string>
+-               </property>
+-              </item>
+-              <item>
+-               <property name="text" >
+-                <string>GNOME</string>
+-               </property>
+-              </item>
+-              <item>
+-               <property name="text" >
+-                <string>CDE</string>
+-               </property>
+-              </item>
+-              <item>
+-               <property name="text" >
+-                <string>XDM</string>
+-               </property>
+-              </item>
+-              <item>
+-               <property name="text" >
+-                <string>Custom</string>
+-               </property>
+-              </item>
+-             </widget>
+-            </item>
+-            <item>
+-             <widget class="QLabel" name="linkLabel" >
+-              <property name="sizePolicy" >
+-               <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
+-                <horstretch>0</horstretch>
+-                <verstretch>0</verstretch>
+-               </sizepolicy>
+-              </property>
+-              <property name="text" >
+-               <string>Link:</string>
+-              </property>
+-             </widget>
+-            </item>
+-            <item>
+-             <widget class="QComboBox" name="link" >
+-              <item>
+-               <property name="text" >
+-                <string>Modem</string>
+-               </property>
+-              </item>
+-              <item>
+-               <property name="text" >
+-                <string>ISDN</string>
+-               </property>
+-              </item>
+-              <item>
+-               <property name="text" >
+-                <string>ADSL</string>
+-               </property>
+-              </item>
+-              <item>
+-               <property name="text" >
+-                <string>WAN</string>
+-               </property>
+-              </item>
+-              <item>
+-               <property name="text" >
+-                <string>LAN</string>
+-               </property>
+-              </item>
+-             </widget>
+-            </item>
+-           </layout>
+-          </item>
+-          <item>
+-           <layout class="QHBoxLayout" >
+-            <property name="spacing" >
+-             <number>6</number>
+-            </property>
+-            <property name="leftMargin" >
+-             <number>0</number>
+-            </property>
+-            <property name="topMargin" >
+-             <number>0</number>
+-            </property>
+-            <property name="rightMargin" >
+-             <number>0</number>
+-            </property>
+-            <property name="bottomMargin" >
+-             <number>0</number>
+-            </property>
+-            <item>
+-             <spacer>
+-              <property name="orientation" >
+-               <enum>Qt::Horizontal</enum>
+-              </property>
+-              <property name="sizeHint" >
+-               <size>
+-                <width>173</width>
+-                <height>20</height>
+-               </size>
+-              </property>
+-             </spacer>
+-            </item>
+-            <item>
+-             <widget class="QPushButton" name="desktopSettingButton" >
+-              <property name="enabled" >
+-               <bool>false</bool>
+-              </property>
+-              <property name="text" >
+-               <string>&amp;Settings...</string>
+-              </property>
+-             </widget>
+-            </item>
+-           </layout>
+-          </item>
+-         </layout>
+-        </widget>
+-       </item>
++     <widget class="QWidget" name="scrollAreaWidgetContents" >
++      <property name="geometry" >
++       <rect>
++        <x>0</x>
++        <y>0</y>
++        <width>458</width>
++        <height>521</height>
++       </rect>
++      </property>
++      <layout class="QVBoxLayout" name="verticalLayout" >
+        <item>
+-        <widget class="QGroupBox" name="groupBox" >
+-         <property name="title" >
+-          <string>Geometry</string>
++        <widget class="QTabWidget" name="layoutTabs" >
++         <property name="currentIndex" >
++          <number>0</number>
+          </property>
+-         <layout class="QVBoxLayout" >
+-          <property name="spacing" >
+-           <number>6</number>
+-          </property>
+-          <property name="leftMargin" >
+-           <number>9</number>
+-          </property>
+-          <property name="topMargin" >
+-           <number>9</number>
+-          </property>
+-          <property name="rightMargin" >
+-           <number>9</number>
+-          </property>
+-          <property name="bottomMargin" >
+-           <number>9</number>
+-          </property>
+-          <item>
+-           <layout class="QHBoxLayout" >
+-            <property name="spacing" >
+-             <number>6</number>
+-            </property>
+-            <property name="leftMargin" >
+-             <number>0</number>
+-            </property>
+-            <property name="topMargin" >
+-             <number>0</number>
+-            </property>
+-            <property name="rightMargin" >
+-             <number>0</number>
+-            </property>
+-            <property name="bottomMargin" >
+-             <number>0</number>
+-            </property>
+-            <item>
+-             <widget class="QLabel" name="resolutionLabel" >
+-              <property name="sizePolicy" >
+-               <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
+-                <horstretch>0</horstretch>
+-                <verstretch>0</verstretch>
+-               </sizepolicy>
+-              </property>
+-              <property name="text" >
+-               <string>Resolution:</string>
+-              </property>
+-             </widget>
+-            </item>
+-            <item>
+-             <widget class="QComboBox" name="resolution" >
+-              <item>
+-               <property name="text" >
+-                <string>640x480</string>
+-               </property>
+-              </item>
+-              <item>
+-               <property name="text" >
+-                <string>800x600</string>
+-               </property>
+-              </item>
+-              <item>
+-               <property name="text" >
+-                <string>1024x768</string>
+-               </property>
+-              </item>
+-              <item>
+-               <property name="text" >
+-                <string>Fullscreen</string>
+-               </property>
+-              </item>
+-              <item>
+-               <property name="text" >
+-                <string>Custom</string>
+-               </property>
+-              </item>
+-             </widget>
+-            </item>
+-            <item>
+-             <widget class="QLabel" name="compressionLabel" >
+-              <property name="sizePolicy" >
+-               <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
+-                <horstretch>0</horstretch>
+-                <verstretch>0</verstretch>
+-               </sizepolicy>
+-              </property>
+-              <property name="text" >
+-               <string>Compression:</string>
+-              </property>
+-             </widget>
+-            </item>
+-            <item>
+-             <widget class="QComboBox" name="imageCompressionType" >
+-              <item>
+-               <property name="text" >
+-                <string>PNG</string>
+-               </property>
+-              </item>
+-              <item>
+-               <property name="text" >
+-                <string>JPEG</string>
+-               </property>
+-              </item>
++         <widget class="QWidget" name="basicTab" >
++          <property name="geometry" >
++           <rect>
++            <x>0</x>
++            <y>0</y>
++            <width>436</width>
++            <height>439</height>
++           </rect>
++          </property>
++          <attribute name="title" >
++           <string>Basic</string>
++          </attribute>
++          <layout class="QVBoxLayout" name="_2" >
++           <property name="spacing" >
++            <number>6</number>
++           </property>
++           <property name="margin" >
++            <number>9</number>
++           </property>
++           <item>
++            <widget class="QGroupBox" name="generalGroup" >
++             <property name="title" >
++              <string>General</string>
++             </property>
++             <layout class="QVBoxLayout" name="_3" >
++              <property name="spacing" >
++               <number>6</number>
++              </property>
++              <property name="margin" >
++               <number>9</number>
++              </property>
+               <item>
+-               <property name="text" >
+-                <string>Raw X11</string>
+-               </property>
+-              </item>
+-             </widget>
+-            </item>
+-           </layout>
+-          </item>
+-          <item>
+-           <layout class="QHBoxLayout" >
+-            <property name="spacing" >
+-             <number>6</number>
+-            </property>
+-            <property name="leftMargin" >
+-             <number>0</number>
+-            </property>
+-            <property name="topMargin" >
+-             <number>0</number>
+-            </property>
+-            <property name="rightMargin" >
+-             <number>0</number>
+-            </property>
+-            <property name="bottomMargin" >
+-             <number>0</number>
+-            </property>
+-            <item>
+-             <widget class="QLabel" name="qualityLabel" >
+-              <property name="sizePolicy" >
+-               <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
+-                <horstretch>0</horstretch>
+-                <verstretch>0</verstretch>
+-               </sizepolicy>
+-              </property>
+-              <property name="text" >
+-               <string>JPEG Quality:</string>
+-              </property>
+-             </widget>
+-            </item>
+-            <item>
+-             <widget class="QSlider" name="imageQualityLevel" >
+-              <property name="enabled" >
+-               <bool>false</bool>
++               <layout class="QHBoxLayout" name="_4" >
++                <property name="spacing" >
++                 <number>6</number>
++                </property>
++                <property name="margin" >
++                 <number>0</number>
++                </property>
++                <item>
++                 <widget class="QLabel" name="sessionNameLabel" >
++                  <property name="sizePolicy" >
++                   <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
++                    <horstretch>0</horstretch>
++                    <verstretch>0</verstretch>
++                   </sizepolicy>
++                  </property>
++                  <property name="text" >
++                   <string>Session Name:</string>
++                  </property>
++                 </widget>
++                </item>
++                <item>
++                 <widget class="QLineEdit" name="sessionName" />
++                </item>
++               </layout>
++              </item>
++             </layout>
++            </widget>
++           </item>
++           <item>
++            <widget class="QGroupBox" name="serverGroup" >
++             <property name="title" >
++              <string>Server</string>
++             </property>
++             <layout class="QVBoxLayout" name="_5" >
++              <property name="spacing" >
++               <number>6</number>
+               </property>
+-              <property name="minimum" >
+-               <number>1</number>
++              <property name="margin" >
++               <number>9</number>
+               </property>
+-              <property name="maximum" >
++              <item>
++               <layout class="QHBoxLayout" name="_6" >
++                <property name="spacing" >
++                 <number>6</number>
++                </property>
++                <property name="margin" >
++                 <number>0</number>
++                </property>
++                <item>
++                 <widget class="QLabel" name="hostnameLabel" >
++                  <property name="sizePolicy" >
++                   <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
++                    <horstretch>0</horstretch>
++                    <verstretch>0</verstretch>
++                   </sizepolicy>
++                  </property>
++                  <property name="text" >
++                   <string>Hostname:</string>
++                  </property>
++                 </widget>
++                </item>
++                <item>
++                 <widget class="QLineEdit" name="hostname" />
++                </item>
++                <item>
++                 <widget class="QLabel" name="portLabel" >
++                  <property name="sizePolicy" >
++                   <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
++                    <horstretch>0</horstretch>
++                    <verstretch>0</verstretch>
++                   </sizepolicy>
++                  </property>
++                  <property name="text" >
++                   <string>Port:</string>
++                  </property>
++                 </widget>
++                </item>
++                <item>
++                 <widget class="QSpinBox" name="port" >
++                  <property name="minimum" >
++                   <number>1</number>
++                  </property>
++                  <property name="maximum" >
++                   <number>65535</number>
++                  </property>
++                  <property name="value" >
++                   <number>22</number>
++                  </property>
++                 </widget>
++                </item>
++               </layout>
++              </item>
++              <item>
++               <layout class="QHBoxLayout" name="_7" >
++                <property name="spacing" >
++                 <number>6</number>
++                </property>
++                <property name="margin" >
++                 <number>0</number>
++                </property>
++                <item>
++                 <widget class="QCheckBox" name="defaultKey" >
++                  <property name="text" >
++                   <string>Use default key</string>
++                  </property>
++                  <property name="checked" >
++                   <bool>true</bool>
++                  </property>
++                 </widget>
++                </item>
++                <item>
++                 <widget class="QPushButton" name="setAuthKeyButton" >
++                  <property name="enabled" >
++                   <bool>false</bool>
++                  </property>
++                  <property name="text" >
++                   <string>&amp;Set Authentication Key...</string>
++                  </property>
++                 </widget>
++                </item>
++               </layout>
++              </item>
++             </layout>
++            </widget>
++           </item>
++           <item>
++            <widget class="QGroupBox" name="desktopGroup" >
++             <property name="title" >
++              <string>Desktop</string>
++             </property>
++             <layout class="QVBoxLayout" name="_8" >
++              <property name="spacing" >
++               <number>6</number>
++              </property>
++              <property name="margin" >
+                <number>9</number>
+               </property>
+-              <property name="pageStep" >
++              <item>
++               <layout class="QHBoxLayout" name="_9" >
++                <property name="spacing" >
++                 <number>6</number>
++                </property>
++                <property name="margin" >
++                 <number>0</number>
++                </property>
++                <item>
++                 <widget class="QLabel" name="platformLabel" >
++                  <property name="sizePolicy" >
++                   <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
++                    <horstretch>0</horstretch>
++                    <verstretch>0</verstretch>
++                   </sizepolicy>
++                  </property>
++                  <property name="text" >
++                   <string>Platform:</string>
++                  </property>
++                 </widget>
++                </item>
++                <item>
++                 <widget class="QComboBox" name="platform" >
++                  <item>
++                   <property name="text" >
++                    <string>UNIX</string>
++                   </property>
++                  </item>
++                  <item>
++                   <property name="text" >
++                    <string>Windows</string>
++                   </property>
++                  </item>
++                  <item>
++                   <property name="text" >
++                    <string>VNC Proxy</string>
++                   </property>
++                  </item>
++                 </widget>
++                </item>
++                <item>
++                 <widget class="QLabel" name="typeLabel" >
++                  <property name="sizePolicy" >
++                   <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
++                    <horstretch>0</horstretch>
++                    <verstretch>0</verstretch>
++                   </sizepolicy>
++                  </property>
++                  <property name="text" >
++                   <string>Type:</string>
++                  </property>
++                 </widget>
++                </item>
++                <item>
++                 <widget class="QComboBox" name="type" >
++                  <item>
++                   <property name="text" >
++                    <string>KDE</string>
++                   </property>
++                  </item>
++                  <item>
++                   <property name="text" >
++                    <string>GNOME</string>
++                   </property>
++                  </item>
++                  <item>
++                   <property name="text" >
++                    <string>CDE</string>
++                   </property>
++                  </item>
++                  <item>
++                   <property name="text" >
++                    <string>XDM</string>
++                   </property>
++                  </item>
++                  <item>
++                   <property name="text" >
++                    <string>Custom</string>
++                   </property>
++                  </item>
++                 </widget>
++                </item>
++                <item>
++                 <widget class="QLabel" name="linkLabel" >
++                  <property name="sizePolicy" >
++                   <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
++                    <horstretch>0</horstretch>
++                    <verstretch>0</verstretch>
++                   </sizepolicy>
++                  </property>
++                  <property name="text" >
++                   <string>Link:</string>
++                  </property>
++                 </widget>
++                </item>
++                <item>
++                 <widget class="QComboBox" name="link" >
++                  <item>
++                   <property name="text" >
++                    <string>Modem</string>
++                   </property>
++                  </item>
++                  <item>
++                   <property name="text" >
++                    <string>ISDN</string>
++                   </property>
++                  </item>
++                  <item>
++                   <property name="text" >
++                    <string>ADSL</string>
++                   </property>
++                  </item>
++                  <item>
++                   <property name="text" >
++                    <string>WAN</string>
++                   </property>
++                  </item>
++                  <item>
++                   <property name="text" >
++                    <string>LAN</string>
++                   </property>
++                  </item>
++                 </widget>
++                </item>
++               </layout>
++              </item>
++              <item>
++               <layout class="QHBoxLayout" name="_10" >
++                <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>173</width>
++                    <height>20</height>
++                   </size>
++                  </property>
++                 </spacer>
++                </item>
++                <item>
++                 <widget class="QPushButton" name="desktopSettingButton" >
++                  <property name="enabled" >
++                   <bool>false</bool>
++                  </property>
++                  <property name="text" >
++                   <string>&amp;Settings...</string>
++                  </property>
++                 </widget>
++                </item>
++               </layout>
++              </item>
++             </layout>
++            </widget>
++           </item>
++           <item>
++            <widget class="QGroupBox" name="groupBox" >
++             <property name="title" >
++              <string>Geometry</string>
++             </property>
++             <layout class="QVBoxLayout" name="_11" >
++              <property name="spacing" >
++               <number>6</number>
++              </property>
++              <property name="margin" >
+                <number>9</number>
+               </property>
+-              <property name="value" >
++              <item>
++               <layout class="QHBoxLayout" name="_12" >
++                <property name="spacing" >
++                 <number>6</number>
++                </property>
++                <property name="margin" >
++                 <number>0</number>
++                </property>
++                <item>
++                 <widget class="QLabel" name="resolutionLabel" >
++                  <property name="sizePolicy" >
++                   <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
++                    <horstretch>0</horstretch>
++                    <verstretch>0</verstretch>
++                   </sizepolicy>
++                  </property>
++                  <property name="text" >
++                   <string>Resolution:</string>
++                  </property>
++                 </widget>
++                </item>
++                <item>
++                 <widget class="QComboBox" name="resolution" >
++                  <item>
++                   <property name="text" >
++                    <string>640x480</string>
++                   </property>
++                  </item>
++                  <item>
++                   <property name="text" >
++                    <string>800x600</string>
++                   </property>
++                  </item>
++                  <item>
++                   <property name="text" >
++                    <string>1024x768</string>
++                   </property>
++                  </item>
++                  <item>
++                   <property name="text" >
++                    <string>Fullscreen</string>
++                   </property>
++                  </item>
++                  <item>
++                   <property name="text" >
++                    <string>Custom</string>
++                   </property>
++                  </item>
++                 </widget>
++                </item>
++                <item>
++                 <widget class="QLabel" name="compressionLabel" >
++                  <property name="sizePolicy" >
++                   <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
++                    <horstretch>0</horstretch>
++                    <verstretch>0</verstretch>
++                   </sizepolicy>
++                  </property>
++                  <property name="text" >
++                   <string>Compression:</string>
++                  </property>
++                 </widget>
++                </item>
++                <item>
++                 <widget class="QComboBox" name="imageCompressionType" >
++                  <item>
++                   <property name="text" >
++                    <string>PNG</string>
++                   </property>
++                  </item>
++                  <item>
++                   <property name="text" >
++                    <string>JPEG</string>
++                   </property>
++                  </item>
++                  <item>
++                   <property name="text" >
++                    <string>Raw X11</string>
++                   </property>
++                  </item>
++                 </widget>
++                </item>
++               </layout>
++              </item>
++              <item>
++               <layout class="QHBoxLayout" name="_13" >
++                <property name="spacing" >
++                 <number>6</number>
++                </property>
++                <property name="margin" >
++                 <number>0</number>
++                </property>
++                <item>
++                 <widget class="QLabel" name="qualityLabel" >
++                  <property name="sizePolicy" >
++                   <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
++                    <horstretch>0</horstretch>
++                    <verstretch>0</verstretch>
++                   </sizepolicy>
++                  </property>
++                  <property name="text" >
++                   <string>JPEG Quality:</string>
++                  </property>
++                 </widget>
++                </item>
++                <item>
++                 <widget class="QSlider" name="imageQualityLevel" >
++                  <property name="enabled" >
++                   <bool>false</bool>
++                  </property>
++                  <property name="minimum" >
++                   <number>1</number>
++                  </property>
++                  <property name="maximum" >
++                   <number>9</number>
++                  </property>
++                  <property name="pageStep" >
++                   <number>9</number>
++                  </property>
++                  <property name="value" >
++                   <number>6</number>
++                  </property>
++                  <property name="orientation" >
++                   <enum>Qt::Horizontal</enum>
++                  </property>
++                  <property name="tickPosition" >
++                   <enum>QSlider::TicksBelow</enum>
++                  </property>
++                  <property name="tickInterval" >
++                   <number>1</number>
++                  </property>
++                 </widget>
++                </item>
++               </layout>
++              </item>
++              <item>
++               <layout class="QHBoxLayout" name="_14" >
++                <property name="spacing" >
++                 <number>6</number>
++                </property>
++                <property name="margin" >
++                 <number>0</number>
++                </property>
++                <item>
++                 <widget class="QCheckBox" name="render" >
++                  <property name="text" >
++                   <string>Use RENDER Extension</string>
++                  </property>
++                  <property name="checked" >
++                   <bool>true</bool>
++                  </property>
++                 </widget>
++                </item>
++                <item>
++                 <widget class="QLabel" name="widthLabel" >
++                  <property name="sizePolicy" >
++                   <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
++                    <horstretch>0</horstretch>
++                    <verstretch>0</verstretch>
++                   </sizepolicy>
++                  </property>
++                  <property name="text" >
++                   <string>Width:</string>
++                  </property>
++                 </widget>
++                </item>
++                <item>
++                 <widget class="QSpinBox" name="width" >
++                  <property name="enabled" >
++                   <bool>false</bool>
++                  </property>
++                  <property name="maximum" >
++                   <number>9999</number>
++                  </property>
++                  <property name="value" >
++                   <number>800</number>
++                  </property>
++                 </widget>
++                </item>
++                <item>
++                 <widget class="QLabel" name="heightLabel" >
++                  <property name="sizePolicy" >
++                   <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
++                    <horstretch>0</horstretch>
++                    <verstretch>0</verstretch>
++                   </sizepolicy>
++                  </property>
++                  <property name="text" >
++                   <string>Height:</string>
++                  </property>
++                 </widget>
++                </item>
++                <item>
++                 <widget class="QSpinBox" name="height" >
++                  <property name="enabled" >
++                   <bool>false</bool>
++                  </property>
++                  <property name="maximum" >
++                   <number>9999</number>
++                  </property>
++                  <property name="value" >
++                   <number>600</number>
++                  </property>
++                 </widget>
++                </item>
++               </layout>
++              </item>
++             </layout>
++            </widget>
++           </item>
++          </layout>
++         </widget>
++         <widget class="QWidget" name="advancedTab" >
++          <property name="geometry" >
++           <rect>
++            <x>0</x>
++            <y>0</y>
++            <width>624</width>
++            <height>496</height>
++           </rect>
++          </property>
++          <attribute name="title" >
++           <string>Advanced</string>
++          </attribute>
++          <layout class="QVBoxLayout" name="_15" >
++           <property name="spacing" >
++            <number>6</number>
++           </property>
++           <property name="margin" >
++            <number>9</number>
++           </property>
++           <item>
++            <widget class="QGroupBox" name="networkGroup" >
++             <property name="title" >
++              <string>Network</string>
++             </property>
++             <layout class="QVBoxLayout" name="_16" >
++              <property name="spacing" >
+                <number>6</number>
+               </property>
+-              <property name="orientation" >
+-               <enum>Qt::Horizontal</enum>
++              <property name="margin" >
++               <number>9</number>
+               </property>
+-              <property name="tickPosition" >
+-               <enum>QSlider::TicksBelow</enum>
++              <item>
++               <widget class="QCheckBox" name="encryption" >
++                <property name="text" >
++                 <string>Use SSH Tunneling</string>
++                </property>
++                <property name="checked" >
++                 <bool>true</bool>
++                </property>
++               </widget>
++              </item>
++             </layout>
++            </widget>
++           </item>
++           <item>
++            <widget class="QGroupBox" name="cacheGroup" >
++             <property name="title" >
++              <string>Cache</string>
++             </property>
++             <layout class="QVBoxLayout" name="_17" >
++              <property name="spacing" >
++               <number>6</number>
+               </property>
+-              <property name="tickInterval" >
+-               <number>1</number>
++              <property name="margin" >
++               <number>9</number>
+               </property>
+-             </widget>
+-            </item>
+-           </layout>
+-          </item>
+-          <item>
+-           <layout class="QHBoxLayout" >
+-            <property name="spacing" >
+-             <number>6</number>
+-            </property>
+-            <property name="leftMargin" >
+-             <number>0</number>
+-            </property>
+-            <property name="topMargin" >
+-             <number>0</number>
+-            </property>
+-            <property name="rightMargin" >
+-             <number>0</number>
+-            </property>
+-            <property name="bottomMargin" >
+-             <number>0</number>
+-            </property>
+-            <item>
+-             <widget class="QCheckBox" name="render" >
+-              <property name="text" >
+-               <string>Use RENDER Extension</string>
+-              </property>
+-              <property name="checked" >
+-               <bool>true</bool>
+-              </property>
+-             </widget>
+-            </item>
+-            <item>
+-             <widget class="QLabel" name="widthLabel" >
+-              <property name="sizePolicy" >
+-               <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
+-                <horstretch>0</horstretch>
+-                <verstretch>0</verstretch>
+-               </sizepolicy>
+-              </property>
+-              <property name="text" >
+-               <string>Width:</string>
+-              </property>
+-             </widget>
+-            </item>
+-            <item>
+-             <widget class="QSpinBox" name="width" >
+-              <property name="enabled" >
+-               <bool>false</bool>
+-              </property>
+-              <property name="maximum" >
+-               <number>9999</number>
+-              </property>
+-              <property name="value" >
+-               <number>800</number>
+-              </property>
+-             </widget>
+-            </item>
+-            <item>
+-             <widget class="QLabel" name="heightLabel" >
+-              <property name="sizePolicy" >
+-               <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
+-                <horstretch>0</horstretch>
+-                <verstretch>0</verstretch>
+-               </sizepolicy>
+-              </property>
+-              <property name="text" >
+-               <string>Height:</string>
+-              </property>
+-             </widget>
+-            </item>
+-            <item>
+-             <widget class="QSpinBox" name="height" >
+-              <property name="enabled" >
+-               <bool>false</bool>
+-              </property>
+-              <property name="maximum" >
+-               <number>9999</number>
+-              </property>
+-              <property name="value" >
+-               <number>600</number>
+-              </property>
+-             </widget>
+-            </item>
+-           </layout>
+-          </item>
+-         </layout>
+-        </widget>
+-       </item>
+-      </layout>
+-     </widget>
+-     <widget class="QWidget" name="advancedTab" >
+-      <attribute name="title" >
+-       <string>Advanced</string>
+-      </attribute>
+-      <layout class="QVBoxLayout" >
+-       <property name="spacing" >
+-        <number>6</number>
+-       </property>
+-       <property name="leftMargin" >
+-        <number>9</number>
+-       </property>
+-       <property name="topMargin" >
+-        <number>9</number>
+-       </property>
+-       <property name="rightMargin" >
+-        <number>9</number>
+-       </property>
+-       <property name="bottomMargin" >
+-        <number>9</number>
+-       </property>
+-       <item>
+-        <widget class="QGroupBox" name="networkGroup" >
+-         <property name="title" >
+-          <string>Network</string>
+-         </property>
+-         <layout class="QVBoxLayout" >
+-          <property name="spacing" >
+-           <number>6</number>
+-          </property>
+-          <property name="leftMargin" >
+-           <number>9</number>
+-          </property>
+-          <property name="topMargin" >
+-           <number>9</number>
+-          </property>
+-          <property name="rightMargin" >
+-           <number>9</number>
+-          </property>
+-          <property name="bottomMargin" >
+-           <number>9</number>
+-          </property>
+-          <item>
+-           <widget class="QCheckBox" name="encryption" >
+-            <property name="text" >
+-             <string>Use SSH Tunneling</string>
+-            </property>
+-            <property name="checked" >
+-             <bool>true</bool>
+-            </property>
+-           </widget>
+-          </item>
+-         </layout>
+-        </widget>
+-       </item>
+-       <item>
+-        <widget class="QGroupBox" name="cacheGroup" >
+-         <property name="title" >
+-          <string>Cache</string>
+-         </property>
+-         <layout class="QVBoxLayout" >
+-          <property name="spacing" >
+-           <number>6</number>
+-          </property>
+-          <property name="leftMargin" >
+-           <number>9</number>
+-          </property>
+-          <property name="topMargin" >
+-           <number>9</number>
+-          </property>
+-          <property name="rightMargin" >
+-           <number>9</number>
+-          </property>
+-          <property name="bottomMargin" >
+-           <number>9</number>
+-          </property>
+-          <item>
+-           <layout class="QHBoxLayout" >
+-            <property name="spacing" >
+-             <number>6</number>
+-            </property>
+-            <property name="leftMargin" >
+-             <number>0</number>
+-            </property>
+-            <property name="topMargin" >
+-             <number>0</number>
+-            </property>
+-            <property name="rightMargin" >
+-             <number>0</number>
+-            </property>
+-            <property name="bottomMargin" >
+-             <number>0</number>
+-            </property>
+-            <item>
+-             <widget class="QLabel" name="memoryLabel" >
+-              <property name="sizePolicy" >
+-               <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
+-                <horstretch>0</horstretch>
+-                <verstretch>0</verstretch>
+-               </sizepolicy>
+-              </property>
+-              <property name="text" >
+-               <string>Memory:</string>
+-              </property>
+-             </widget>
+-            </item>
+-            <item>
+-             <widget class="QSpinBox" name="memoryCache" >
+-              <property name="maximum" >
+-               <number>128</number>
+-              </property>
+-              <property name="value" >
+-               <number>8</number>
+-              </property>
+-             </widget>
+-            </item>
+-            <item>
+-             <widget class="QLabel" name="memoryMBLabel" >
+-              <property name="text" >
+-               <string>MB</string>
+-              </property>
+-             </widget>
+-            </item>
+-            <item>
+-             <widget class="QLabel" name="diskLabel" >
+-              <property name="sizePolicy" >
+-               <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
+-                <horstretch>0</horstretch>
+-                <verstretch>0</verstretch>
+-               </sizepolicy>
+-              </property>
+-              <property name="text" >
+-               <string>Disk:</string>
+-              </property>
+-             </widget>
+-            </item>
+-            <item>
+-             <widget class="QSpinBox" name="diskCache" >
+-              <property name="maximum" >
+-               <number>128</number>
+-              </property>
+-              <property name="value" >
+-               <number>32</number>
+-              </property>
+-             </widget>
+-            </item>
+-            <item>
+-             <widget class="QLabel" name="diskMBLabel" >
+-              <property name="text" >
+-               <string>MB</string>
+-              </property>
+-             </widget>
+-            </item>
+-           </layout>
+-          </item>
+-         </layout>
++              <item>
++               <layout class="QHBoxLayout" name="_18" >
++                <property name="spacing" >
++                 <number>6</number>
++                </property>
++                <property name="margin" >
++                 <number>0</number>
++                </property>
++                <item>
++                 <widget class="QLabel" name="memoryLabel" >
++                  <property name="sizePolicy" >
++                   <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
++                    <horstretch>0</horstretch>
++                    <verstretch>0</verstretch>
++                   </sizepolicy>
++                  </property>
++                  <property name="text" >
++                   <string>Memory:</string>
++                  </property>
++                 </widget>
++                </item>
++                <item>
++                 <widget class="QSpinBox" name="memoryCache" >
++                  <property name="maximum" >
++                   <number>128</number>
++                  </property>
++                  <property name="value" >
++                   <number>8</number>
++                  </property>
++                 </widget>
++                </item>
++                <item>
++                 <widget class="QLabel" name="memoryMBLabel" >
++                  <property name="text" >
++                   <string>MB</string>
++                  </property>
++                 </widget>
++                </item>
++                <item>
++                 <widget class="QLabel" name="diskLabel" >
++                  <property name="sizePolicy" >
++                   <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
++                    <horstretch>0</horstretch>
++                    <verstretch>0</verstretch>
++                   </sizepolicy>
++                  </property>
++                  <property name="text" >
++                   <string>Disk:</string>
++                  </property>
++                 </widget>
++                </item>
++                <item>
++                 <widget class="QSpinBox" name="diskCache" >
++                  <property name="maximum" >
++                   <number>128</number>
++                  </property>
++                  <property name="value" >
++                   <number>32</number>
++                  </property>
++                 </widget>
++                </item>
++                <item>
++                 <widget class="QLabel" name="diskMBLabel" >
++                  <property name="text" >
++                   <string>MB</string>
++                  </property>
++                 </widget>
++                </item>
++               </layout>
++              </item>
++             </layout>
++            </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>
++         </widget>
+         </widget>
+        </item>
+        <item>
+-        <spacer>
+-         <property name="orientation" >
+-          <enum>Qt::Vertical</enum>
++        <layout class="QHBoxLayout" name="bottomLayout" >
++         <property name="spacing" >
++          <number>6</number>
+          </property>
+-         <property name="sizeHint" >
+-          <size>
+-           <width>20</width>
+-           <height>40</height>
+-          </size>
++         <property name="margin" >
++          <number>0</number>
+          </property>
+-        </spacer>
++         <item>
++          <widget class="QPushButton" name="cancelButton" >
++           <property name="text" >
++            <string>&amp;Cancel</string>
++           </property>
++          </widget>
++         </item>
++         <item>
++          <spacer name="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>
++         <item>
++          <widget class="QPushButton" name="okButton" >
++           <property name="text" >
++            <string>&amp;OK</string>
++           </property>
++           <property name="autoDefault" >
++            <bool>false</bool>
++           </property>
++           <property name="default" >
++            <bool>true</bool>
++           </property>
++          </widget>
++         </item>
++         <item>
++          <widget class="QPushButton" name="applyButton" >
++           <property name="text" >
++            <string>&amp;Apply</string>
++           </property>
++           <property name="autoDefault" >
++            <bool>false</bool>
++           </property>
++          </widget>
++         </item>
++        </layout>
+        </item>
+       </layout>
+      </widget>
+     </widget>
+    </item>
+-   <item>
+-    <layout class="QHBoxLayout" >
+-     <property name="spacing" >
+-      <number>6</number>
+-     </property>
+-     <property name="leftMargin" >
+-      <number>0</number>
+-     </property>
+-     <property name="topMargin" >
+-      <number>0</number>
+-     </property>
+-     <property name="rightMargin" >
+-      <number>0</number>
+-     </property>
+-     <property name="bottomMargin" >
+-      <number>0</number>
+-     </property>
+-     <item>
+-      <widget class="QPushButton" name="cancelButton" >
+-       <property name="text" >
+-        <string>&amp;Cancel</string>
+-       </property>
+-      </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>
+-     <item>
+-      <widget class="QPushButton" name="okButton" >
+-       <property name="text" >
+-        <string>&amp;OK</string>
+-       </property>
+-       <property name="autoDefault" >
+-        <bool>false</bool>
+-       </property>
+-       <property name="default" >
+-        <bool>true</bool>
+-       </property>
+-      </widget>
+-     </item>
+-     <item>
+-      <widget class="QPushButton" name="applyButton" >
+-       <property name="text" >
+-        <string>&amp;Apply</string>
+-       </property>
+-       <property name="autoDefault" >
+-        <bool>false</bool>
+-       </property>
+-      </widget>
+-     </item>
+-    </layout>
+-   </item>
+   </layout>
+  </widget>
+  <resources/>