Merge remote branch 'openslx/master' into mcastft

Conflicts:
	CMakeLists.txt
	pvsmgr.qrc
	src/gui/clientConfigDialog.cpp
	src/gui/mainWindow.cpp
	src/gui/ui/mainwindow.ui
	src/gui/ui/mainwindowtouch.ui
	src/pvs.cpp
	src/pvs.h
	src/pvsDaemon.cpp
	src/pvsgui.cpp

1 files changed, 15 insertions, 9 deletions

diff --git a/src/pvs.h b/src/pvs.h
index 3b3365c..5c35a0e 100644..100755
--- a/src/pvs.h
+++ b/src/pvs.h
@@ -13,8 +13,10 @@
 #define PVSCLIENT_H_
 
 #include <QtCore>
-#include <X11/Xlib.h>
-#include <X11/cursorfont.h>
+#ifndef __WIN32__
+   #include <X11/Xlib.h>
+   #include <X11/cursorfont.h>
+#endif
 #include <signal.h>
 
 #include "setup.h"
@@ -25,7 +27,6 @@
 #include "src/util/consoleLogger.h"
 #include "src/util/clientGUIUtils.h"
 
-
 class PVSServiceDiscovery;
 class PVSDiscoveredServer;
 class McastConfiguration;
@@ -71,7 +72,7 @@ public:
     void guiDelHost(QString host);
 
 public Q_SLOTS:
-    void start();
+    bool start();
     void quit();
     void chat_send(QString nick_to, QString nick_from, QString msg);
     QString chat_getNickname();
@@ -87,8 +88,9 @@ public Q_SLOTS:
     bool createMulticastTransfer(QString const& objectPath, quint64& transferID, QString& errorReason);
     void cancelOutgoingMulticastTransfer(quint64 transferID);
     void cancelIncomingMulticastTransfer(qulonglong transferID);
-    void setMulticastInterface(QString const& interfaceName);
-    void loadMcastConfig(QString const& encoded);
+
+    void setConfigValue(QString key, QString value);
+    QString getConfigValue(QString key);
 
 Q_SIGNALS:
     void project(QString host, int port, QString passwd, bool fullscreen,
@@ -134,7 +136,9 @@ private:
     bool _locked; ///< are we locked?
     QString _lockMsg; ///<  message to display while we're locked
     bool _vncAllowed; ///< whether vncConnections to this client are allowed (dup?)
-    BlankScreen *_blankScreen;///< obhject to blank the screen
+    /*#ifndef __WIN32__*/
+        BlankScreen *_blankScreen;///< object to blank the screen
+    /*#endif*/
 
     QFileSystemWatcher* _notify; ///< used to get notifies about file changes
     //vnc-server
@@ -152,8 +156,6 @@ private:
 
     PVSServerConnection* _pvsServerConnection; ///< our tcp connection object to the pvsserver
 
-    QSettings _settings;
-
     PVSServiceDiscovery *_sdClient;
 
     PVSChatClient *_chat;
@@ -167,6 +169,7 @@ private:
     QHash<quint64, PVSOutgoingMulticastTransfer*> _outgoingTransfers;
     QHash<quint64, PVSIncomingMulticastTransfer*> _incomingTransfers;
 
+    void loadMcastConfig(QString const& encoded);
     void onIncomingMulticastTransfer(QString const& sender, qulonglong transferID, QString const& basename, qulonglong size, ushort port);
     static quint64 generateMcastTransferID();
 
@@ -175,5 +178,8 @@ private Q_SLOTS:
     void outgoingMulticastTransferDelete(qulonglong transferID);
     void incomingMulticastTransferDelete(qulonglong transferID);
     void onIncomingMulticastTransferRetry(QString const& sender, qulonglong transferID);
+
+private:
+    QSettings _settings;
 };
 #endif /* PVSCLIENT_H_ */