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, 104 insertions, 42 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8afb407..0b5e89e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,15 +13,11 @@ SET(CMAKE_BUILD_TYPE Debug)
 SET(CMAKE_C_FLAGS_DEBUG "-O0 -g -Wall")
 SET(CMAKE_C_FLAGS_RELEASE "-O3 -march=native")
 SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -Wall")
-SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -march=native")
-# -DQT_NO_DEBUG_OUTPUT")
+SET(CMAKE_CXX_FLAGS_RELEASE "-O2 -DQT_NO_DEBUG_OUTPUT" )
 
 # local cmake modules
 SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR})
 
-#Test
-SET(CMAKE_EDIT_COMMAND ${CMAKE_SOURCE_DIR})
-
 # this command finds libraries and sets all required variables
 FIND_PACKAGE( Qt4 4.5.0 REQUIRED )
 FIND_PACKAGE( X11 REQUIRED )
@@ -33,6 +29,21 @@ INCLUDE_DIRECTORIES(
     ${CMAKE_BINARY_DIR}
 )
 
+IF(WIN32)
+    SET(sysdep_suffix _Win32)
+	INCLUDE_DIRECTORIES(
+        /c/KDE4/tmp/LibVNCServer-0.9.7/
+    )
+ELSEIF(UNIX)
+    SET(sysdep_suffix _X11)
+ENDIF(WIN32)
+
+################################################################################
+# Build third-party libraries
+################################################################################
+ADD_SUBDIRECTORY(3rdparty/qtsingleapplication)
+
+
 ################################################################################
 # Build third-party libraries
 ################################################################################
@@ -73,7 +84,6 @@ SET( PVSMGR_SRCS
     src/net/pvsClientConnection.cpp
     src/net/pvsServiceBroadcast.cpp
     src/util/consoleLogger.cpp
-    src/util/pvsSettingsManager.cpp
     src/util/util.cpp
     src/net/SslServer.cpp
     src/util/CertManager.cpp
@@ -93,8 +103,7 @@ SET( PVS_SRCS
     src/net/pvsLocalhostCommunicator.cpp
     src/util/util.cpp
     src/util/consoleLogger.cpp
-    src/util/clientGUIUtils.cpp
-    src/util/pvsSettingsManager.cpp
+    src/util/clientGUIUtils${sysdep_suffix}.cpp
     src/core/pvsChatClient.cpp
     src/net/pvsServiceDiscovery.cpp
     src/net/pvsDiscoveredServer.cpp
@@ -106,6 +115,7 @@ SET( PVS_SRCS
 
 # pvsgui
 SET( PVSGUI_SRCS
+	${QTSINGLEAPPLICATION_SRCS}
     src/pvsgui.cpp
     src/gui/clientConfigDialog.cpp
     src/gui/clientFileSendDialog.cpp
@@ -204,6 +214,7 @@ SET( PVS_MOC_HDRS
 )
 
 SET( PVSGUI_MOC_HDRS
+    ${QTSINGLEAPPLICATION_MOC_HDRS}
     src/pvsgui.h
     src/gui/clientConfigDialog.h
     src/gui/clientFileSendDialog.h
@@ -277,15 +288,16 @@ QT4_ADD_DBUS_ADAPTOR( PVS_SRCS ${CMAKE_BINARY_DIR}/org.openslx.pvs.xml src/pvs.h
 QT4_ADD_DBUS_INTERFACE( PVSGUI_SRCS ${CMAKE_BINARY_DIR}/org.openslx.pvs.xml pvsinterface )
 
 # i18n, run lupdate and lrelease)
-QT4_CREATE_TRANSLATION( PVSMGR_QMS ${PVSMGR_SRCS} ${PVSMGR_UI_HDRS} ${PVSMGR_TSS} )
-QT4_CREATE_TRANSLATION( PVS_QMS ${PVS_SRCS} ${PVS_TSS} )
-QT4_CREATE_TRANSLATION( PVSGUI_QMS ${PVSGUI_SRCS} ${PVSGUI_UI_HDRS} ${PVSGUI_TSS} )
+#QT4_CREATE_TRANSLATION( PVSMGR_QMS ${PVSMGR_SRCS} ${PVSMGR_UI_HDRS} ${PVSMGR_TSS} )
+#QT4_CREATE_TRANSLATION( PVS_QMS ${PVS_SRCS} ${PVS_TSS} )
+#QT4_CREATE_TRANSLATION( PVSGUI_QMS ${PVSGUI_SRCS} ${PVSGUI_UI_HDRS} ${PVSGUI_TSS} )
 
 ################################################################################
 # Build
 ################################################################################
 
 ## here we instruct CMake to build our executable from all of the source files
+if(UNIX)
 ADD_EXECUTABLE( pvsmgr 
     ${PVSMGR_SRCS}
     ${PVSMGR_MOC_SRCS}
@@ -301,8 +313,9 @@ ADD_EXECUTABLE( pvsmgrtouch
     ${PVSMGR_RC_SRCS}
     ${PVSMGR_QMS}
 )
+ENDIF(UNIX)
 
-ADD_EXECUTABLE( pvs 
+ADD_EXECUTABLE( pvs
     ${PVS_SRCS}
     ${PVS_MOC_SRCS}
     ${PVS_RC_SRCS}
@@ -319,40 +332,89 @@ ADD_EXECUTABLE( pvsgui
 
 # last thing we have to do is to tell CMake what libraries our executable needs,
 # luckily FIND_PACKAGE prepared variables for us:
-TARGET_LINK_LIBRARIES( pvsmgr
-    ${QT_LIBRARIES}
-    ${VNC_LIBRARIES}
-    ${X11_LIBRARIES}
-    pvsmcast
-)
-
-TARGET_LINK_LIBRARIES( pvsmgrtouch
-    ${QT_LIBRARIES}
-    ${VNC_LIBRARIES}
-    ${X11_LIBRARIES}
-    pvsmcast
-)
-
-TARGET_LINK_LIBRARIES( pvs
-    ${QT_LIBRARIES}
-    ${VNC_LIBRARIES}
-    ${X11_LIBRARIES}
-    pvsmcast
-)
-
-TARGET_LINK_LIBRARIES( pvsgui
-    ${QT_LIBRARIES}
-    ${VNC_LIBRARIES}
-)
 
+IF(WIN32)
+    TARGET_LINK_LIBRARIES( pvsmgr
+        
+    )
+ELSEIF(UNIX)
+TARGET_LINK_LIBRARIES( pvsmgr
+        ${QT_LIBRARIES}
+        ${VNC_LIBRARIES}
+        ${X11_LIBRARIES}
+	pvsmcast
+    )
+ENDIF(WIN32)
+
+IF(WIN32)
+    TARGET_LINK_LIBRARIES( pvsmgrtouch
+        
+    )
+ELSEIF(UNIX)
+    TARGET_LINK_LIBRARIES( pvsmgrtouch
+        ${QT_LIBRARIES}
+        ${VNC_LIBRARIES}
+        ${X11_LIBRARIES}
+	pvsmcast
+    )
+ENDIF(WIN32)
+
+IF(WIN32)
+    TARGET_LINK_LIBRARIES( pvs
+        ${QT_LIBRARIES}
+        ${VNC_LIBRARIES}
+        advapi32
+        ws2_32
+    )
+ELSEIF(UNIX)
+    TARGET_LINK_LIBRARIES( pvs
+        ${QT_LIBRARIES}
+        ${VNC_LIBRARIES}
+        ${X11_LIBRARIES}
+	pvsmcast
+    )
+ENDIF(WIN32)
+
+IF(WIN32)
+    TARGET_LINK_LIBRARIES( pvsgui
+        ${QT_LIBRARIES}
+        ${VNC_LIBRARIES}
+        #advapi32
+        ws2_32
+    )
+ELSEIF(UNIX)
+    TARGET_LINK_LIBRARIES( pvsgui
+        ${QT_LIBRARIES}
+        ${VNC_LIBRARIES}
+    )
+ENDIF(WIN32)
+
+IF(UNIX)
 SET_PROPERTY(TARGET pvsmgrtouch PROPERTY COMPILE_DEFINITIONS MAINWINDOW_USE_TOUCHGUI)
 SET_PROPERTY(TARGET pvsmgr PROPERTY COMPILE_DEFINITIONS MAINWINDOW_USE_NORMALGUI)  
+ENDIF(UNIX)
 
 # add install target to our makefile
-CONFIGURE_FILE( org.openslx.pvs.service ${CMAKE_BINARY_DIR}/org.openslx.pvs.service )
-INSTALL( TARGETS pvsmgr pvs pvsgui pvsmgrtouch RUNTIME DESTINATION bin )
-INSTALL( PROGRAMS misc/pvs-vncsrv DESTINATION bin)
-INSTALL( FILES ${CMAKE_BINARY_DIR}/org.openslx.pvs.service DESTINATION share/dbus-1/services )
+IF(WIN32)
+    INSTALL( TARGETS pvs pvsgui RUNTIME DESTINATION bin )
+ELSEIF(UNIX)
+    CONFIGURE_FILE( org.openslx.pvs.service ${CMAKE_BINARY_DIR}/org.openslx.pvs.service )
+    INSTALL( TARGETS pvsmgr pvs pvsgui pvsmgrtouch RUNTIME DESTINATION bin )
+    INSTALL( PROGRAMS misc/pvs-vncsrv DESTINATION bin)
+    INSTALL( FILES ${CMAKE_BINARY_DIR}/org.openslx.pvs.service DESTINATION share/dbus-1/services )
+    INSTALL( FILES misc/pvs.conf misc/pvsgui.conf misc/pvsmgr.conf DESTINATION /etc/openslx )
+    INSTALL( FILES misc/pvsgui.desktop DESTINATION /etc/xdg/autostart )
+ENDIF(WIN32)
+
+# add uninstall target to our makefile
+CONFIGURE_FILE(
+    "${CMAKE_CURRENT_SOURCE_DIR}/Uninstall.cmake"
+    "${CMAKE_CURRENT_BINARY_DIR}/Uninstall.cmake"
+    IMMEDIATE @ONLY
+)
+ADD_CUSTOM_TARGET( uninstall 
+    "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/Uninstall.cmake"
+)
 
 # add package target to our makefile
 SET( CPACK_GENERATOR "DEB;RPM" )
@@ -360,7 +422,7 @@ SET( CPACK_SET_DESTDIR "ON" )
 SET( CPACK_PACKAGE_NAME "pvs" )
 SET( CPACK_PACKAGE_VERSION_MAJOR "2" )
 SET( CPACK_PACKAGE_VERSION_MINOR "0" )
-SET( CPACK_PACKAGE_VERSION_PATCH "1" )
+SET( CPACK_PACKAGE_VERSION_PATCH "3" )
 SET( CPACK_PACKAGE_DESCRIPTION_SUMMARY "Pool Video Switch" )
 SET( CPACK_PACKAGE_DESCRIPTION "")
 SET( CPACK_PACKAGE_CONTACT "Simon Wittenberg <wittenb@informatik.uni-freiburg.de>" )