[Frugalware-git] imgrebuild: freenx-client-0.9-3-x86_64 *fixed build *added some bugs fix should work better and why not perhaps works :p *nxcl can be probably split for don't add $pkgname as makedepends :)
bouleetbil
bouleetbil at frogdev.info
Thu May 20 10:18:58 CEST 2010
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=imgrebuild.git;a=commitdiff;h=d9829f4bbbaa37f20f715e3b2e137d0bde9af7c1
commit d9829f4bbbaa37f20f715e3b2e137d0bde9af7c1
Author: bouleetbil <bouleetbil at frogdev.info>
Date: Thu May 20 09:54:49 2010 +0200
freenx-client-0.9-3-x86_64
*fixed build
*added some bugs fix should work better and why not perhaps works :p
*nxcl can be probably split for don't add $pkgname as makedepends :)
diff --git a/source/xapps-extra/freenx-client/FrugalBuild b/source/xapps-extra/freenx-client/FrugalBuild
index 78e5106..f8752a4 100644
--- a/source/xapps-extra/freenx-client/FrugalBuild
+++ b/source/xapps-extra/freenx-client/FrugalBuild
@@ -9,30 +9,31 @@ _F_berlios_dirname="freenx"
_F_berlios_ext=".tar.bz2"
Finclude berlios
depends=('dbus' 'libqtxml>=4.6.2-3' 'libqtgui>=4.6.2-3' 'libice' 'libxrender' 'libxext')
-makedepends=('doxygen')
+makedepends=('doxygen' 'freenx-client')
replaces=('knx')
groups=('xapps-extra')
archs=('i686' 'x86_64')
up2date="Flasttar http://developer.berlios.de/project/showfiles.php?group_id=2978"
-source=($source freenx-client-0.9-fixes.patch)
+source=($source nxcl-gcc.diff nxcl-nxproxy.diff qtnx-idkey.diff qtnx-qtui.diff)
sha1sums=('cbe7f4d4c83e435d74192a07290a42cd42cb6242' \
- 'd246e3ad35d742f2680a05c4425b15e130bdd2d5')
+ '212922f0e52b549e4eadb1ee88f3a5799aa3df55' \
+ '7c9e8854cdcca4058891ccb1816b8245aaf4dddb' \
+ 'bcb7a4ae4410d1f8218755a809fb80fbcb133d17' \
+ '9459a0a72bd9fedc33ea33335212ee9fc4f676e2')
build()
{
- Fpatchall
- cat >> qtnx/qtnx.pro << EOF
-QMAKE_CXXFLAGS += -I`pwd`/nxcl/lib
-LIBS += -L`pwd`/nxcl/lib -lnxcl
-EOF
- mv nxcl/README README.nxcl || return 1
- mv qtnx/README README.qtnx || return 1
- cd nxcl || return 1
+ Fcd
+ cd nxcl || Fdie
+ Fpatch nxcl-gcc.diff
+ Fpatch nxcl-nxproxy.diff
Fautoreconf
Fmake --disable-static
Fmakeinstall
- cd ../qtnx || return 1
- qmake || return 1
+ cd ../qtnx || Fdie
+ Fpatch qtnx-idkey.diff
+ Fpatch qtnx-qtui.diff
+ qmake || Fdie
Fmake
Fexerel /usr/bin/qtnx
}
diff --git a/source/xapps-extra/freenx-client/nxcl-gcc.diff b/source/xapps-extra/freenx-client/nxcl-gcc.diff
new file mode 100644
index 0000000..82684d2
--- /dev/null
+++ b/source/xapps-extra/freenx-client/nxcl-gcc.diff
@@ -0,0 +1,37 @@
+Index: nxcl-0.9/lib/notQt.cpp
+===================================================================
+--- nxcl-0.9.orig/lib/notQt.cpp 2008-04-10 11:05:10.338942907 +0000
++++ nxcl-0.9/lib/notQt.cpp 2008-04-10 11:05:10.338942907 +0000
+@@ -19,6 +19,7 @@
+
+ #include <iostream>
+ #include <sstream>
++#include <cstdlib>
+ extern "C" {
+ #include <unistd.h>
+ #include <errno.h>
+Index: nxcl-0.9/lib/nxclientlib.cpp
+===================================================================
+--- nxcl-0.9.orig/lib/nxclientlib.cpp 2008-04-10 11:05:10.338942907 +0000
++++ nxcl-0.9/lib/nxclientlib.cpp 2008-04-10 11:05:10.338942907 +0000
+@@ -42,6 +42,8 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
++ #include <stdlib.h>
++ #include <string.h>
+ }
+
+ /*
+Index: nxcl-0.9/nxcl/nxcl.cpp
+===================================================================
+--- nxcl-0.9.orig/nxcl/nxcl.cpp 2008-04-10 11:06:21.840797475 +0000
++++ nxcl-0.9/nxcl/nxcl.cpp 2008-04-10 11:06:47.841471864 +0000
+@@ -29,6 +29,7 @@
+ extern "C" {
+ #include <dbus/dbus.h>
+ #include <X11/Xlib.h>
++#include <stdlib.h>
+ }
+
+ using namespace nxcl;
diff --git a/source/xapps-extra/freenx-client/nxcl-nxproxy.diff b/source/xapps-extra/freenx-client/nxcl-nxproxy.diff
new file mode 100644
index 0000000..36b91ef
--- /dev/null
+++ b/source/xapps-extra/freenx-client/nxcl-nxproxy.diff
@@ -0,0 +1,366 @@
+diff -urN nxcl-0.9/lib/notQt.cpp nxcl/lib/notQt.cpp
+--- nxcl-0.9/lib/notQt.cpp 2008-03-12 10:01:57.007236159 +0000
++++ nxcl/lib/notQt.cpp 2008-03-12 09:57:34.500868168 +0000
+@@ -26,6 +26,7 @@
+ #include <sys/wait.h>
+ #include <sys/stat.h>
+ #include <sys/poll.h>
++#include <sys/socket.h>
+ #include <signal.h>
+ }
+
+@@ -52,7 +53,8 @@
+ progName("unknown"),
+ error (NOTQPROCNOERROR),
+ pid(0),
+- signalledStart(false)
++ signalledStart(false),
++ parentFD(-1)
+ {
+ // Set up the polling structs
+ this->p = static_cast<struct pollfd*>(malloc (2*sizeof (struct pollfd)));
+@@ -62,6 +64,15 @@
+ notQProcess::~notQProcess ()
+ {
+ free (this->p);
++ if (parentFD != -1)
++ {
++ close(parentFD);
++ parentFD=-1;
++ }
++ // FIXME: this should be closed here
++ // close (parentToChild[READING_END]);
++ // close (childToParent[WRITING_END]);
++ // close (childErrToParent[WRITING_END]);
+ }
+
+ void
+@@ -84,10 +95,18 @@
+ // NB: The first item in the args list should be the program name.
+ this->progName = program;
+
++#ifdef NXCL_USE_NXSSH
+ // Set up our pipes
+ if (pipe(parentToChild) == -1 || pipe(childToParent) == -1 || pipe(childErrToParent) == -1) {
+ return NOTQTPROCESS_FAILURE;
+ }
++#else /* We need a socketpair for that to work */
++ if (socketpair(AF_UNIX, SOCK_STREAM, 0, parentToChild) == -1 || pipe(childErrToParent) == -1)
++ return NOTQTPROCESS_FAILURE;
++
++ childToParent[READING_END]=dup(parentToChild[WRITING_END]);
++ childToParent[WRITING_END]=dup(parentToChild[READING_END]);
++#endif
+
+ this->pid = fork();
+
+diff -urN nxcl-0.9/lib/notQt.h nxcl/lib/notQt.h
+--- nxcl-0.9/lib/notQt.h 2008-03-12 10:01:57.007236159 +0000
++++ nxcl/lib/notQt.h 2008-03-12 09:57:34.500868168 +0000
+@@ -117,6 +117,18 @@
+ pid_t getPid (void) { return this->pid; }
+ int getError (void) { return this->error; }
+ void setError (int e) { this->error = e; }
++
++ int getParentFD()
++ {
++ this->parentFD = this->parentToChild[1];
++ close(this->childToParent[0]);
++
++ // Create new pipes
++ pipe(this->parentToChild);
++ pipe(this->childToParent);
++
++ return this->parentFD;
++ }
+
+ /*!
+ * Setter for the callbacks.
+@@ -180,6 +192,11 @@
+ * Pointer to a callback object
+ */
+ notQProcessCallbacks * callbacks;
++
++ /*!
++ * old parent FD for comm with child
++ */
++ int parentFD;
+ };
+
+ /*!
+diff -urN nxcl-0.9/lib/nxclientlib.cpp nxcl/lib/nxclientlib.cpp
+--- nxcl-0.9/lib/nxclientlib.cpp 2008-03-12 10:01:57.007236159 +0000
++++ nxcl/lib/nxclientlib.cpp 2008-03-12 09:57:34.500868168 +0000
+@@ -8,7 +8,8 @@
+ : Author: Sebastian James
+ : (C) 2008 Defuturo Ltd
+ : Author: George Wright
+- email : seb at esfnet.co.uk, gwright at kde.org
++ : (C) 2008 Fabian Franz
++ email : seb at esfnet.co.uk, gwright at kde.org, freenx at fabian-franz.de
+ ***************************************************************************/
+
+ /***************************************************************************
+@@ -28,6 +29,14 @@
+
+ #include <fstream>
+
++// Define to use nxssh
++#if defined(NXCL_CYGWIN) || defined(NXCL_DARWIN)
++
++// FF-FIXME That does not work.
++//#define NXCL_USE_NXSSH 1
++
++#endif
++
+ extern "C" {
+ #include <errno.h>
+ #include <sys/types.h>
+@@ -186,10 +195,14 @@
+
+ // Start to build the arguments for the nxssh command.
+ // notQProcess requires that argv[0] contains the program name
++#ifdef NXCL_USE_NXSSH
+ arguments.push_back ("nxssh");
+
+ argtmp << "-nx";
+ arguments.push_back (argtmp.str());
++#else
++ arguments.push_back ("ssh");
++#endif
+
+ argtmp.str("");
+ argtmp << "-p" << port;
+@@ -215,6 +228,7 @@
+ }
+
+ argtmp.str("");
++ // FF-FIXME: Perhaps the user wants to login as user directly
+ argtmp << "nx@" << serverHost;
+ arguments.push_back (argtmp.str());
+
+@@ -227,9 +241,13 @@
+ arguments.push_back ("-oRSAAuthentication no");
+ arguments.push_back ("-oRhostsRSAAuthentication no");
+ arguments.push_back ("-oPubkeyAuthentication yes");
++ // FF-FIXME: Perhaps the user wants to login as user directly
++ //arguments.push_back ("-c nxserver");
+
+ if (encryption == true) {
++#ifdef NXCL_USE_NXSSH
+ arguments.push_back("-B");
++#endif
+ session.setEncryption (true);
+ } else {
+ session.setEncryption (false);
+@@ -240,10 +258,16 @@
+ // nxssh -E gives this message when called:
+ // NX> 285 Enabling skip of SSH config files
+ // ...so there you have the meaning.
++#ifdef NXCL_USE_NXSSH
+ arguments.push_back ("-E");
++#endif
+
+ // Find a path for the nxssh process using getPath()
++#ifdef NXCL_USE_NXSSH
+ string nxsshPath = this->getPath ("nxssh");
++#else
++ string nxsshPath = this->getPath ("ssh");
++#endif
+
+ this->nxsshProcess->start(nxsshPath, arguments);
+
+@@ -365,8 +389,9 @@
+
+ // On some connections this is sent via stdout instead of stderr?
+ if (proxyData.encrypted && readyForProxy &&
+- ((*msgiter).find("NX> 999 Bye")!=string::npos)) {
+-
++ ((*msgiter).find("NX> 999 Bye")!=string::npos))
++#ifdef NXCL_USE_NXSSH
++ {
+ // This is "NX> 299 Switching connection to: " in
+ // version 1.5.0. This was changed in nxssh version
+ // 2.0.0-8 (see the nxssh CHANGELOG).
+@@ -388,6 +413,11 @@
+ this->externalCallbacks->connectedSuccessfullySignal();
+ this->sessionRunning = true;
+ }
++#else /* don't use nxssh, start nxproxy -stdin */
++ {
++ invokeProxy();
++ }
++#endif
+
+ if ((*msgiter).find("Password") != string::npos) {
+ this->externalCallbacks->write
+@@ -402,6 +432,9 @@
+ dbgln ("NXClientLib::processParseStdout: Got auth failed"
+ " or capacity reached, calling this->parseSSH.");
+ msg = this->parseSSH (*msgiter);
++#ifndef NXCL_USE_NXSSH
++ this->isFinished = true;
++#endif
+ }
+ if (msg.size() > 0) {
+ this->write (msg);
+@@ -436,7 +469,9 @@
+ + (*msgiter) + "'(end msg)");
+
+ if (proxyData.encrypted && readyForProxy &&
+- ((*msgiter).find("NX> 999 Bye") != string::npos)) {
++ ((*msgiter).find("NX> 999 Bye") != string::npos))
++#ifdef NXCL_USE_NXSSH
++ {
+
+ string switchCommand = "NX> 299 Switch connection to: ";
+ stringstream ss;
+@@ -478,6 +513,11 @@
+ _("SSH host key verification failed"));
+ this->isFinished = true;
+ }
++#else /* don't use nxssh, use nxproxy -stdin */
++ {
++ invokeProxy();
++ }
++#endif
+ }
+ }
+
+@@ -580,21 +620,41 @@
+ this->externalCallbacks->serverCapacitySignal();
+ this->isFinished = true;
+
+- } else if
++ }
++#ifdef NXCL_USE_NXSSH
++ else if
+ (message.find ("NX> 204 Authentication failed.") != string::npos) {
+
+ this->externalCallbacks->write
+ (204, _("NX SSH Authentication Failed, finishing"));
+ this->isFinished = true;
+ }
++#endif
+
+ if (message.find("NX> 710 Session status: running") != string::npos) {
+
+ this->externalCallbacks->write
+ (710, _("Session status is \"running\""));
++ }
++
++ // FF-FIXME: This is technically incorrect as the proxy is just ready once 1002 and 1006 have
++ // been sent.
++ if (message.find("NX> 710 Session status: running") != string::npos) {
++
++ //this->externalCallbacks->write
++ // (1006, _("Session status is \"running\""));
++
++#ifdef NXCL_USE_NXSSH
+ invokeProxy();
++#else
++ if (!proxyData.encrypted)
++ invokeProxy();
++#endif
+ session.wipeSessions();
+- rMessage = "bye\n";
++ if (proxyData.encrypted)
++ rMessage = "bye\n";
++ else
++ rMessage = "quit\n";
+ }
+
+ return rMessage;
+@@ -700,18 +760,24 @@
+ stringstream data;
+
+ if (proxyData.encrypted) {
++#ifdef NXCL_USE_NXSSH
+ data << "nx/nx" << x11Display << ",session=session,encryption=1,cookie="
+ << proxyData.cookie
+ << ",id=" << proxyData.id << ",listen="
+ << proxyData.port << ":" << proxyData.display << "\n";
+ // may also need shmem=1,shpix=1,font=1,product=...
++#else
++ data << "nx/nx" << x11Display << ",session=session,encryption=1,cookie="
++ << proxyData.cookie
++ << ",id=" << proxyData.id << ":" << proxyData.display << "\n";
++#endif
+
+ } else {
+- // Not tested yet
++ // Not tested yet, FF-FIXME: Test
+ data << "nx/nx" << x11Display << ",session=session,cookie=" << proxyData.cookie
+- << ",id=" << proxyData.id
+- // << ",connect=" << proxyData.server << ":" << proxyData.display
+- << ",listen=" << proxyData.port << ":" << proxyData.display
++ << ",connect=" << proxyData.server << ":" << proxyData.port
++ << ",id=" << proxyData.id << ":" << proxyData.display
++ //<< ",listen=" << proxyData.port << ":" << proxyData.display
+ << "\n";
+ }
+
+@@ -726,10 +792,23 @@
+ list<string> arguments;
+ arguments.push_back("nxproxy"); // argv[0] has to be the program name
+ arguments.push_back("-S");
++
+ ss.str("");
+- ss << "options=" << nxdir;
+- ss << ":" << proxyData.display;
+- arguments.push_back(ss.str());
++ ss << "nx/nx,options=" << nxdir << ":" << proxyData.display;
++
++ setenv("NX_DISPLAY", ss.str().c_str(), 1);
++
++#ifndef NXCL_USE_NXSSH
++ if (proxyData.encrypted)
++ {
++ ss.str("");
++ ss << this->nxsshProcess->getParentFD();
++ fprintf(stderr, "NX_COMMFD=%d", this->nxsshProcess->getParentFD());
++ setenv("NX_COMMFD", ss.str().c_str(), 1);
++ // FF-FIXME: need to wait for 2 secs due to race condition with "bye" in buffer
++ sleep(2);
++ }
++#endif
+
+ // Find a path for the nxproxy process using getPath()
+ string nxproxyPath = this->getPath ("nxproxy");
+diff -urN nxcl-0.9/lib/nxsession.cpp nxcl/lib/nxsession.cpp
+--- nxcl-0.9/lib/nxsession.cpp 2008-03-12 10:01:57.007236159 +0000
++++ nxcl/lib/nxsession.cpp 2008-03-12 09:57:34.500868168 +0000
+@@ -69,6 +69,7 @@
+ int response = parseResponse (message);
+ string returnMessage;
+
++#ifdef NXCL_USE_NXSSH
+ if (response == 211) {
+ if (doSSH == true) {
+ returnMessage = "yes";
+@@ -80,6 +81,7 @@
+ if (response == 204) { // Authentication failed
+ returnMessage = "204";
+ }
++#endif
+
+ if (response == 147) { // Server capacity reached
+ returnMessage = "147";
+@@ -90,6 +92,17 @@
+ case HELLO_NXCLIENT:
+ dbgln ("HELLO_NXCLIENT stage");
+
++ if (message.find("Are you sure you want to continue connecting (yes/no)?") != string::npos)
++ returnMessage = "yes"; // FF-FIXME: Or 211?
++
++ if (message.find("assword") != string::npos)
++ returnMessage = nxPassword; // FF-FIXME: -> What to do? What to do?
++
++ if (message.find("Permission denied") != string::npos ||
++ message.find("su: Authentication failure") != string::npos ||
++ message.find("Unknown id:") != string::npos)
++ returnMessage = "204"; // Authentication failed
++
+ if (message.find("HELLO NXSERVER - Version") != string::npos) {
+ this->callbacks->authenticatedSignal();
+ returnMessage = "hello NXCLIENT - Version ";
diff --git a/source/xapps-extra/freenx-client/qtnx-idkey.diff b/source/xapps-extra/freenx-client/qtnx-idkey.diff
new file mode 100644
index 0000000..f4a8a87
--- /dev/null
+++ b/source/xapps-extra/freenx-client/qtnx-idkey.diff
@@ -0,0 +1,13 @@
+Index: qtnx-0.9/qtnxwindow.cpp
+===================================================================
+--- qtnx-0.9.orig/qtnxwindow.cpp 2008-03-14 12:25:00.638618439 +0000
++++ qtnx-0.9/qtnxwindow.cpp 2008-03-14 12:25:34.639487284 +0000
+@@ -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";
diff --git a/source/xapps-extra/freenx-client/qtnx-qtui.diff b/source/xapps-extra/freenx-client/qtnx-qtui.diff
new file mode 100644
index 0000000..29ab39e
--- /dev/null
+++ b/source/xapps-extra/freenx-client/qtnx-qtui.diff
@@ -0,0 +1,762 @@
+Index: qtnx-0.9/keydialog.ui
+===================================================================
+--- qtnx-0.9.orig/keydialog.ui 2008-03-11 09:52:51.201108384 +0000
++++ qtnx-0.9/keydialog.ui 2008-03-11 09:55:25.704856401 +0000
+@@ -1,7 +1,4 @@
+ <ui version="4.0" >
+- <author></author>
+- <comment></comment>
+- <exportmacro></exportmacro>
+ <class>KeyDialog</class>
+ <widget class="QDialog" name="KeyDialog" >
+ <property name="geometry" >
+@@ -79,7 +76,6 @@
+ </item>
+ </layout>
+ </widget>
+- <pixmapfunction></pixmapfunction>
+ <resources/>
+ <connections>
+ <connection>
+Index: qtnx-0.9/logindialog.ui
+===================================================================
+--- qtnx-0.9.orig/logindialog.ui 2008-03-11 09:52:51.701120513 +0000
++++ qtnx-0.9/logindialog.ui 2008-03-11 09:55:18.704686588 +0000
+@@ -5,7 +5,7 @@
+ <rect>
+ <x>0</x>
+ <y>0</y>
+- <width>396</width>
++ <width>398</width>
+ <height>207</height>
+ </rect>
+ </property>
+@@ -13,6 +13,12 @@
+ <string>QtNX</string>
+ </property>
+ <layout class="QVBoxLayout" >
++ <property name="margin" >
++ <number>9</number>
++ </property>
++ <property name="spacing" >
++ <number>6</number>
++ </property>
+ <item>
+ <widget class="QLabel" name="logo" >
+ <property name="text" >
+@@ -25,22 +31,19 @@
+ </item>
+ <item>
+ <layout class="QHBoxLayout" >
++ <property name="margin" >
++ <number>0</number>
++ </property>
++ <property name="spacing" >
++ <number>6</number>
++ </property>
+ <item>
+ <layout class="QVBoxLayout" >
+- <property name="spacing" >
+- <number>6</number>
+- </property>
+- <property name="leftMargin" >
++ <property name="margin" >
+ <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 name="spacing" >
++ <number>6</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="usernameLabel" >
+@@ -67,6 +70,12 @@
+ </item>
+ <item>
+ <layout class="QVBoxLayout" >
++ <property name="margin" >
++ <number>0</number>
++ </property>
++ <property name="spacing" >
++ <number>6</number>
++ </property>
+ <item>
+ <widget class="QLineEdit" name="username" >
+ <property name="minimumSize" >
+@@ -92,10 +101,18 @@
+ </item>
+ <item>
+ <layout class="QHBoxLayout" >
++ <property name="margin" >
++ <number>0</number>
++ </property>
++ <property name="spacing" >
++ <number>6</number>
++ </property>
+ <item>
+ <widget class="QComboBox" name="session" >
+ <property name="sizePolicy" >
+- <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
++ <sizepolicy>
++ <hsizetype>0</hsizetype>
++ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+@@ -139,6 +156,12 @@
+ </item>
+ <item>
+ <layout class="QHBoxLayout" >
++ <property name="margin" >
++ <number>0</number>
++ </property>
++ <property name="spacing" >
++ <number>6</number>
++ </property>
+ <item>
+ <widget class="QPushButton" name="configureButton" >
+ <property name="text" >
+Index: qtnx-0.9/logwindow.ui
+===================================================================
+--- qtnx-0.9.orig/logwindow.ui 2008-03-11 09:52:51.701120513 +0000
++++ qtnx-0.9/logwindow.ui 2008-03-11 09:55:04.704346962 +0000
+@@ -13,20 +13,11 @@
+ <string>QtNX Logging Output</string>
+ </property>
+ <layout class="QVBoxLayout" >
+- <property name="spacing" >
+- <number>6</number>
+- </property>
+- <property name="leftMargin" >
+- <number>9</number>
+- </property>
+- <property name="topMargin" >
++ <property name="margin" >
+ <number>9</number>
+ </property>
+- <property name="rightMargin" >
+- <number>9</number>
+- </property>
+- <property name="bottomMargin" >
+- <number>9</number>
++ <property name="spacing" >
++ <number>6</number>
+ </property>
+ <item>
+ <widget class="QTextEdit" name="output" >
+Index: qtnx-0.9/sessionsdialog.ui
+===================================================================
+--- qtnx-0.9.orig/sessionsdialog.ui 2008-03-12 10:01:47.507005698 +0000
++++ qtnx-0.9/sessionsdialog.ui 2008-03-11 09:54:57.204165019 +0000
+@@ -1,7 +1,4 @@
+ <ui version="4.0" >
+- <author></author>
+- <comment></comment>
+- <exportmacro></exportmacro>
+ <class>SessionsDialog</class>
+ <widget class="QDialog" name="SessionsDialog" >
+ <property name="geometry" >
+@@ -95,7 +92,6 @@
+ </item>
+ </layout>
+ </widget>
+- <pixmapfunction></pixmapfunction>
+ <resources/>
+ <connections/>
+ </ui>
+Index: qtnx-0.9/settingsdialog.ui
+===================================================================
+--- qtnx-0.9.orig/settingsdialog.ui 2008-03-12 10:01:47.507005698 +0000
++++ qtnx-0.9/settingsdialog.ui 2008-03-11 09:54:49.203970947 +0000
+@@ -5,7 +5,7 @@
+ <rect>
+ <x>0</x>
+ <y>0</y>
+- <width>468</width>
++ <width>472</width>
+ <height>546</height>
+ </rect>
+ </property>
+@@ -16,20 +16,11 @@
+ <bool>true</bool>
+ </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" >
++ <property name="margin" >
+ <number>9</number>
+ </property>
+- <property name="bottomMargin" >
+- <number>9</number>
++ <property name="spacing" >
++ <number>6</number>
+ </property>
+ <item>
+ <widget class="QTabWidget" name="layoutTabs" >
+@@ -41,20 +32,11 @@
+ <string>Basic</string>
+ </attribute>
+ <layout class="QVBoxLayout" >
+- <property name="spacing" >
+- <number>6</number>
+- </property>
+- <property name="leftMargin" >
++ <property name="margin" >
+ <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 name="spacing" >
++ <number>6</number>
+ </property>
+ <item>
+ <widget class="QGroupBox" name="generalGroup" >
+@@ -62,42 +44,26 @@
+ <string>General</string>
+ </property>
+ <layout class="QVBoxLayout" >
+- <property name="spacing" >
+- <number>6</number>
+- </property>
+- <property name="leftMargin" >
+- <number>9</number>
+- </property>
+- <property name="topMargin" >
++ <property name="margin" >
+ <number>9</number>
+ </property>
+- <property name="rightMargin" >
+- <number>9</number>
+- </property>
+- <property name="bottomMargin" >
+- <number>9</number>
++ <property name="spacing" >
++ <number>6</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" >
++ <property name="margin" >
+ <number>0</number>
+ </property>
+- <property name="bottomMargin" >
+- <number>0</number>
++ <property name="spacing" >
++ <number>6</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="sessionNameLabel" >
+ <property name="sizePolicy" >
+- <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
++ <sizepolicy>
++ <hsizetype>0</hsizetype>
++ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+@@ -121,42 +87,26 @@
+ <string>Server</string>
+ </property>
+ <layout class="QVBoxLayout" >
+- <property name="spacing" >
+- <number>6</number>
+- </property>
+- <property name="leftMargin" >
++ <property name="margin" >
+ <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 name="spacing" >
++ <number>6</number>
+ </property>
+ <item>
+ <layout class="QHBoxLayout" >
+- <property name="spacing" >
+- <number>6</number>
+- </property>
+- <property name="leftMargin" >
++ <property name="margin" >
+ <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 name="spacing" >
++ <number>6</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="hostnameLabel" >
+ <property name="sizePolicy" >
+- <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
++ <sizepolicy>
++ <hsizetype>0</hsizetype>
++ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+@@ -172,7 +122,9 @@
+ <item>
+ <widget class="QLabel" name="portLabel" >
+ <property name="sizePolicy" >
+- <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
++ <sizepolicy>
++ <hsizetype>0</hsizetype>
++ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+@@ -184,12 +136,12 @@
+ </item>
+ <item>
+ <widget class="QSpinBox" name="port" >
+- <property name="minimum" >
+- <number>1</number>
+- </property>
+ <property name="maximum" >
+ <number>65535</number>
+ </property>
++ <property name="minimum" >
++ <number>1</number>
++ </property>
+ <property name="value" >
+ <number>22</number>
+ </property>
+@@ -199,20 +151,11 @@
+ </item>
+ <item>
+ <layout class="QHBoxLayout" >
+- <property name="spacing" >
+- <number>6</number>
+- </property>
+- <property name="leftMargin" >
+- <number>0</number>
+- </property>
+- <property name="topMargin" >
++ <property name="margin" >
+ <number>0</number>
+ </property>
+- <property name="rightMargin" >
+- <number>0</number>
+- </property>
+- <property name="bottomMargin" >
+- <number>0</number>
++ <property name="spacing" >
++ <number>6</number>
+ </property>
+ <item>
+ <widget class="QCheckBox" name="defaultKey" >
+@@ -245,42 +188,26 @@
+ <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" >
++ <property name="margin" >
+ <number>9</number>
+ </property>
+- <property name="bottomMargin" >
+- <number>9</number>
++ <property name="spacing" >
++ <number>6</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" >
++ <property name="margin" >
+ <number>0</number>
+ </property>
+- <property name="bottomMargin" >
+- <number>0</number>
++ <property name="spacing" >
++ <number>6</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="platformLabel" >
+ <property name="sizePolicy" >
+- <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
++ <sizepolicy>
++ <hsizetype>0</hsizetype>
++ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+@@ -312,7 +239,9 @@
+ <item>
+ <widget class="QLabel" name="typeLabel" >
+ <property name="sizePolicy" >
+- <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
++ <sizepolicy>
++ <hsizetype>0</hsizetype>
++ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+@@ -354,7 +283,9 @@
+ <item>
+ <widget class="QLabel" name="linkLabel" >
+ <property name="sizePolicy" >
+- <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
++ <sizepolicy>
++ <hsizetype>0</hsizetype>
++ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+@@ -397,20 +328,11 @@
+ </item>
+ <item>
+ <layout class="QHBoxLayout" >
+- <property name="spacing" >
+- <number>6</number>
+- </property>
+- <property name="leftMargin" >
+- <number>0</number>
+- </property>
+- <property name="topMargin" >
++ <property name="margin" >
+ <number>0</number>
+ </property>
+- <property name="rightMargin" >
+- <number>0</number>
+- </property>
+- <property name="bottomMargin" >
+- <number>0</number>
++ <property name="spacing" >
++ <number>6</number>
+ </property>
+ <item>
+ <spacer>
+@@ -446,42 +368,26 @@
+ <string>Geometry</string>
+ </property>
+ <layout class="QVBoxLayout" >
+- <property name="spacing" >
+- <number>6</number>
+- </property>
+- <property name="leftMargin" >
+- <number>9</number>
+- </property>
+- <property name="topMargin" >
++ <property name="margin" >
+ <number>9</number>
+ </property>
+- <property name="rightMargin" >
+- <number>9</number>
+- </property>
+- <property name="bottomMargin" >
+- <number>9</number>
++ <property name="spacing" >
++ <number>6</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" >
++ <property name="margin" >
+ <number>0</number>
+ </property>
+- <property name="bottomMargin" >
+- <number>0</number>
++ <property name="spacing" >
++ <number>6</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="resolutionLabel" >
+ <property name="sizePolicy" >
+- <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
++ <sizepolicy>
++ <hsizetype>0</hsizetype>
++ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+@@ -523,7 +429,9 @@
+ <item>
+ <widget class="QLabel" name="compressionLabel" >
+ <property name="sizePolicy" >
+- <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
++ <sizepolicy>
++ <hsizetype>0</hsizetype>
++ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+@@ -556,25 +464,18 @@
+ </item>
+ <item>
+ <layout class="QHBoxLayout" >
+- <property name="spacing" >
+- <number>6</number>
+- </property>
+- <property name="leftMargin" >
++ <property name="margin" >
+ <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 name="spacing" >
++ <number>6</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="qualityLabel" >
+ <property name="sizePolicy" >
+- <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
++ <sizepolicy>
++ <hsizetype>0</hsizetype>
++ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+@@ -616,20 +517,11 @@
+ </item>
+ <item>
+ <layout class="QHBoxLayout" >
+- <property name="spacing" >
+- <number>6</number>
+- </property>
+- <property name="leftMargin" >
+- <number>0</number>
+- </property>
+- <property name="topMargin" >
++ <property name="margin" >
+ <number>0</number>
+ </property>
+- <property name="rightMargin" >
+- <number>0</number>
+- </property>
+- <property name="bottomMargin" >
+- <number>0</number>
++ <property name="spacing" >
++ <number>6</number>
+ </property>
+ <item>
+ <widget class="QCheckBox" name="render" >
+@@ -644,7 +536,9 @@
+ <item>
+ <widget class="QLabel" name="widthLabel" >
+ <property name="sizePolicy" >
+- <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
++ <sizepolicy>
++ <hsizetype>0</hsizetype>
++ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+@@ -670,7 +564,9 @@
+ <item>
+ <widget class="QLabel" name="heightLabel" >
+ <property name="sizePolicy" >
+- <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
++ <sizepolicy>
++ <hsizetype>0</hsizetype>
++ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+@@ -705,20 +601,11 @@
+ <string>Advanced</string>
+ </attribute>
+ <layout class="QVBoxLayout" >
+- <property name="spacing" >
+- <number>6</number>
+- </property>
+- <property name="leftMargin" >
+- <number>9</number>
+- </property>
+- <property name="topMargin" >
++ <property name="margin" >
+ <number>9</number>
+ </property>
+- <property name="rightMargin" >
+- <number>9</number>
+- </property>
+- <property name="bottomMargin" >
+- <number>9</number>
++ <property name="spacing" >
++ <number>6</number>
+ </property>
+ <item>
+ <widget class="QGroupBox" name="networkGroup" >
+@@ -726,20 +613,11 @@
+ <string>Network</string>
+ </property>
+ <layout class="QVBoxLayout" >
+- <property name="spacing" >
+- <number>6</number>
+- </property>
+- <property name="leftMargin" >
++ <property name="margin" >
+ <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 name="spacing" >
++ <number>6</number>
+ </property>
+ <item>
+ <widget class="QCheckBox" name="encryption" >
+@@ -760,42 +638,26 @@
+ <string>Cache</string>
+ </property>
+ <layout class="QVBoxLayout" >
+- <property name="spacing" >
+- <number>6</number>
+- </property>
+- <property name="leftMargin" >
++ <property name="margin" >
+ <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 name="spacing" >
++ <number>6</number>
+ </property>
+ <item>
+ <layout class="QHBoxLayout" >
+- <property name="spacing" >
+- <number>6</number>
+- </property>
+- <property name="leftMargin" >
+- <number>0</number>
+- </property>
+- <property name="topMargin" >
++ <property name="margin" >
+ <number>0</number>
+ </property>
+- <property name="rightMargin" >
+- <number>0</number>
+- </property>
+- <property name="bottomMargin" >
+- <number>0</number>
++ <property name="spacing" >
++ <number>6</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="memoryLabel" >
+ <property name="sizePolicy" >
+- <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
++ <sizepolicy>
++ <hsizetype>0</hsizetype>
++ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+@@ -825,7 +687,9 @@
+ <item>
+ <widget class="QLabel" name="diskLabel" >
+ <property name="sizePolicy" >
+- <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
++ <sizepolicy>
++ <hsizetype>0</hsizetype>
++ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+@@ -876,20 +740,11 @@
+ </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" >
++ <property name="margin" >
+ <number>0</number>
+ </property>
+- <property name="bottomMargin" >
+- <number>0</number>
++ <property name="spacing" >
++ <number>6</number>
+ </property>
+ <item>
+ <widget class="QPushButton" name="cancelButton" >
More information about the Frugalware-git
mailing list