Merge branch 'master' of openslx.org:pvs

82 files changed, 216 insertions, 2104 deletions

diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
index e7676b6..4d7b2d7 100644
--- a/3rdparty/CMakeLists.txt
+++ b/3rdparty/CMakeLists.txt
@@ -2,7 +2,7 @@
 # Build OpenPGM
 ################################################################################
 
-INCLUDE(../OpenPGMConfig.cmake)
+INCLUDE( OpenPGMConfig )
 
 ADD_DEFINITIONS(${LIBPGM_CFLAGS})
 
diff --git a/AUTHORS b/AUTHORS
index a081ceb..b94eeae 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,11 +2,11 @@ Initial design and first versions:
 Simon Wittenberg <wittenb@informatik.uni-freiburg.de>
 
 Involved team members at the moment:
-Fabian Schillinger <schillif@informatik.uni-freiburg.de>
 Johann Latocha <johann@latocha.de>
-Sébastien Braun <sebb@yellowhippy.org>
 
 Credits of left team members:
+Fabian Schillinger <schillif@informatik.uni-freiburg.de>
+Sébastien Braun <sebb@yellowhippy.org>
 Johann Betz <jbetz@informatik.uni-freiburg.de>
 Javier Castillo <castillf@informatik.uni-freiburg.de>
 Achille Nana <achille.achille@gmail.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f45fda8..fccfb8b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,26 +2,23 @@
 # General
 ################################################################################
 
-# set project's name
-PROJECT( pvs )
-
-# cmake min version
-CMAKE_MINIMUM_REQUIRED( VERSION 2.6.2 )
+PROJECT(pvs)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0)
 
 # set compiler optimizations for debug and release
 SET(CMAKE_BUILD_TYPE Debug)
-SET(CMAKE_C_FLAGS_DEBUG "-O0 -g -Wall")
-SET(CMAKE_C_FLAGS_RELEASE "-O3 -march=native")
+SET(CMAKE_C_FLAGS_DEBUG "-O0 -g -Wall -Wunused -Wunreachable-code")
+SET(CMAKE_C_FLAGS_RELEASE "-O2")
 SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -Wall")
-SET(CMAKE_CXX_FLAGS_RELEASE "-O2 -DQT_NO_DEBUG_OUTPUT" )
+SET(CMAKE_CXX_FLAGS_RELEASE "-O2" )
 
 # local cmake modules
-SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR})
+SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
 # this command finds libraries and sets all required variables
-FIND_PACKAGE( Qt4 4.5.0 REQUIRED )
-FIND_PACKAGE( X11 REQUIRED )
-FIND_PACKAGE( VNC REQUIRED )
+FIND_PACKAGE(Qt4 4.5.0 REQUIRED)
+FIND_PACKAGE(X11 REQUIRED)
+FIND_PACKAGE(VNC REQUIRED)
 
 # some includes
 INCLUDE_DIRECTORIES(
@@ -41,25 +38,13 @@ ENDIF()
 
 ADD_SUBDIRECTORY(src/input)
 
-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)
-
+SET(SYSDEP_SUFFIX _X11)
 
 ################################################################################
 # Build third-party libraries
 ################################################################################
 
+ADD_SUBDIRECTORY(3rdparty/qtsingleapplication)
 ADD_SUBDIRECTORY(3rdparty)
 
 ################################################################################
@@ -72,9 +57,8 @@ ADD_SUBDIRECTORY(src/net/mcast)
 # Variables
 ################################################################################
 
-# with SET() command you can change variables or define new ones.
-# we define PVSMGR_SRCS variable that contains a list of all .cpp files
-SET( PVSMGR_SRCS
+# pvsmgr
+SET(PVSMGR_SRCS
     src/pvsmgr.cpp
     src/core/pvsClient.cpp
     src/core/pvsConnectionManager.cpp
@@ -109,7 +93,7 @@ SET( PVSMGR_SRCS
 )
 
 # pvs
-SET( PVS_SRCS
+SET(PVS_SRCS
     src/pvsDaemon.cpp
     src/pvs.cpp
     src/net/pvsMsg.cpp
@@ -118,7 +102,7 @@ SET( PVS_SRCS
     src/net/pvsLocalhostCommunicator.cpp
     src/util/util.cpp
     src/util/consoleLogger.cpp
-    src/util/clientGUIUtils${sysdep_suffix}.cpp
+    src/util/clientGUIUtils${SYSDEP_SUFFIX}.cpp
     src/core/pvsChatClient.cpp
     src/net/pvsServiceDiscovery.cpp
     src/net/pvsDiscoveredServer.cpp
@@ -129,7 +113,7 @@ SET( PVS_SRCS
 )
 
 # pvsgui
-SET( PVSGUI_SRCS
+SET(PVSGUI_SRCS
 	${QTSINGLEAPPLICATION_SRCS}
     src/pvsgui.cpp
     src/gui/clientConfigDialog.cpp
@@ -149,8 +133,8 @@ SET( PVSGUI_SRCS
 # Qt
 ################################################################################
 
-# some .ui files (Qt)
-SET( PVSMGR_UIS
+# .ui files
+SET(PVSMGR_UIS
     src/gui/ui/mainwindow.ui
     src/gui/ui/profileDialog.ui
     src/gui/ui/dialog.ui
@@ -165,7 +149,7 @@ SET( PVSMGR_UIS
     src/gui/ui/multicastConfigDialog.ui
 )
 
-SET( PVSMGRTOUCH_UIS
+SET(PVSMGRTOUCH_UIS
     src/gui/ui/mainwindowtouch.ui
     src/gui/ui/profileDialog.ui
     src/gui/ui/dialog.ui
@@ -176,7 +160,7 @@ SET( PVSMGRTOUCH_UIS
     src/gui/ui/multicastConfigDialog.ui
 )
 
-SET( PVSGUI_UIS
+SET(PVSGUI_UIS
     src/gui/ui/clientConfigDialog.ui
     src/gui/ui/clientFileSendDialog.ui
     src/gui/ui/clientFileReceiveDialog.ui
@@ -187,21 +171,13 @@ SET( PVSGUI_UIS
     src/gui/ui/clientNicklistDialog.ui
 )
 
-# resource file (Qt)
-SET( PVSMGR_RCS
-    pvsmgr.qrc
-)
-
-SET( PVS_RCS
-    pvs.qrc
-)
+# .qrc files
+SET(PVSMGR_RCS pvsmgr.qrc)
+SET(PVS_RCS pvs.qrc)
+SET(PVSGUI_RCS pvsgui.qrc)
 
-SET( PVSGUI_RCS
-    pvsgui.qrc
-)
-
-# includes all header files that should be treated with moc (Qt)
-SET( PVSMGR_MOC_HDRS
+# includes all header files that should be treated with moc
+SET(PVSMGR_MOC_HDRS
     src/gui/mainWindow.h
     src/gui/connectionWindow.h
     src/gui/frame.h
@@ -227,7 +203,7 @@ SET( PVSMGR_MOC_HDRS
     src/gui/multicastConfigDialog.h
 )
 
-SET( PVS_MOC_HDRS
+SET(PVS_MOC_HDRS
     src/pvs.h
     src/net/pvsLocalhostCommunicator.h
     src/net/pvsServerConnection.h
@@ -237,7 +213,7 @@ SET( PVS_MOC_HDRS
     src/net/pvsIncomingMulticastTransfer.h
 )
 
-SET( PVSGUI_MOC_HDRS
+SET(PVSGUI_MOC_HDRS
     ${QTSINGLEAPPLICATION_MOC_HDRS}
     src/pvsgui.h
     src/gui/clientConfigDialog.h
@@ -251,8 +227,8 @@ SET( PVSGUI_MOC_HDRS
     src/net/pvsNetworkInterfaceListModel.h
 )
 
-# i18n (Qt)
-SET( PVSMGR_TSS
+# i18n
+SET(PVSMGR_TSS
     i18n/pvsmgr_de_DE.ts
     i18n/pvsmgr_fr_FR.ts
     i18n/pvsmgr_es_MX.ts
@@ -260,7 +236,7 @@ SET( PVSMGR_TSS
     i18n/pvsmgr_pl_PL.ts
 )
 
-SET( PVS_TSS
+SET(PVS_TSS
     i18n/pvs_de_DE.ts
     i18n/pvs_fr_FR.ts
     i18n/pvs_es_MX.ts
@@ -268,7 +244,7 @@ SET( PVS_TSS
     i18n/pvs_pl_PL.ts
 )
 
-SET( PVSGUI_TSS
+SET(PVSGUI_TSS
     i18n/pvsgui_de_DE.ts
     i18n/pvsgui_fr_FR.ts
     i18n/pvsgui_es_MX.ts
@@ -277,52 +253,47 @@ SET( PVSGUI_TSS
 )
 
 
-# by default only QtCore and QtGui modules are enabled
-# other modules must be enabled like this:
-SET( QT_USE_QTDBUS TRUE )
-SET( QT_USE_QTNETWORK TRUE )
+# include Qt modules
+SET(QT_USE_QTDBUS TRUE)
+SET(QT_USE_QTNETWORK TRUE)
 
 # add some useful macros and variables
 # (QT_USE_FILE is a variable defined by FIND_PACKAGE( Qt4 ) that contains
 # a path to CMake script)
-INCLUDE( ${QT_USE_FILE} )
+INCLUDE(${QT_USE_FILE})
 
-# this command will generate rules that will run rcc on all files from 
-# PVSCLIENTGUI_RCS. in result PVSCLIENTGUI_RC_SRCS variable will contain paths 
-# to files produced by rcc  
-QT4_ADD_RESOURCES( PVSMGR_RC_SRCS ${PVSMGR_RCS} )
-QT4_ADD_RESOURCES( PVS_RC_SRCS ${PVS_RCS} )
-QT4_ADD_RESOURCES( PVSGUI_RC_SRCS ${PVSGUI_RCS} )
+# this will run rcc on .qrc files
+QT4_ADD_RESOURCES(PVSMGR_RC_SRCS ${PVSMGR_RCS})
+QT4_ADD_RESOURCES(PVS_RC_SRCS ${PVS_RCS})
+QT4_ADD_RESOURCES(PVSGUI_RC_SRCS ${PVSGUI_RCS})
 
-# this will run uic on .ui files:
-QT4_WRAP_UI( PVSMGR_UI_HDRS ${PVSMGR_UIS} )
-QT4_WRAP_UI( PVSMGRTOUCH_UI_HDRS ${PVSMGRTOUCH_UIS} )
-QT4_WRAP_UI( PVSGUI_UI_HDRS ${PVSGUI_UIS} )
+# this will run uic on .ui files
+QT4_WRAP_UI(PVSMGR_UI_HDRS ${PVSMGR_UIS})
+QT4_WRAP_UI(PVSMGRTOUCH_UI_HDRS ${PVSMGRTOUCH_UIS})
+QT4_WRAP_UI(PVSGUI_UI_HDRS ${PVSGUI_UIS})
 
-# this will run moc:
-QT4_WRAP_CPP( PVSMGR_MOC_SRCS ${PVSMGR_MOC_HDRS} )
-QT4_WRAP_CPP( PVS_MOC_SRCS ${PVS_MOC_HDRS} )
-QT4_WRAP_CPP( PVSGUI_MOC_SRCS ${PVSGUI_MOC_HDRS} )
+# this will run moc
+QT4_WRAP_CPP(PVSMGR_MOC_SRCS ${PVSMGR_MOC_HDRS})
+QT4_WRAP_CPP(PVS_MOC_SRCS ${PVS_MOC_HDRS})
+QT4_WRAP_CPP(PVSGUI_MOC_SRCS ${PVSGUI_MOC_HDRS})
 
 # run qdbuscpp2xml
-QT4_GENERATE_DBUS_INTERFACE( src/pvs.h org.openslx.pvs.xml )
+QT4_GENERATE_DBUS_INTERFACE(src/pvs.h org.openslx.pvs.xml)
 
 # run qdbusxml2cpp
-QT4_ADD_DBUS_ADAPTOR( PVS_SRCS ${CMAKE_BINARY_DIR}/org.openslx.pvs.xml src/pvs.h PVS )
-QT4_ADD_DBUS_INTERFACE( PVSGUI_SRCS ${CMAKE_BINARY_DIR}/org.openslx.pvs.xml pvsinterface )
+QT4_ADD_DBUS_ADAPTOR(PVS_SRCS ${CMAKE_BINARY_DIR}/org.openslx.pvs.xml src/pvs.h PVS)
+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 
+ADD_EXECUTABLE(pvsmgr 
     ${PVSMGR_SRCS}
     ${PVSMGR_MOC_SRCS}
     ${PVSMGR_UI_HDRS}
@@ -330,23 +301,22 @@ ADD_EXECUTABLE( pvsmgr
     ${PVSMGR_QMS}
 )
 
-ADD_EXECUTABLE( pvsmgrtouch
+ADD_EXECUTABLE(pvsmgrtouch
     ${PVSMGR_SRCS}
     ${PVSMGR_MOC_SRCS}
     ${PVSMGRTOUCH_UI_HDRS}
     ${PVSMGR_RC_SRCS}
     ${PVSMGR_QMS}
 )
-ENDIF(UNIX)
 
-ADD_EXECUTABLE( pvs
+ADD_EXECUTABLE(pvs
     ${PVS_SRCS}
     ${PVS_MOC_SRCS}
     ${PVS_RC_SRCS}
     ${PVS_QMS}
 )
 
-ADD_EXECUTABLE( pvsgui
+ADD_EXECUTABLE(pvsgui
     ${PVSGUI_SRCS}
     ${PVSGUI_MOC_SRCS}
     ${PVSGUI_UI_HDRS}
@@ -354,99 +324,61 @@ ADD_EXECUTABLE( pvsgui
     ${PVSGUI_QMS}
 )
 
-# last thing we have to do is to tell CMake what libraries our executable needs,
-# luckily FIND_PACKAGE prepared variables for us:
-
-IF(WIN32)
-    TARGET_LINK_LIBRARIES( pvsmgr
-        
-    )
-ELSEIF(UNIX)
-TARGET_LINK_LIBRARIES( pvsmgr
-        ${QT_LIBRARIES}
-        ${VNC_LIBRARIES}
-        ${X11_LIBRARIES}
-	pvsmcast
-        pvsinput
-    )
-ENDIF(WIN32)
-
-IF(WIN32)
-    TARGET_LINK_LIBRARIES( pvsmgrtouch
-        
-    )
-ELSEIF(UNIX)
-    TARGET_LINK_LIBRARIES( pvsmgrtouch
-        ${QT_LIBRARIES}
-        ${VNC_LIBRARIES}
-        ${X11_LIBRARIES}
-	pvsmcast
-        pvsinput
-    )
-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}
-        ${X11_XTest_LIB}
-        ${X11_Xinput_LIB}
-        pvsmcast
-        pvsinput
-    )
-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)
+# link
+TARGET_LINK_LIBRARIES(pvsmgr
+    ${QT_LIBRARIES}
+    ${VNC_LIBRARIES}
+    ${X11_LIBRARIES}
+    pvsmcast
+    pvsinput
+)
+
+TARGET_LINK_LIBRARIES(pvsmgrtouch
+    ${QT_LIBRARIES}
+    ${VNC_LIBRARIES}
+    ${X11_LIBRARIES}
+    pvsmcast
+    pvsinput
+)
+
+TARGET_LINK_LIBRARIES(pvs
+    ${QT_LIBRARIES}
+    ${VNC_LIBRARIES}
+    ${X11_LIBRARIES}
+    ${X11_XTest_LIB}
+    ${X11_Xinput_LIB}
+    pvsmcast
+    pvsinput
+)
+
+TARGET_LINK_LIBRARIES(pvsgui
+    ${QT_LIBRARIES}
+    ${VNC_LIBRARIES}
+)
+
 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
-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
+
+# install
+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)
+
+# uninstall
 CONFIGURE_FILE(
-    "${CMAKE_CURRENT_SOURCE_DIR}/Uninstall.cmake"
-    "${CMAKE_CURRENT_BINARY_DIR}/Uninstall.cmake"
+    "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Uninstall.cmake"
+    "${CMAKE_CURRENT_BINARY_DIR}/cmake/Uninstall.cmake"
     IMMEDIATE @ONLY
 )
-ADD_CUSTOM_TARGET( uninstall 
-    "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/Uninstall.cmake"
+ADD_CUSTOM_TARGET(uninstall 
+    "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake/Uninstall.cmake"
 )
 
-# add package target to our makefile
-SET( CPACK_GENERATOR "DEB;RPM" )
+# package
+SET( CPACK_GENERATOR "DEB" )
 SET( CPACK_SET_DESTDIR "ON" )
 SET( CPACK_PACKAGE_NAME "pvs" )
 SET( CPACK_PACKAGE_VERSION_MAJOR "3" )
@@ -454,10 +386,10 @@ SET( CPACK_PACKAGE_VERSION_MINOR "1" )
 SET( CPACK_PACKAGE_VERSION_PATCH "1" )
 SET( CPACK_PACKAGE_DESCRIPTION_SUMMARY "Pool Video Switch" )
 SET( CPACK_PACKAGE_DESCRIPTION "")
-SET( CPACK_PACKAGE_CONTACT "Simon Wittenberg <wittenb@informatik.uni-freiburg.de>" )
+SET( CPACK_PACKAGE_CONTACT "Johann Latocha <johann@latocha.de>" )
 SET( CPACK_DEBIAN_PACKAGE_DEPENDS "libvncserver0 (>= 0.9.3.dfsg.1-2), libqtgui4 (>= 4:4.5.3-4), libqt4-dbus (>= 4:4.5.3-4), libqt4-network (>= 4:4.5.3-4)" )
 SET( CPACK_DEBIAN_PACKAGE_ARCHITECTURE "i386" )
 SET( CPACK_DEBIAN_PACKAGE_SECTION "Network" )
 SET( CPACK_DEBIAN_PACKAGE_PRIORITY "optional" )
 SET( CPACK_DEBIAN_PACKAGE_RECOMMENDS "x11vnc (>= 0.9.9-1)" )
-INCLUDE( CPack ) # must be last!
+INCLUDE( CPack )
diff --git a/INSTALL b/INSTALL
index 6a7d736..437f9bc 100644
--- a/INSTALL
+++ b/INSTALL
@@ -10,7 +10,7 @@ The following packages are required:
 	libxtst-dev
 	libqt4-dev >= 4.5.3
 	qt4-dev-tools >= 4.5.3
-	cmake >= 2.4.0
+	cmake >= 2.8.0
 
 *** Installation ***
 
@@ -31,11 +31,14 @@ So change the current directory with:
 As superuser (root) you can install the application on your system:
 	make install
 	
+As superuser (root) you can uninstall too
+	make uninstall
+	
 It is also possible to build distribution specific packages (currently DEB only)
 	make package
 
 The Serverapplication is started with
-	pvsmgr
+	pvsmgrtouch
 
 the Clientdaemon with
 	pvs
@@ -43,18 +46,4 @@ the Clientdaemon with
 and the Clientgui with
 	pvsgui
 
-    
-*** VNC-Server for the PVS-Client ***
-
-Additionally a script/program has to be supplied to start/stop the vnc-server on the pvs-client.
-The program/script is expected to have the following signature:
-
-    program/script(start/stop, port, password)
-
-All paramters are passed as strings. The first paramter is either "start" or "stop", the second one defines the port on which the 
-vnc-server should run, the third which password should be set.
-Password and port are randomized by the PVS-Client. The port is chosen in the range of [59000, 59100].
-
-*** Contact ***
-
-In case of problems, questions or any kind of feedback, mail me : wittenb@informatik.uni-freiburg.de
+In case of problems, questions or any kind of feedback, mail me : johann@latocha.de
diff --git a/KNOWNBUGS b/KNOWNBUGS
index 7b051c4..e69de29 100644
--- a/KNOWNBUGS
+++ b/KNOWNBUGS
@@ -1,26 +0,0 @@
-
-Pattern:
-
-        #number Where?
-                Description
-
-
-
-
-
-
-#1  Frametable 
-    Frametable seems to spread out if you return from fullscreen/closeup.
-    doesnt seem to happen when you chose the upper, rightmost connection for fullscreen, 
-    but every other...
-    
-#2  Closeup
-    When returning from fullscreen to closeup, the picture isnt scaled down and looks silly
-
-#3  Closeup
-    Sometimes closeup seems to grow without stopping and so never showing a picture
-    
-#4  Fullscreen
-    When the connection breaks down while in fullscreen, fullscreen is not canceled
-    
-    
diff --git a/README b/README
index c5cf781..4b5f2c3 100644
--- a/README
+++ b/README
@@ -1,15 +1,4 @@
 For installation guidance, consult the INSTALL file.
 
 ATTENTION!
-	An external vnc service is necessary on the client side (e.g. x11vnc).
-
-Furthermore, the client (pvs) expects a .pvs directory in the home directory of the user (will be created on the first launch of 
-the client). In this directory, it expects a .pass file with the vnc-password and a file name .allow which contains a representation 
-of true/false ({1,0}, {true,false}) whether the vnc access should be allowed or disallowed.
-
-For Now, the Projection feature expects the VNC-Server on the PVS-Servers machine to accept no password or "viewonly" as password.
-A listing of client commands is following.
-
-For further information regarding options of the PVS-Client:
-
-	pvs -h or pvs --help
\ No newline at end of file
+	An external vnc service is necessary on the client side (e.g. x11vnc).
\ No newline at end of file
diff --git a/FindVNC.cmake b/cmake/FindVNC.cmake
index 8b460d3..8b460d3 100644
--- a/FindVNC.cmake
+++ b/cmake/FindVNC.cmake
diff --git a/OpenPGMConfig.cmake b/cmake/OpenPGMConfig.cmake
index 1b7adbc..1b7adbc 100644
--- a/OpenPGMConfig.cmake
+++ b/cmake/OpenPGMConfig.cmake
diff --git a/Uninstall.cmake b/cmake/Uninstall.cmake
index dbda3a2..dbda3a2 100644
--- a/Uninstall.cmake
+++ b/cmake/Uninstall.cmake
diff --git a/doc/LaTeX/Makefile b/doc/Makefile
index a3ecaf2..a3ecaf2 100644
--- a/doc/LaTeX/Makefile
+++ b/doc/Makefile
diff --git a/doc/LaTeX/appendix/0000-chapter.tex b/doc/appendix/0000-chapter.tex
index 97e98c3..97e98c3 100644
--- a/doc/LaTeX/appendix/0000-chapter.tex
+++ b/doc/appendix/0000-chapter.tex
diff --git a/doc/LaTeX/bilder/ConnectionList.png b/doc/bilder/ConnectionList.png
index 93140cb..93140cb 100755..100644
--- a/doc/LaTeX/bilder/ConnectionList.png
+++ b/doc/bilder/ConnectionList.png
diff --git a/doc/LaTeX/bilder/DBus.pdf b/doc/bilder/DBus.pdf
index 90331d6..90331d6 100644
--- a/doc/LaTeX/bilder/DBus.pdf
+++ b/doc/bilder/DBus.pdf
diff --git a/doc/LaTeX/bilder/FictionalPolicyChainClassDiagram.dia b/doc/bilder/FictionalPolicyChainClassDiagram.dia
index 620a9d1..620a9d1 100644
--- a/doc/LaTeX/bilder/FictionalPolicyChainClassDiagram.dia
+++ b/doc/bilder/FictionalPolicyChainClassDiagram.dia
diff --git a/doc/LaTeX/bilder/ImplementedPolicies.dia b/doc/bilder/ImplementedPolicies.dia
index 97ab5e8..97ab5e8 100644
--- a/doc/LaTeX/bilder/ImplementedPolicies.dia
+++ b/doc/bilder/ImplementedPolicies.dia
diff --git a/doc/LaTeX/bilder/InputEventHandlerChain-Sequence.dia b/doc/bilder/InputEventHandlerChain-Sequence.dia
index 73a789a..73a789a 100644
--- a/doc/LaTeX/bilder/InputEventHandlerChain-Sequence.dia
+++ b/doc/bilder/InputEventHandlerChain-Sequence.dia
diff --git a/doc/LaTeX/bilder/InputEventHandlerClassDiagram.dia b/doc/bilder/InputEventHandlerClassDiagram.dia
index dd8b3a0..dd8b3a0 100644
--- a/doc/LaTeX/bilder/InputEventHandlerClassDiagram.dia
+++ b/doc/bilder/InputEventHandlerClassDiagram.dia
diff --git a/doc/LaTeX/bilder/Klassendiagramm.pdf b/doc/bilder/Klassendiagramm.pdf
index ab5dc9c..ab5dc9c 100644
--- a/doc/LaTeX/bilder/Klassendiagramm.pdf
+++ b/doc/bilder/Klassendiagramm.pdf
diff --git a/doc/LaTeX/bilder/Klassendiagramm.svg b/doc/bilder/Klassendiagramm.svg
index 8b4ea29..8b4ea29 100644
--- a/doc/LaTeX/bilder/Klassendiagramm.svg
+++ b/doc/bilder/Klassendiagramm.svg
diff --git a/doc/LaTeX/bilder/PVSPrivInputDArchitecture.dia b/doc/bilder/PVSPrivInputDArchitecture.dia
index 4278ba7..4278ba7 100644
--- a/doc/LaTeX/bilder/PVSPrivInputDArchitecture.dia
+++ b/doc/bilder/PVSPrivInputDArchitecture.dia
diff --git a/doc/LaTeX/bilder/PhasesOfKeyboardHandling.dia b/doc/bilder/PhasesOfKeyboardHandling.dia
index 9250e0b..9250e0b 100644
--- a/doc/LaTeX/bilder/PhasesOfKeyboardHandling.dia
+++ b/doc/bilder/PhasesOfKeyboardHandling.dia
diff --git a/doc/LaTeX/bilder/PolicyChainClassDiagram.dia b/doc/bilder/PolicyChainClassDiagram.dia
index 3a311f5..3a311f5 100644
--- a/doc/LaTeX/bilder/PolicyChainClassDiagram.dia
+++ b/doc/bilder/PolicyChainClassDiagram.dia
diff --git a/doc/LaTeX/bilder/SayHelloHandler-PolicyHier.dia b/doc/bilder/SayHelloHandler-PolicyHier.dia
index 341ff41..341ff41 100644
--- a/doc/LaTeX/bilder/SayHelloHandler-PolicyHier.dia
+++ b/doc/bilder/SayHelloHandler-PolicyHier.dia
diff --git a/doc/LaTeX/bilder/UebertragungsEbenen.dia b/doc/bilder/UebertragungsEbenen.dia
index 5ae4edb..5ae4edb 100644
--- a/doc/LaTeX/bilder/UebertragungsEbenen.dia
+++ b/doc/bilder/UebertragungsEbenen.dia
diff --git a/doc/LaTeX/bilder/clientChatDialog.png b/doc/bilder/clientChatDialog.png
index cab6b26..cab6b26 100644
--- a/doc/LaTeX/bilder/clientChatDialog.png
+++ b/doc/bilder/clientChatDialog.png
diff --git a/doc/LaTeX/bilder/clientConfigDialog.png b/doc/bilder/clientConfigDialog.png
index c7e7732..c7e7732 100644
--- a/doc/LaTeX/bilder/clientConfigDialog.png
+++ b/doc/bilder/clientConfigDialog.png
diff --git a/doc/LaTeX/bilder/clientToolbar.png b/doc/bilder/clientToolbar.png
index e892c0e..e892c0e 100644
--- a/doc/LaTeX/bilder/clientToolbar.png
+++ b/doc/bilder/clientToolbar.png
diff --git a/doc/LaTeX/bilder/connectionframe.png b/doc/bilder/connectionframe.png
index ba158b9..ba158b9 100755..100644
--- a/doc/LaTeX/bilder/connectionframe.png
+++ b/doc/bilder/connectionframe.png
diff --git a/doc/LaTeX/bilder/dum.jpg b/doc/bilder/dum.jpg
index 231ffb1..231ffb1 100644
--- a/doc/LaTeX/bilder/dum.jpg
+++ b/doc/bilder/dum.jpg
diff --git a/doc/LaTeX/bilder/dum.png b/doc/bilder/dum.png
index 9284736..9284736 100644
--- a/doc/LaTeX/bilder/dum.png
+++ b/doc/bilder/dum.png
diff --git a/doc/LaTeX/bilder/mainwindow.png b/doc/bilder/mainwindow.png
index b7ba8c4..b7ba8c4 100755..100644
--- a/doc/LaTeX/bilder/mainwindow.png
+++ b/doc/bilder/mainwindow.png
diff --git a/doc/LaTeX/bilder/menu-key.png b/doc/bilder/menu-key.png
index 8cec826..8cec826 100644
--- a/doc/LaTeX/bilder/menu-key.png
+++ b/doc/bilder/menu-key.png
diff --git a/doc/LaTeX/bilder/processlist.png b/doc/bilder/processlist.png
index c2e09af..c2e09af 100644
--- a/doc/LaTeX/bilder/processlist.png
+++ b/doc/bilder/processlist.png
diff --git a/doc/LaTeX/bilder/pvsmgr.jpg b/doc/bilder/pvsmgr.jpg
index ec5ae30..ec5ae30 100755..100644
--- a/doc/LaTeX/bilder/pvsmgr.jpg
+++ b/doc/bilder/pvsmgr.jpg
diff --git a/doc/LaTeX/bilder/pvsmgrAll.jpg b/doc/bilder/pvsmgrAll.jpg
index a522424..a522424 100755..100644
--- a/doc/LaTeX/bilder/pvsmgrAll.jpg
+++ b/doc/bilder/pvsmgrAll.jpg
diff --git a/doc/LaTeX/bilder/runprocess.png b/doc/bilder/runprocess.png
index 7b2f6bd..7b2f6bd 100644
--- a/doc/LaTeX/bilder/runprocess.png
+++ b/doc/bilder/runprocess.png
diff --git a/doc/LaTeX/bilder/siegel-neu.jpg b/doc/bilder/siegel-neu.jpg
index 3bb83a9..3bb83a9 100644
--- a/doc/LaTeX/bilder/siegel-neu.jpg
+++ b/doc/bilder/siegel-neu.jpg
diff --git a/doc/LaTeX/bilder/siegel-neu.png b/doc/bilder/siegel-neu.png
index 1cff269..1cff269 100644
--- a/doc/LaTeX/bilder/siegel-neu.png
+++ b/doc/bilder/siegel-neu.png
diff --git a/doc/LaTeX/bilder/studentctlpanel.png b/doc/bilder/studentctlpanel.png
index 84930f5..84930f5 100644
--- a/doc/LaTeX/bilder/studentctlpanel.png
+++ b/doc/bilder/studentctlpanel.png
diff --git a/doc/LaTeX/bilder/vnc-frame-buttons.png b/doc/bilder/vnc-frame-buttons.png
index 0a0a69d..0a0a69d 100644
--- a/doc/LaTeX/bilder/vnc-frame-buttons.png
+++ b/doc/bilder/vnc-frame-buttons.png
diff --git a/doc/LaTeX/bilder/vnc-frame-buttons.xcf b/doc/bilder/vnc-frame-buttons.xcf
index faf5261..faf5261 100644
--- a/doc/LaTeX/bilder/vnc-frame-buttons.xcf
+++ b/doc/bilder/vnc-frame-buttons.xcf
diff --git a/doc/build_doc.sh b/doc/build_doc.sh
deleted file mode 100755
index c25df82..0000000
--- a/doc/build_doc.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-doxygen doxconf
diff --git a/doc/LaTeX/devel/0000-chapter.tex b/doc/devel/0000-chapter.tex
index e69de29..e69de29 100644
--- a/doc/LaTeX/devel/0000-chapter.tex
+++ b/doc/devel/0000-chapter.tex
diff --git a/doc/LaTeX/devel/0100-build.tex b/doc/devel/0100-build.tex
index f0e1723..f0e1723 100644
--- a/doc/LaTeX/devel/0100-build.tex
+++ b/doc/devel/0100-build.tex
diff --git a/doc/LaTeX/devel/0200-gui-lib.tex b/doc/devel/0200-gui-lib.tex
index 05730da..05730da 100644
--- a/doc/LaTeX/devel/0200-gui-lib.tex
+++ b/doc/devel/0200-gui-lib.tex
diff --git a/doc/LaTeX/devel/0300-pvs.tex b/doc/devel/0300-pvs.tex
index 54fedd4..54fedd4 100644
--- a/doc/LaTeX/devel/0300-pvs.tex
+++ b/doc/devel/0300-pvs.tex
diff --git a/doc/LaTeX/devel/0310-service-discovery.tex b/doc/devel/0310-service-discovery.tex
index 307234f..307234f 100644
--- a/doc/LaTeX/devel/0310-service-discovery.tex
+++ b/doc/devel/0310-service-discovery.tex
diff --git a/doc/LaTeX/devel/0400-pvs-console.tex b/doc/devel/0400-pvs-console.tex
index 78574b2..78574b2 100644
--- a/doc/LaTeX/devel/0400-pvs-console.tex
+++ b/doc/devel/0400-pvs-console.tex
diff --git a/doc/LaTeX/devel/0500-pvs-client.tex b/doc/devel/0500-pvs-client.tex
index bbca766..bbca766 100644
--- a/doc/LaTeX/devel/0500-pvs-client.tex
+++ b/doc/devel/0500-pvs-client.tex
diff --git a/doc/doxconf b/doc/doxconf
deleted file mode 100644
index fefbae6..0000000
--- a/doc/doxconf
+++ /dev/null
@@ -1,1512 +0,0 @@
-# Doxyfile 1.5.8
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
-#
-# All text after a hash (#) is considered a comment and will be ignored
-# The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file 
-# that follow. The default is UTF-8 which is also the encoding used for all 
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the 
-# iconv built into libc) for the transcoding. See 
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
-
-DOXYFILE_ENCODING      = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
-# by quotes) that should identify the project.
-
-PROJECT_NAME           = "Pool Video Switch"
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
-# This could be handy for archiving the generated documentation or 
-# if some version control system is used.
-
-PROJECT_NUMBER         = 17
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
-# base path where the generated documentation will be put. 
-# If a relative path is entered, it will be relative to the location 
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = .
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
-# 4096 sub-directories (in 2 levels) under the output directory of each output 
-# format and will distribute the generated files over these directories. 
-# Enabling this option can be useful when feeding doxygen a huge amount of 
-# source files, where putting all generated files in the same directory would 
-# otherwise cause performance problems for the file system.
-
-CREATE_SUBDIRS         = YES
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
-# documentation generated by doxygen is written. Doxygen will use this 
-# information to generate all constant output in the proper language. 
-# The default language is English, other supported languages are: 
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
-# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, 
-# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), 
-# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, 
-# Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, Slovene, 
-# Spanish, Swedish, and Ukrainian.
-
-OUTPUT_LANGUAGE        = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
-# include brief member descriptions after the members that are listed in 
-# the file and class documentation (similar to JavaDoc). 
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
-# the brief description of a member or function before the detailed description. 
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator 
-# that is used to form the text in various listings. Each string 
-# in this list, if found as the leading text of the brief description, will be 
-# stripped from the text and the result after processing the whole list, is 
-# used as the annotated text. Otherwise, the brief description is used as-is. 
-# If left blank, the following values are used ("$name" is automatically 
-# replaced with the name of the entity): "The $name class" "The $name widget" 
-# "The $name file" "is" "provides" "specifies" "contains" 
-# "represents" "a" "an" "the"
-
-ABBREVIATE_BRIEF       = 
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
-# Doxygen will generate a detailed section even if there is only a brief 
-# description.
-
-ALWAYS_DETAILED_SEC    = YES
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
-# inherited members of a class in the documentation of that class as if those 
-# members were ordinary class members. Constructors, destructors and assignment 
-# operators of the base classes will not be shown.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
-# path before files name in the file list and in the header files. If set 
-# to NO the shortest path that makes the file name unique will be used.
-
-FULL_PATH_NAMES        = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
-# can be used to strip a user-defined part of the path. Stripping is 
-# only done if one of the specified strings matches the left-hand part of 
-# the path. The tag can be used to show relative paths in the file list. 
-# If left blank the directory from which doxygen is run is used as the 
-# path to strip.
-
-STRIP_FROM_PATH        = 
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
-# the path mentioned in the documentation of a class, which tells 
-# the reader which header file to include in order to use a class. 
-# If left blank only the name of the header file containing the class 
-# definition is used. Otherwise one should specify the include paths that 
-# are normally passed to the compiler using the -I flag.
-
-STRIP_FROM_INC_PATH    = 
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
-# (but less readable) file names. This can be useful is your file systems 
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
-# will interpret the first line (until the first dot) of a JavaDoc-style 
-# comment as the brief description. If set to NO, the JavaDoc 
-# comments will behave just like regular Qt-style comments 
-# (thus requiring an explicit @brief command for a brief description.)
-
-JAVADOC_AUTOBRIEF      = YES
-
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will 
-# interpret the first line (until the first dot) of a Qt-style 
-# comment as the brief description. If set to NO, the comments 
-# will behave just like regular Qt-style comments (thus requiring 
-# an explicit \brief command for a brief description.)
-
-QT_AUTOBRIEF           = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
-# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
-# comments) as a brief description. This used to be the default behaviour. 
-# The new default is to treat a multi-line C++ comment block as a detailed 
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
-# member inherits the documentation from any documented member that it 
-# re-implements.
-
-INHERIT_DOCS           = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
-# a new page for each member. If set to NO, the documentation of a member will 
-# be part of the file/class/namespace that contains it.
-
-SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
-TAB_SIZE               = 4
-
-# This tag can be used to specify a number of aliases that acts 
-# as commands in the documentation. An alias has the form "name=value". 
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
-# put the command \sideeffect (or @sideeffect) in the documentation, which 
-# will result in a user-defined paragraph with heading "Side Effects:". 
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES                = 
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
-# sources only. Doxygen will then generate output that is more tailored for C. 
-# For instance, some of the names that are used will be different. The list 
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C  = NO
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
-# sources only. Doxygen will then generate output that is more tailored for 
-# Java. For instance, namespaces will be presented as packages, qualified 
-# scopes will look different, etc.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran 
-# sources only. Doxygen will then generate output that is more tailored for 
-# Fortran.
-
-OPTIMIZE_FOR_FORTRAN   = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL 
-# sources. Doxygen will then generate output that is tailored for 
-# VHDL.
-
-OPTIMIZE_OUTPUT_VHDL   = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it parses. 
-# With this tag you can assign which parser to use for a given extension. 
-# Doxygen has a built-in mapping, but you can override or extend it using this tag. 
-# The format is ext=language, where ext is a file extension, and language is one of 
-# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, 
-# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat 
-# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), 
-# use: inc=Fortran f=C
-
-EXTENSION_MAPPING      = 
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want 
-# to include (a tag file for) the STL sources as input, then you should 
-# set this tag to YES in order to let doxygen match functions declarations and 
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
-# func(std::string) {}). This also make the inheritance and collaboration 
-# diagrams that involve STL classes more complete and accurate.
-
-BUILTIN_STL_SUPPORT    = NO
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to 
-# enable parsing support.
-
-CPP_CLI_SUPPORT        = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. 
-# Doxygen will parse them like normal C++ but will assume all classes use public 
-# instead of private inheritance when no explicit protection keyword is present.
-
-SIP_SUPPORT            = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate getter 
-# and setter methods for a property. Setting this option to YES (the default) 
-# will make doxygen to replace the get and set methods by a property in the 
-# documentation. This will only work if the methods are indeed getting or 
-# setting a simple type. If this is not the case, or you want to show the 
-# methods anyway, you should set this option to NO.
-
-IDL_PROPERTY_SUPPORT   = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
-# tag is set to YES, then doxygen will reuse the documentation of the first 
-# member in the group (if any) for the other members of the group. By default 
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
-# the same type (for instance a group of public functions) to be put as a 
-# subgroup of that type (e.g. under the Public Functions section). Set it to 
-# NO to prevent subgrouping. Alternatively, this can be done per class using 
-# the \nosubgrouping command.
-
-SUBGROUPING            = YES
-
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum 
-# is documented as struct, union, or enum with the name of the typedef. So 
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct 
-# with name TypeT. When disabled the typedef will appear as a member of a file, 
-# namespace, or class. And the struct will be named TypeS. This can typically 
-# be useful for C code in case the coding convention dictates that all compound 
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-
-TYPEDEF_HIDES_STRUCT   = NO
-
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to 
-# determine which symbols to keep in memory and which to flush to disk. 
-# When the cache is full, less often used symbols will be written to disk. 
-# For small to medium size projects (<1000 input files) the default value is 
-# probably good enough. For larger projects a too small cache size can cause 
-# doxygen to be busy swapping symbols to and from disk most of the time 
-# causing a significant performance penality. 
-# If the system has enough physical memory increasing the cache will improve the 
-# performance by keeping more symbols in memory. Note that the value works on 
-# a logarithmic scale so increasing the size by one will rougly double the 
-# memory usage. The cache size is given by this formula: 
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, 
-# corresponding to a cache size of 2^16 = 65536 symbols
-
-SYMBOL_CACHE_SIZE      = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
-# documentation are documented, even if no documentation was available. 
-# Private class members and static file members will be hidden unless 
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL            = YES
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
-# will be included in the documentation.
-
-EXTRACT_PRIVATE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file 
-# will be included in the documentation.
-
-EXTRACT_STATIC         = YES
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
-# defined locally in source files will be included in the documentation. 
-# If set to NO only classes defined in header files are included.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. When set to YES local 
-# methods, which are defined in the implementation section but not in 
-# the interface are included in the documentation. 
-# If set to NO (the default) only methods in the interface are included.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be 
-# extracted and appear in the documentation as a namespace called 
-# 'anonymous_namespace{file}', where file will be replaced with the base 
-# name of the file that contains the anonymous namespace. By default 
-# anonymous namespace are hidden.
-
-EXTRACT_ANON_NSPACES   = YES
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
-# undocumented members of documented classes, files or namespaces. 
-# If set to NO (the default) these members will be included in the 
-# various overviews, but no documentation section is generated. 
-# This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
-# undocumented classes that are normally visible in the class hierarchy. 
-# If set to NO (the default) these classes will be included in the various 
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
-# friend (class|struct|union) declarations. 
-# If set to NO (the default) these declarations will be included in the 
-# documentation.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
-# documentation blocks found inside the body of a function. 
-# If set to NO (the default) these blocks will be appended to the 
-# function's detailed documentation block.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation 
-# that is typed after a \internal command is included. If the tag is set 
-# to NO (the default) then the documentation will be excluded. 
-# Set it to YES to include the internal documentation.
-
-INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
-# file names in lower-case letters. If set to YES upper-case letters are also 
-# allowed. This is useful if you have classes or files whose names only differ 
-# in case and if your file system supports case sensitive file names. Windows 
-# and Mac users are advised to set this option to NO.
-
-CASE_SENSE_NAMES       = YES
-
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
-# will show members with their full class and namespace scopes in the 
-# documentation. If set to YES the scope will be hidden.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
-# will put a list of the files that are included by a file in the documentation 
-# of that file.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
-# is inserted in the documentation for inline members.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
-# will sort the (detailed) documentation of file and class members 
-# alphabetically by member name. If set to NO the members will appear in 
-# declaration order.
-
-SORT_MEMBER_DOCS       = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
-# brief documentation of file, namespace and class members alphabetically 
-# by member name. If set to NO (the default) the members will appear in 
-# declaration order.
-
-SORT_BRIEF_DOCS        = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the 
-# hierarchy of group names into alphabetical order. If set to NO (the default) 
-# the group names will appear in their defined order.
-
-SORT_GROUP_NAMES       = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
-# sorted by fully-qualified names, including namespaces. If set to 
-# NO (the default), the class list will be sorted only by class name, 
-# not including the namespace part. 
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. 
-# Note: This option applies only to the class list, not to the 
-# alphabetical list.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or 
-# disable (NO) the todo list. This list is created by putting \todo 
-# commands in the documentation.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or 
-# disable (NO) the test list. This list is created by putting \test 
-# commands in the documentation.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or 
-# disable (NO) the bug list. This list is created by putting \bug 
-# commands in the documentation.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
-# disable (NO) the deprecated list. This list is created by putting 
-# \deprecated commands in the documentation.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional 
-# documentation sections, marked by \if sectionname ... \endif.
-
-ENABLED_SECTIONS       = 
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
-# the initial value of a variable or define consists of for it to appear in 
-# the documentation. If the initializer consists of more lines than specified 
-# here it will be hidden. Use a value of 0 to hide initializers completely. 
-# The appearance of the initializer of individual variables and defines in the 
-# documentation can be controlled using \showinitializer or \hideinitializer 
-# command in the documentation regardless of this setting.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
-# at the bottom of the documentation of classes and structs. If set to YES the 
-# list will mention the files that were used to generate the documentation.
-
-SHOW_USED_FILES        = YES
-
-# If the sources in your project are distributed over multiple directories 
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
-# in the documentation. The default is NO.
-
-SHOW_DIRECTORIES       = YES
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page. 
-# This will remove the Files entry from the Quick Index and from the 
-# Folder Tree View (if specified). The default is YES.
-
-SHOW_FILES             = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the 
-# Namespaces page. 
-# This will remove the Namespaces entry from the Quick Index 
-# and from the Folder Tree View (if specified). The default is YES.
-
-SHOW_NAMESPACES        = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
-# doxygen should invoke to get the current version for each file (typically from 
-# the version control system). Doxygen will invoke the program by executing (via 
-# popen()) the command <command> <input-file>, where <command> is the value of 
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
-# provided by doxygen. Whatever the program writes to standard output 
-# is used as the file version. See the manual for examples.
-
-FILE_VERSION_FILTER    = 
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by 
-# doxygen. The layout file controls the global structure of the generated output files 
-# in an output format independent way. The create the layout file that represents 
-# doxygen's defaults, run doxygen with the -l option. You can optionally specify a 
-# file name after the option, if omitted DoxygenLayout.xml will be used as the name 
-# of the layout file.
-
-LAYOUT_FILE            = 
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated 
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are 
-# generated by doxygen. Possible values are YES and NO. If left blank 
-# NO is used.
-
-WARNINGS               = YES
-
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
-# automatically be disabled.
-
-WARN_IF_UNDOCUMENTED   = YES
-
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
-# potential errors in the documentation, such as not documenting some 
-# parameters in a documented function, or documenting parameters that 
-# don't exist or using markup commands wrongly.
-
-WARN_IF_DOC_ERROR      = YES
-
-# This WARN_NO_PARAMDOC option can be abled to get warnings for 
-# functions that are documented, but have no documentation for their parameters 
-# or return value. If set to NO (the default) doxygen will only warn about 
-# wrong or incomplete parameter documentation, but not about the absence of 
-# documentation.
-
-WARN_NO_PARAMDOC       = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that 
-# doxygen can produce. The string should contain the $file, $line, and $text 
-# tags, which will be replaced by the file and line number from which the 
-# warning originated and the warning text. Optionally the format may contain 
-# $version, which will be replaced by the version of the file (if it could 
-# be obtained via FILE_VERSION_FILTER)
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning 
-# and error messages should be written. If left blank the output is written 
-# to stderr.
-
-WARN_LOGFILE           = ./doxwarnlog
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag can be used to specify the files and/or directories that contain 
-# documented source files. You may enter file names like "myfile.cpp" or 
-# directories like "/usr/src/myproject". Separate the files or directories 
-# with spaces.
-
-INPUT                  = ../src/input
-
-# This tag can be used to specify the character encoding of the source files 
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
-# also the default input encoding. Doxygen uses libiconv (or the iconv built 
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for 
-# the list of possible encodings.
-
-INPUT_ENCODING         = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the 
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank the following patterns are tested: 
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
-# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
-
-FILE_PATTERNS          = 
-
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
-# should be searched for input files as well. Possible values are YES and NO. 
-# If left blank NO is used.
-
-RECURSIVE              = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should 
-# excluded from the INPUT source files. This way you can easily exclude a 
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-
-EXCLUDE                = ./tests
-
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
-# directories that are symbolic links (a Unix filesystem feature) are excluded 
-# from the input.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the 
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
-# certain files from those directories. Note that the wildcards are matched 
-# against the file with absolute path, so to exclude all test directories 
-# for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       = 
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
-# (namespaces, classes, functions, etc.) that should be excluded from the 
-# output. The symbol name can be a fully qualified name, a word, or if the 
-# wildcard * is used, a substring. Examples: ANamespace, AClass, 
-# AClass::ANamespace, ANamespace::*Test
-
-EXCLUDE_SYMBOLS        = 
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or 
-# directories that contain example code fragments that are included (see 
-# the \include command).
-
-EXAMPLE_PATH           = 
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank all files are included.
-
-EXAMPLE_PATTERNS       = 
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
-# searched for input files to be used with the \include or \dontinclude 
-# commands irrespective of the value of the RECURSIVE tag. 
-# Possible values are YES and NO. If left blank NO is used.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or 
-# directories that contain image that are included in the documentation (see 
-# the \image command).
-
-IMAGE_PATH             = ./documentation/images
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should 
-# invoke to filter for each input file. Doxygen will invoke the filter program 
-# by executing (via popen()) the command <filter> <input-file>, where <filter> 
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
-# input file. Doxygen will then use the output that the filter program writes 
-# to standard output. 
-# If FILTER_PATTERNS is specified, this tag will be 
-# ignored.
-
-INPUT_FILTER           = 
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
-# basis. 
-# Doxygen will compare the file name with each pattern and apply the 
-# filter if there is a match. 
-# The filters are a list of the form: 
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
-# is applied to all files.
-
-FILTER_PATTERNS        = 
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
-# INPUT_FILTER) will be used to filter the input files when producing source 
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
-
-FILTER_SOURCE_FILES    = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
-# be generated. Documented entities will be cross-referenced with these sources. 
-# Note: To get rid of all source code in the generated output, make sure also 
-# VERBATIM_HEADERS is set to NO.
-
-SOURCE_BROWSER         = YES
-
-# Setting the INLINE_SOURCES tag to YES will include the body 
-# of functions and classes directly in the documentation.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
-# doxygen to hide any special comment blocks from generated source code 
-# fragments. Normal C and C++ comments will always remain visible.
-
-STRIP_CODE_COMMENTS    = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES 
-# then for each documented function all documented 
-# functions referencing it will be listed.
-
-REFERENCED_BY_RELATION = NO
-
-# If the REFERENCES_RELATION tag is set to YES 
-# then for each documented function all documented entities 
-# called/used by that function will be listed.
-
-REFERENCES_RELATION    = NO
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) 
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from 
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will 
-# link to the source code. 
-# Otherwise they will link to the documentation.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code 
-# will point to the HTML generated by the htags(1) tool instead of doxygen 
-# built-in source browser. The htags tool is part of GNU's global source 
-# tagging system (see http://www.gnu.org/software/global/global.html). You 
-# will need version 4.8.6 or higher.
-
-USE_HTAGS              = NO
-
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
-# will generate a verbatim copy of the header file for each class for 
-# which an include is specified. Set to NO to disable this.
-
-VERBATIM_HEADERS       = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
-# of all compounds will be generated. Enable this if the project 
-# contains a lot of classes, structs, unions or interfaces.
-
-ALPHABETICAL_INDEX     = NO
-
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
-# in which this list will be split (can be a number in the range [1..20])
-
-COLS_IN_ALPHA_INDEX    = 5
-
-# In case all classes in a project start with a common prefix, all 
-# classes will be put under the same header in the alphabetical index. 
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
-# should be ignored while generating the index headers.
-
-IGNORE_PREFIX          = 
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
-# generate HTML output.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `html' will be used as the default path.
-
-HTML_OUTPUT            = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
-# doxygen will generate files with .html extension.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a personal HTML header for 
-# each generated HTML page. If it is left blank doxygen will generate a 
-# standard header.
-
-HTML_HEADER            = 
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
-# each generated HTML page. If it is left blank doxygen will generate a 
-# standard footer.
-
-HTML_FOOTER            = 
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
-# style sheet that is used by each HTML page. It can be used to 
-# fine-tune the look of the HTML output. If the tag is left blank doxygen 
-# will generate a default style sheet. Note that doxygen will try to copy 
-# the style sheet file to the HTML output directory, so don't put your own 
-# stylesheet in the HTML output directory as well, or it will be erased!
-
-HTML_STYLESHEET        = 
-
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
-# files or namespaces will be aligned in HTML using tables. If set to 
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS     = YES
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
-# documentation will contain sections that can be hidden and shown after the 
-# page has loaded. For this to work a browser that supports 
-# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox 
-# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
-
-HTML_DYNAMIC_SECTIONS  = NO
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files 
-# will be generated that can be used as input for Apple's Xcode 3 
-# integrated development environment, introduced with OSX 10.5 (Leopard). 
-# To create a documentation set, doxygen will generate a Makefile in the 
-# HTML output directory. Running make will produce the docset in that 
-# directory and running "make install" will install the docset in 
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find 
-# it at startup. 
-# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
-
-GENERATE_DOCSET        = NO
-
-# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the 
-# feed. A documentation feed provides an umbrella under which multiple 
-# documentation sets from a single provider (such as a company or product suite) 
-# can be grouped.
-
-DOCSET_FEEDNAME        = "Doxygen generated docs"
-
-# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that 
-# should uniquely identify the documentation set bundle. This should be a 
-# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen 
-# will append .docset to the name.
-
-DOCSET_BUNDLE_ID       = org.doxygen.Project
-
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
-# will be generated that can be used as input for tools like the 
-# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) 
-# of the generated HTML documentation.
-
-GENERATE_HTMLHELP      = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
-# be used to specify the file name of the resulting .chm file. You 
-# can add a path in front of the file if the result should not be 
-# written to the html output directory.
-
-CHM_FILE               = 
-
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
-# be used to specify the location (absolute path including file name) of 
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
-# the HTML help compiler on the generated index.hhp.
-
-HHC_LOCATION           = 
-
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
-# controls if a separate .chi index file is generated (YES) or that 
-# it should be included in the master .chm file (NO).
-
-GENERATE_CHI           = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING 
-# is used to encode HtmlHelp index (hhk), content (hhc) and project file 
-# content.
-
-CHM_INDEX_ENCODING     = 
-
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
-# controls whether a binary table of contents is generated (YES) or a 
-# normal table of contents (NO) in the .chm file.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members 
-# to the contents of the HTML help documentation and to the tree view.
-
-TOC_EXPAND             = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER 
-# are set, an additional index file will be generated that can be used as input for 
-# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated 
-# HTML documentation.
-
-GENERATE_QHP           = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can 
-# be used to specify the file name of the resulting .qch file. 
-# The path specified is relative to the HTML output folder.
-
-QCH_FILE               = 
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating 
-# Qt Help Project output. For more information please see 
-# http://doc.trolltech.com/qthelpproject.html#namespace
-
-QHP_NAMESPACE          = 
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating 
-# Qt Help Project output. For more information please see 
-# http://doc.trolltech.com/qthelpproject.html#virtual-folders
-
-QHP_VIRTUAL_FOLDER     = doc
-
-# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. 
-# For more information please see 
-# http://doc.trolltech.com/qthelpproject.html#custom-filters
-
-QHP_CUST_FILTER_NAME   = 
-
-# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see 
-# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
-
-QHP_CUST_FILTER_ATTRS  = 
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's 
-# filter section matches. 
-# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
-
-QHP_SECT_FILTER_ATTRS  = 
-
-# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can 
-# be used to specify the location of Qt's qhelpgenerator. 
-# If non-empty doxygen will try to run qhelpgenerator on the generated 
-# .qhp file.
-
-QHG_LOCATION           = 
-
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
-# top of each HTML page. The value NO (the default) enables the index and 
-# the value YES disables it.
-
-DISABLE_INDEX          = NO
-
-# This tag can be used to set the number of enum values (range [1..20]) 
-# that doxygen will group on one line in the generated HTML documentation.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index 
-# structure should be generated to display hierarchical information. 
-# If the tag value is set to FRAME, a side panel will be generated 
-# containing a tree-like index structure (just like the one that 
-# is generated for HTML Help). For this to work a browser that supports 
-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
-# probably better off using the HTML help feature. Other possible values 
-# for this tag are: HIERARCHIES, which will generate the Groups, Directories, 
-# and Class Hierarchy pages using a tree view instead of an ordered list; 
-# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which 
-# disables this behavior completely. For backwards compatibility with previous 
-# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE 
-# respectively.
-
-GENERATE_TREEVIEW      = YES
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
-# used to set the initial width (in pixels) of the frame in which the tree 
-# is shown.
-
-TREEVIEW_WIDTH         = 250
-
-# Use this tag to change the font size of Latex formulas included 
-# as images in the HTML documentation. The default is 10. Note that 
-# when you change the font size after a successful doxygen run you need 
-# to manually remove any form_*.png images from the HTML output directory 
-# to force them to be regenerated.
-
-FORMULA_FONTSIZE       = 10
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
-# generate Latex output.
-
-GENERATE_LATEX         = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `latex' will be used as the default path.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
-# invoked. If left blank `latex' will be used as the default command name.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
-# generate index for LaTeX. If left blank `makeindex' will be used as the 
-# default command name.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
-# LaTeX documents. This may be useful for small projects and may help to 
-# save some trees in general.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used 
-# by the printer. Possible values are: a4, a4wide, letter, legal and 
-# executive. If left blank a4wide will be used.
-
-PAPER_TYPE             = a4wide
-
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
-# packages that should be included in the LaTeX output.
-
-EXTRA_PACKAGES         = 
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
-# the generated latex document. The header should contain everything until 
-# the first chapter. If it is left blank doxygen will generate a 
-# standard header. Notice: only use this tag if you know what you are doing!
-
-LATEX_HEADER           = 
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
-# contain links (just like the HTML output) instead of page references 
-# This makes the output suitable for online browsing using a pdf viewer.
-
-PDF_HYPERLINKS         = YES
-
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
-# plain latex in the generated Makefile. Set this option to YES to get a 
-# higher quality PDF documentation.
-
-USE_PDFLATEX           = YES
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
-# command to the generated LaTeX files. This will instruct LaTeX to keep 
-# running if errors occur, instead of asking the user for help. 
-# This option is also used when generating formulas in HTML.
-
-LATEX_BATCHMODE        = NO
-
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
-# include the index chapters (such as File Index, Compound Index, etc.) 
-# in the output.
-
-LATEX_HIDE_INDICES     = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
-# The RTF output is optimized for Word 97 and may not look very pretty with 
-# other RTF readers or editors.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `rtf' will be used as the default path.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
-# RTF documents. This may be useful for small projects and may help to 
-# save some trees in general.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
-# will contain hyperlink fields. The RTF file will 
-# contain links (just like the HTML output) instead of page references. 
-# This makes the output suitable for online browsing using WORD or other 
-# programs which support those fields. 
-# Note: wordpad (write) and others do not support links.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's 
-# config file, i.e. a series of assignments. You only have to provide 
-# replacements, missing definitions are set to their default value.
-
-RTF_STYLESHEET_FILE    = 
-
-# Set optional variables used in the generation of an rtf document. 
-# Syntax is similar to doxygen's config file.
-
-RTF_EXTENSIONS_FILE    = 
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
-# generate man pages
-
-GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `man' will be used as the default path.
-
-MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to 
-# the generated man pages (default is the subroutine's section .3)
-
-MAN_EXTENSION          = .3
-
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
-# then it will generate one additional man file for each entity 
-# documented in the real man page(s). These additional files 
-# only source the real man page, but without them the man command 
-# would be unable to find the correct page. The default is NO.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES Doxygen will 
-# generate an XML file that captures the structure of 
-# the code including all documentation.
-
-GENERATE_XML           = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `xml' will be used as the default path.
-
-XML_OUTPUT             = xml
-
-# The XML_SCHEMA tag can be used to specify an XML schema, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
-
-XML_SCHEMA             = 
-
-# The XML_DTD tag can be used to specify an XML DTD, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
-
-XML_DTD                = 
-
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
-# dump the program listings (including syntax highlighting 
-# and cross-referencing information) to the XML output. Note that 
-# enabling this will significantly increase the size of the XML output.
-
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
-# generate an AutoGen Definitions (see autogen.sf.net) file 
-# that captures the structure of the code including all 
-# documentation. Note that this feature is still experimental 
-# and incomplete at the moment.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
-# generate a Perl module file that captures the structure of 
-# the code including all documentation. Note that this 
-# feature is still experimental and incomplete at the 
-# moment.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
-# to generate PDF and DVI output from the Perl module output.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
-# nicely formatted so it can be parsed by a human reader. 
-# This is useful 
-# if you want to understand what is going on. 
-# On the other hand, if this 
-# tag is set to NO the size of the Perl module output will be much smaller 
-# and Perl will parse it just the same.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file 
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
-# This is useful so different doxyrules.make files included by the same 
-# Makefile don't overwrite each other's variables.
-
-PERLMOD_MAKEVAR_PREFIX = 
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
-# evaluate all C-preprocessor directives found in the sources and include 
-# files.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
-# names in the source code. If set to NO (the default) only conditional 
-# compilation will be performed. Macro expansion can be done in a controlled 
-# way by setting EXPAND_ONLY_PREDEF to YES.
-
-MACRO_EXPANSION        = YES
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
-# then the macro expansion is limited to the macros specified with the 
-# PREDEFINED and EXPAND_AS_DEFINED tags.
-
-EXPAND_ONLY_PREDEF     = YES
-
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that 
-# contain include files that are not input files but should be processed by 
-# the preprocessor.
-
-INCLUDE_PATH           = 
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
-# patterns (like *.h and *.hpp) to filter out the header-files in the 
-# directories. If left blank, the patterns specified with FILE_PATTERNS will 
-# be used.
-
-INCLUDE_FILE_PATTERNS  = 
-
-# The PREDEFINED tag can be used to specify one or more macro names that 
-# are defined before the preprocessor is started (similar to the -D option of 
-# gcc). The argument of the tag is a list of macros of the form: name 
-# or name=definition (no spaces). If the definition and the = are 
-# omitted =1 is assumed. To prevent a macro definition from being 
-# undefined via #undef or recursively expanded use the := operator 
-# instead of the = operator.
-
-PREDEFINED             = "DOXYGEN_RUNNING" \
-                         "BEGIN_POLICY_CLASS(name)=class name" \
-                         "END_POLICY_CLASS=;"
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
-# this tag can be used to specify a list of macro names that should be expanded. 
-# The macro definition that is found in the sources will be used. 
-# Use the PREDEFINED tag if you want to use a different macro definition.
-
-EXPAND_AS_DEFINED      = 
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
-# doxygen's preprocessor will remove all function-like macros that are alone 
-# on a line, have an all uppercase name, and do not end with a semicolon. Such 
-# function macros are typically used for boiler-plate code, and will confuse 
-# the parser if not removed.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references   
-#---------------------------------------------------------------------------
-
-# The TAGFILES option can be used to specify one or more tagfiles. 
-# Optionally an initial location of the external documentation 
-# can be added for each tagfile. The format of a tag file without 
-# this location is as follows: 
-#  
-# TAGFILES = file1 file2 ... 
-# Adding location for the tag files is done as follows: 
-#  
-# TAGFILES = file1=loc1 "file2 = loc2" ... 
-# where "loc1" and "loc2" can be relative or absolute paths or 
-# URLs. If a location is present for each tag, the installdox tool 
-# does not have to be run to correct the links. 
-# Note that each tag file must have a unique name 
-# (where the name does NOT include the path) 
-# If a tag file is not located in the directory in which doxygen 
-# is run, you must also specify the path to the tagfile here.
-
-TAGFILES               = 
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
-# a tag file that is based on the input files it reads.
-
-GENERATE_TAGFILE       = 
-
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
-# in the class index. If set to NO only the inherited external classes 
-# will be listed.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
-# in the modules index. If set to NO, only the current project's groups will 
-# be listed.
-
-EXTERNAL_GROUPS        = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script 
-# interpreter (i.e. the result of `which perl').
-
-PERL_PATH              = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
-# or super classes. Setting the tag to NO turns the diagrams off. Note that 
-# this option is superseded by the HAVE_DOT option below. This is only a 
-# fallback. It is recommended to install and use dot, since it yields more 
-# powerful graphs.
-
-CLASS_DIAGRAMS         = YES
-
-# You can define message sequence charts within doxygen comments using the \msc 
-# command. Doxygen will then run the mscgen tool (see 
-# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the 
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where 
-# the mscgen tool resides. If left empty the tool is assumed to be found in the 
-# default search path.
-
-MSCGEN_PATH            = 
-
-# If set to YES, the inheritance and collaboration graphs will hide 
-# inheritance and usage relations if the target is undocumented 
-# or is not a class.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
-# available from the path. This tool is part of Graphviz, a graph visualization 
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
-# have no effect if this option is set to NO (the default)
-
-HAVE_DOT               = YES
-
-# By default doxygen will write a font called FreeSans.ttf to the output 
-# directory and reference it in all dot files that doxygen generates. This 
-# font does not include all possible unicode characters however, so when you need 
-# these (or just want a differently looking font) you can specify the font name 
-# using DOT_FONTNAME. You need need to make sure dot is able to find the font, 
-# which can be done by putting it in a standard location or by setting the 
-# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory 
-# containing the font.
-
-DOT_FONTNAME           = FreeSans
-
-# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. 
-# The default size is 10pt.
-
-DOT_FONTSIZE           = 10
-
-# By default doxygen will tell dot to use the output directory to look for the 
-# FreeSans.ttf font (which doxygen will put there itself). If you specify a 
-# different font using DOT_FONTNAME you can set the path where dot 
-# can find it using this tag.
-
-DOT_FONTPATH           = 
-
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect inheritance relations. Setting this tag to YES will force the 
-# the CLASS_DIAGRAMS tag to NO.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect implementation dependencies (inheritance, containment, and 
-# class references variables) of the class with other documented classes.
-
-COLLABORATION_GRAPH    = YES
-
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for groups, showing the direct groups dependencies
-
-GROUP_GRAPHS           = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
-# collaboration diagrams in a style similar to the OMG's Unified Modeling 
-# Language.
-
-UML_LOOK               = NO
-
-# If set to YES, the inheritance and collaboration graphs will show the 
-# relations between templates and their instances.
-
-TEMPLATE_RELATIONS     = NO
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
-# tags are set to YES then doxygen will generate a graph for each documented 
-# file showing the direct and indirect include dependencies of the file with 
-# other documented files.
-
-INCLUDE_GRAPH          = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
-# documented header file showing the documented files that directly or 
-# indirectly include this file.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH and HAVE_DOT options are set to YES then 
-# doxygen will generate a call dependency graph for every global function 
-# or class method. Note that enabling this option will significantly increase 
-# the time of a run. So in most cases it will be better to enable call graphs 
-# for selected functions only using the \callgraph command.
-
-CALL_GRAPH             = NO
-
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then 
-# doxygen will generate a caller dependency graph for every global function 
-# or class method. Note that enabling this option will significantly increase 
-# the time of a run. So in most cases it will be better to enable caller 
-# graphs for selected functions only using the \callergraph command.
-
-CALLER_GRAPH           = NO
-
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
-# will graphical hierarchy of all classes instead of a textual one.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
-# then doxygen will show the dependencies a directory has on other directories 
-# in a graphical way. The dependency relations are determined by the #include 
-# relations between the files in the directories.
-
-DIRECTORY_GRAPH        = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
-# generated by dot. Possible values are png, jpg, or gif 
-# If left blank png will be used.
-
-DOT_IMAGE_FORMAT       = png
-
-# The tag DOT_PATH can be used to specify the path where the dot tool can be 
-# found. If left blank, it is assumed the dot tool can be found in the path.
-
-DOT_PATH               = 
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that 
-# contain dot files that are included in the documentation (see the 
-# \dotfile command).
-
-DOTFILE_DIRS           = 
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
-# nodes that will be shown in the graph. If the number of nodes in a graph 
-# becomes larger than this value, doxygen will truncate the graph, which is 
-# visualized by representing a node as a red box. Note that doxygen if the 
-# number of direct children of the root node in a graph is already larger than 
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note 
-# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-
-DOT_GRAPH_MAX_NODES    = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
-# graphs generated by dot. A depth value of 3 means that only nodes reachable 
-# from the root by following a path via at most 3 edges will be shown. Nodes 
-# that lay further from the root node will be omitted. Note that setting this 
-# option to 1 or 2 may greatly reduce the computation time needed for large 
-# code bases. Also note that the size of a graph can be further restricted by 
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-
-MAX_DOT_GRAPH_DEPTH    = 0
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
-# background. This is disabled by default, because dot on Windows does not 
-# seem to support this out of the box. Warning: Depending on the platform used, 
-# enabling this option may lead to badly anti-aliased labels on the edges of 
-# a graph (i.e. they become hard to read).
-
-DOT_TRANSPARENT        = YES
-
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
-# files in one run (i.e. multiple -o and -T options on the command line). This 
-# makes dot run faster, but since only newer versions of dot (>1.8.10) 
-# support this, this feature is disabled by default.
-
-DOT_MULTI_TARGETS      = NO
-
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
-# generate a legend page explaining the meaning of the various boxes and 
-# arrows in the dot generated graphs.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
-# remove the intermediate dot files that are used to generate 
-# the various graphs.
-
-DOT_CLEANUP            = YES
-
-#---------------------------------------------------------------------------
-# Options related to the search engine
-#---------------------------------------------------------------------------
-
-# The SEARCHENGINE tag specifies whether or not a search engine should be 
-# used. If set to NO the values of all tags below this one will be ignored.
-
-SEARCHENGINE           = NO
diff --git a/doc/LaTeX/header.tex b/doc/header.tex
index 06488b5..06488b5 100644
--- a/doc/LaTeX/header.tex
+++ b/doc/header.tex
diff --git a/doc/LaTeX/intro/0000-chapter.tex b/doc/intro/0000-chapter.tex
index 6b3319b..6b3319b 100644
--- a/doc/LaTeX/intro/0000-chapter.tex
+++ b/doc/intro/0000-chapter.tex
diff --git a/doc/LaTeX/intro/0100-funktionen.tex b/doc/intro/0100-funktionen.tex
index 966a065..966a065 100644
--- a/doc/LaTeX/intro/0100-funktionen.tex
+++ b/doc/intro/0100-funktionen.tex
diff --git a/doc/LaTeX/intro/0900-textaufbau.tex b/doc/intro/0900-textaufbau.tex
index 70d2a66..70d2a66 100644
--- a/doc/LaTeX/intro/0900-textaufbau.tex
+++ b/doc/intro/0900-textaufbau.tex
diff --git a/doc/LaTeX/mystyle-pdf.tex b/doc/mystyle-pdf.tex
index 034ae31..034ae31 100644
--- a/doc/LaTeX/mystyle-pdf.tex
+++ b/doc/mystyle-pdf.tex
diff --git a/doc/LaTeX/pvs-doc.tex b/doc/pvs-doc.tex
index efe2adc..efe2adc 100644
--- a/doc/LaTeX/pvs-doc.tex
+++ b/doc/pvs-doc.tex
diff --git a/doc/LaTeX/user/0000-chapter.tex b/doc/user/0000-chapter.tex
index e69de29..e69de29 100644
--- a/doc/LaTeX/user/0000-chapter.tex
+++ b/doc/user/0000-chapter.tex
diff --git a/doc/LaTeX/user/0100-pvs-steuer.tex b/doc/user/0100-pvs-steuer.tex
index 7ad616c..7ad616c 100644
--- a/doc/LaTeX/user/0100-pvs-steuer.tex
+++ b/doc/user/0100-pvs-steuer.tex
diff --git a/doc/LaTeX/user/0300-pvs-client.tex b/doc/user/0300-pvs-client.tex
index bf080d3..bf080d3 100644
--- a/doc/LaTeX/user/0300-pvs-client.tex
+++ b/doc/user/0300-pvs-client.tex
diff --git a/doc/LaTeX/zusfassung.tex b/doc/zusfassung.tex
index abc4140..abc4140 100644
--- a/doc/LaTeX/zusfassung.tex
+++ b/doc/zusfassung.tex
diff --git a/misc/pvs.conf b/misc/pvs.conf
index f3a7adc..7e3d78c 100644
--- a/misc/pvs.conf
+++ b/misc/pvs.conf
@@ -4,5 +4,3 @@ script=/usr/local/bin/pvs-vncsrv
 [Permissions]
 vnc_lecturer=ro
 vnc_other=no
-allow_chat=T
-allow_filetransfer=T
diff --git a/pvsgui.qrc b/pvsgui.qrc
index 31e7e50..d9e1604 100644
--- a/pvsgui.qrc
+++ b/pvsgui.qrc
@@ -2,7 +2,6 @@
 	<qresource prefix="/">
 		<file alias="darrow16.svg">icons/darrow16.svg</file>
 		<file alias="ok16.svg">icons/ok16.svg</file>
-			
 		<file alias="cam32.svg">icons/cam32.svg</file>
 		<file alias="cam_on32.svg">icons/cam_on32.svg</file>
 		<file alias="cam_off32.svg">icons/cam_off32.svg</file>
diff --git a/src/gui/clientConfigDialog.cpp b/src/gui/clientConfigDialog.cpp
index b7ba407..0ddada0 100644
--- a/src/gui/clientConfigDialog.cpp
+++ b/src/gui/clientConfigDialog.cpp
@@ -96,16 +96,6 @@ void ClientConfigDialog::readSettings()
         else
             radioButtonOtherNO->setChecked(true);
     }
-
-    reply = _ifaceDBus->getConfigValue("Permissions/allow_chat");
-    reply.waitForFinished();
-    if (reply.isValid())
-        checkBoxAllowChat->setChecked(reply.value() == "T");
-
-    reply = _ifaceDBus->getConfigValue("Permissions/allow_filetransfer");
-    reply.waitForFinished();
-    if (reply.isValid())
-        checkBoxAllowFiletransfer->setChecked(reply.value() == "T");
 }
 
 void ClientConfigDialog::writeSettings()
@@ -125,12 +115,6 @@ void ClientConfigDialog::writeSettings()
     else
         _ifaceDBus->setConfigValue("Permissions/vnc_other", "no");
 
-    _ifaceDBus->setConfigValue("Permissions/allow_chat",
-            QString(checkBoxAllowChat->isChecked() ? "T" : "F"));
-    _ifaceDBus->setConfigValue("Permissions/allow_filetransfer",
-            QString(checkBoxAllowFiletransfer->isChecked() ? "T" : "F"));
-    _ifaceDBus->setConfigValue("multicast/interface", interfaceList->currentText());
-
     _settings.sync();
     emit configChanged();
 }
diff --git a/src/gui/connectionFrame.cpp b/src/gui/connectionFrame.cpp
index b618668..32e20f7 100644
--- a/src/gui/connectionFrame.cpp
+++ b/src/gui/connectionFrame.cpp
@@ -28,58 +28,31 @@ extern "C"
 ConnectionFrame::ConnectionFrame(QWidget *parent) :
         QGroupBox(parent)
 {
-
 	//defines the ui-stuff
-
-	 _gL = new QGridLayout(this);
-	 _gL->setSpacing(6);
-	 _gL->setMargin(1);
-
-	 _split = new QSplitter(this);
-	 _split->setOrientation(Qt::Vertical);
-
-	 _frame = new Frame("", _split);
-	 _frame->setConFrame(this);
-	 _split->addWidget(_frame);
-
-	 _conFrameTaskbar = new QWidget(_split);
-	 _conFrameTaskbar->setMaximumHeight(30);
-
-	 _gLayout = new QGridLayout(_conFrameTaskbar);
-	 _gLayout->setMargin(0);
-	 _gLayout->setSpacing(0);
-
-	 _hLayoutInCfTaskbar = new QHBoxLayout();
-
-	 _ip    = new QLabel(_conFrameTaskbar);
-	 _ip->setAlignment(Qt::AlignCenter);
-
-	 _hLayoutInCfTaskbar->addWidget(_ip);
-
-	 _dozentContaimner  = new QLabel(_conFrameTaskbar);
-	 _dozentContaimner->setAlignment(Qt::AlignRight);
-	 _dozentContaimner->setMaximumSize(QSize(20, 20));
-	 _dozentContaimner->setScaledContents(true);
-
-	 _hLayoutInCfTaskbar->addWidget(_dozentContaimner);
-
-	 _dozentContaimner->setDisabled(true);
-
-	 _status  = new QLabel(_conFrameTaskbar);
-	 _status->setAlignment(Qt::AlignRight);
-	 _status->setMaximumSize(QSize(22, 21));
-
-	 _hLayoutInCfTaskbar->addWidget(_status);
-
-	 _gLayout->addLayout(_hLayoutInCfTaskbar, 0, 0, 1, 1);
-	 _split->addWidget(_conFrameTaskbar);
-
-	 _gL->addWidget(_split, 0, 0, 1, 1);
-
-	 this->setLayout(_gL);
+    _layoutTop = new QVBoxLayout(this);
+    _layoutTop->setMargin(0);
+    _frame = new Frame("", this);
+    _frame->setConFrame(this);
+    _frame->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding);
+    _layoutTop->addWidget(_frame);
+    _layoutBottom = new QHBoxLayout(this);
+    _layoutBottom->setMargin(0);
+    _conFrameTaskbar = new QWidget(this);
+    _conFrameTaskbar->setLayout(_layoutBottom);
+    _conFrameTaskbar->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
+    _ip = new QLabel(_conFrameTaskbar);
+    _layoutBottom->addStretch();
+    _layoutBottom->addWidget(_ip);
+    _layoutBottom->addStretch();
+    _dozentContaimner  = new QLabel(_conFrameTaskbar);
+    _dozentContaimner->setDisabled(true);
+    _layoutBottom->addWidget(_dozentContaimner);
+    _status  = new QLabel(_conFrameTaskbar);
+    _layoutBottom->addWidget(_status);
+    _layoutTop->addWidget(_conFrameTaskbar);
+    this->setLayout(_layoutTop);
 
     setInitSize(190,168);
-
     initFrame();
 
     nat_height     = 0;
@@ -176,7 +149,7 @@ void ConnectionFrame::setInitSize(int w, int h)
 {
 	resize(w, h);
 	_frame->resize(w, h);
-	_conFrameTaskbar->resize(w, h);
+	//_conFrameTaskbar->resize(w, h);
     prev_height  = h;
     prev_width   = w;
     init_w       = w;
@@ -470,32 +443,11 @@ void ConnectionFrame::mouseMoveEvent(QMouseEvent *event)
 
 void ConnectionFrame::paintCloseUp(int w, int h)
 {
-
-
-		if (!_frame->image().isNull())
-		{
-			/*this->setFixedWidth(w);
-			_conFrameTaskbar->setMaximumWidth(w);
-			resize(w, h);*/
-			resizeComponent(w, h);
-			setMaximumSize(w,h);
-			resize(w, h);
-		}
-		else
-		{
-			std::cout << "pixel is NULL" << std::endl;
-		}
-
-}
-
-void ConnectionFrame::resizeComponent(int w, int h)
-{
-	int th = (h*_conFrameTaskbar->width())/w;
-	int uh = (h*_ip->width())/w;
-	_conFrameTaskbar->setMaximumSize(w, th);
-	_conFrameTaskbar->resize(w, th);
-	_ip->setMaximumSize(w, uh);
-	_ip->resize(w,uh);
+    if (!_frame->image().isNull())
+    {
+        //move(0,0);
+        resize(w, h);
+    }
 }
 
 void ConnectionFrame::setSource()
diff --git a/src/gui/connectionFrame.h b/src/gui/connectionFrame.h
index 235d0fc..fe6dc95 100644
--- a/src/gui/connectionFrame.h
+++ b/src/gui/connectionFrame.h
@@ -16,8 +16,8 @@ extern "C"
 }
 
 #define PROFILE
-#define STYLE_DEFAULT "QGroupBox{background-color: rgb(150, 150, 150); margin: 2px; border: 1px solid black; border-radius: 8px; padding: 2px; padding-top: 1.5em;}"
-#define STYLE_SELECTED "QGroupBox{background-color: rgb(150, 150, 150); margin: 2px; border: 1px solid red; border-radius: 8px; padding: 2px; padding-top: 1.5em;}"
+#define STYLE_DEFAULT "QGroupBox{background-color: #DCDCDC; margin: 2px; border: 1px solid black; border-radius: 8px; padding: 2px; padding-top: 1.5em;}"
+#define STYLE_SELECTED "QGroupBox{background-color: #DCDCDC; margin: 2px; border: 1px solid red; border-radius: 8px; padding: 2px; padding-top: 1.5em;}"
 
 #include <src/util/timeUtil.h>
 
@@ -118,7 +118,6 @@ public:
     void setFrameRate(int newRate);
     bool isClientOnline;
     void paintCloseUp(int w, int h);
-    void resizeComponent(int w, int h);
     void setSource();
     void setTarget();
     void setUnproject();
@@ -145,8 +144,8 @@ public Q_SLOTS:
 protected:
     //virtual void paintEvent(QPaintEvent *event);
     void mouseReleaseEvent  ( QMouseEvent * e );
-	virtual void 	enterEvent ( QEvent * event );
-	virtual void 	leaveEvent ( QEvent * event );
+	virtual void enterEvent ( QEvent * event );
+	virtual void leaveEvent ( QEvent * event );
 	void mousePressEvent(QMouseEvent *event);
 	void mouseMoveEvent(QMouseEvent *event);
 	//void mouseReleaseEvent ( QMouseEvent * event );
@@ -154,15 +153,12 @@ protected:
 private:
 
     Frame      *_frame;
-    //clickableLabel      *frame;
-    QSplitter   *_split;
-    QGridLayout* _gL;
+    QVBoxLayout *_layoutTop;
+    QHBoxLayout *_layoutBottom;
     QLabel* _ip;
 	QLabel* _status;
 	QLabel* _dozentContaimner;
 	QWidget* _conFrameTaskbar;
-	QGridLayout* _gLayout;
-	QHBoxLayout* _hLayoutInCfTaskbar;
 
     PVSClient* _myConnection;
     QPixmap _clientPix;
diff --git a/src/gui/connectionWindow.cpp b/src/gui/connectionWindow.cpp
index df31562..ec6db1b 100644
--- a/src/gui/connectionWindow.cpp
+++ b/src/gui/connectionWindow.cpp
@@ -38,6 +38,8 @@ ConnectionWindow::ConnectionWindow(QWidget *parent) :
 	menu->addAction(newDummy);
 
 	setAcceptDrops(true); //drag&drop should be enabled
+
+	setStyleSheet("background-color: #DCDCDC;");
 }
 
 ConnectionWindow::~ConnectionWindow() {
diff --git a/src/gui/frame.cpp b/src/gui/frame.cpp
index aa6b0cb..6054065 100644
--- a/src/gui/frame.cpp
+++ b/src/gui/frame.cpp
@@ -36,13 +36,10 @@ Frame::Frame(const QString & text, QWidget * parent) :
 	Y = 0;
 	setBackgroundRole(QPalette::Base);
 
-	setStyleSheet(QString::fromUtf8("QLabel{border-radius:10px;\n"
-			   "background-color: rgb(150,150,150);}"));
-
-	 setAlignment(Qt::AlignCenter);
+	setAlignment(Qt::AlignCenter);
 
 	setAutoFillBackground(true);
-	setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
+	setFrameStyle(QFrame::StyledPanel | QFrame::Plain);
 
 	_isLocked = false;
 	_dozent   = false;
@@ -51,12 +48,13 @@ Frame::Frame(const QString & text, QWidget * parent) :
 
 	//QIcon icon;
 	//icon.addFile(QString::fromUtf8(), QSize(), QIcon::Normal, QIcon::Off);
-	button_closeUp   = createToolButton(tr("View"), QIcon(":/restore"),SLOT(closeUp()));
-	button_closeUp->setCheckable(true);
-	button_foto      = createToolButton(tr("Foto"), QIcon(":/photos"),SLOT(foto()));
-	button_lock      = createToolButton(tr("Lock this client"), QIcon(":/lock"),SLOT(setLock()));
+//	button_closeUp   = createToolButton(tr("View"), QIcon(":/restore"),SLOT(closeUp()));
+//	button_closeUp->setCheckable(true);
+//	button_foto      = createToolButton(tr("Foto"), QIcon(":/photos"),SLOT(foto()));
+//	button_lock      = createToolButton(tr("Lock this client"), QIcon(":/lock"),SLOT(setLock()));
 	//button_unlock    = createToolButton(tr("Unlock this client"), QIcon(":/lock"),SLOT(setLock()));
-	button_dozent    = createToolButton(tr("Set as Superclient"), QIcon(":/dozent2"),SLOT(setDozent()));
+//	button_dozent    = createToolButton(tr("Set as Superclient"), QIcon(":/dozent2"),SLOT(setDozent()));
+//	button_dozent->setCheckable(true);
 	button_control   = createToolButton(tr("Enable Remote Control"), QIcon(":/remotecontrol"), SLOT(remoteControlClicked()));
 	button_control->setCheckable(true);
 	button_control_all = createToolButton(tr("Remote Control All Clients"), QIcon(":/remotecontrolall"), SLOT(remoteControlAllClicked()));
@@ -292,27 +290,25 @@ QToolButton* Frame::createToolButton(const QString &toolTip, const QIcon &icon,
      QToolButton *button = new QToolButton(this);
      button->setToolTip(toolTip);
      button->setIcon(icon);
-     button->setIconSize(QSize(15, 15));
-     button->setStyleSheet(QString::fromUtf8("background-color: rgb(230, 230, 230);"));
+     button->setIconSize(QSize(30, 30));
      addButton(button);
      toolButtonList.append(button);
      connect(button, SIGNAL(clicked()), this, member);
-
      return button;
 }
 
 void Frame::addButton(QToolButton *button)
 {
 	button->move(X,Y);
-	Y += button->size().height()-5;
+	Y += button->size().height() + 10;
 }
 
 void Frame::setToolButtonListVisible(bool visible)
 {
 	foreach (QToolButton* tb, toolButtonList)
 		tb->setVisible(visible);
-	if (visible && MainWindow::getConnectionWindow()->hasDozent && !_dozent)
-		button_dozent->setVisible(false);//At this time this button should only be visible on the dozent machine (the superclient).
+//	if (visible && MainWindow::getConnectionWindow()->hasDozent && !_dozent)
+//		button_dozent->setVisible(false);//At this time this button should only be visible on the dozent machine (the superclient).
 
 }
 
@@ -320,12 +316,12 @@ void Frame::setLockStatus(bool lock)
 {
 	if (lock)
 	{
-		button_lock->setToolTip(tr("Unlock this client"));
+		//button_lock->setToolTip(tr("Unlock this client"));
 		//button_lock->setIcon() TODO
 	}
 	else
 	{
-		button_lock->setToolTip(tr("Lock this client"));
+		//button_lock->setToolTip(tr("Lock this client"));
 		//button_lock->setIcon() TODO
 	}
 	_isLocked = lock;
@@ -373,14 +369,14 @@ void Frame::setDozent()
 {
 	if (_dozent)
 	{
-		button_dozent->setToolTip(tr("Set client as Superclient"));
+		//button_dozent->setToolTip(tr("Set client as Superclient"));
 		_dozent = false;
 		MainWindow::getConnectionWindow()->hasDozent = false;
 		getConFrame()->setDozent(false);
 	}
 	else
 	{
-		button_dozent->setToolTip(tr("Unset client as Superclient"));
+		//button_dozent->setToolTip(tr("Unset client as Superclient"));
 		_dozent = true;
 		MainWindow::getConnectionWindow()->hasDozent = true;
 		getConFrame()->setDozent(true);
@@ -390,7 +386,7 @@ void Frame::setDozent()
 void Frame::setCloseUp(bool value)
 {
 	_isCloseUp = value;
-	button_closeUp->setChecked(value);
+	//button_closeUp->setChecked(value);
 }
 
 void Frame::remoteControlClicked()
@@ -503,6 +499,7 @@ void Frame::updateMousePosition(QMouseEvent* event)
 
 void Frame::enterEvent(QEvent* event)
 {
+    QApplication::setOverrideCursor(QCursor(Qt::ArrowCursor));
 	_mouseOver = true;
 	if(_remoteControlEnabled)
 	{
@@ -512,6 +509,7 @@ void Frame::enterEvent(QEvent* event)
 
 void Frame::leaveEvent(QEvent* event)
 {
+    QApplication::setOverrideCursor(QCursor(Qt::OpenHandCursor));
 	_mouseOver = false;
 	if(_remoteControlEnabled)
 	{
diff --git a/src/gui/mainWindow.cpp b/src/gui/mainWindow.cpp
index 6bb84a4..4eae44e 100644
--- a/src/gui/mainWindow.cpp
+++ b/src/gui/mainWindow.cpp
@@ -47,8 +47,6 @@ MainWindow::MainWindow(QWidget *parent, Qt::WindowFlags flags) :
 {
 	ui->setupUi(this);
 
-	_info = new QLabel("");
-
     if (!QFile::exists(_settings.fileName()))
     {
         QDir::root().mkpath(QFileInfo(_settings.fileName()).path());
@@ -131,6 +129,7 @@ MainWindow::MainWindow(QWidget *parent, Qt::WindowFlags flags) :
 	qualityActionGroup->addAction(ui->action_quality_Low);
 
 	// define the slots we want to use
+	connect(ui->action_Info, SIGNAL(triggered()), this, SLOT(info()));
 	connect(ui->action_Quit, SIGNAL(triggered()), this, SLOT(close()));
 	connect(ui->action_Manage_Profiles, SIGNAL(triggered()), this, SLOT(createProfile()));
 	connect(ui->action_Reset, SIGNAL(triggered()), this, SLOT(resetall()));
@@ -200,8 +199,6 @@ MainWindow::MainWindow(QWidget *parent, Qt::WindowFlags flags) :
     connect(ui->action_quality_Low, SIGNAL(triggered()), qualitySignalMapper, SLOT (map()));
     connect(qualitySignalMapper, SIGNAL(mapped(int)), this, SLOT(setVNCQuality(int)));
 
-    ui->toolBar->addWidget(_info);
-
 #else
 	// toolbar and actions in pvsmgr
 	connect(ui->action_Exit, SIGNAL(triggered()), this, SLOT(close()));
@@ -361,7 +358,7 @@ void MainWindow::loadSettings()
 		title.append(" [" + _sessionName + " : ");
 		title.append(_pwdCon + "]");
 		setWindowTitle(title);
-		_info->setText(title);
+		_info = title;
 	}
 	else
 	{
@@ -370,7 +367,7 @@ void MainWindow::loadSettings()
 		title.append(" [" + _sessionName + " : ");
 		title.append(_pwdCon + "]");
 		setWindowTitle(title);
-		_info->setText(title);
+		_info = title;
 		settings.beginGroup(current);
 		QStringList keys = settings.childKeys();
 		for (int i = 0; i < keys.size(); i++)
@@ -446,7 +443,7 @@ void MainWindow::loadSettings(QString profilname) // loads the current profile
 		title.append(" [" + _sessionName + " : ");
 		title.append(_pwdCon + "]");
 		setWindowTitle(title);
-		_info->setText(title);
+		_info = title;
 	}
 }
 
@@ -648,47 +645,8 @@ void MainWindow::changeEvent(QEvent *e)
  */
 void MainWindow::resizeEvent(QResizeEvent *event)
 {
-
 	if (bgimage == true)
-	{
 		repaintbackgroundpicture(); // repaint the backgroundpicture scaled to the window size
-	}
-
-	if (_firstResize == 3)
-	{
-		QSize oldSize = event->oldSize();
-		_initW = ui->widget->width();
-		_initH = ui->widget->height();
-		_firstResize++;
-	}
-	std::list<QString>* selectedClients =
-			MainWindow::getConnectionList()->getSelectedClients();
-	if (is_closeup && selectedClients->size() == 1)
-	{
-		PVSClient* pvsClient =
-				PVSConnectionManager::getManager()->getClientFromIp(
-						selectedClients->front().toStdString().c_str());
-		pvsClient->getConnectionFrame()->paintCloseUp(ui->widget->width(),
-				ui->widget->height());
-	}
-	else if (!is_closeup && _firstResize > 3)
-	{
-		int ratio_w = (ui->widget->width() * 100) / _initW;
-		int ratio_h = (ui->widget->height() * 100) / _initH;
-foreach	(ConnectionFrame* cf, getConnectionWindow()->getFrameList())
-	{
-		/*int margin = ui->widget->style()->pixelMetric(QStyle::PM_DefaultTopLevelMargin);
-		 int x = ui->widget->width() - margin;
-		 int y = ui->widget->height() - margin;
-		 updatePos(cf, x, y);*/
-		int w = (cf->init_w * ratio_w) / 100;
-		int h = (cf->init_h * ratio_h) / 100;
-		cf->paintCloseUp(w,h);
-	}
-}
-
-if (_firstResize < 3)
-_firstResize++;
 }
 
 void MainWindow::updatePos(ConnectionFrame* cf, int x, int y)
@@ -803,16 +761,10 @@ void MainWindow::closeUp(ConnectionFrame* connFrame, PVSClient* pvsClient)
 
 	// Do we already have a closeUp Frame?
 	ConnectionFrame* closeupFrame = conWin->getCloseupFrame();
-
 	if(closeupFrame)
 	{
-		// Is it the same as the sender one?
-		if(connFrame == closeupFrame)
-			// Then it already is close up.
-			return;
-		else
-			// We need to un-closeUp the currently selected closeUp-Frame.
-			unCloseUp(closeupFrame);
+	    unCloseUp(closeupFrame);
+	    return;
 	}
 
 	_framePosOnCloseUp = connFrame->pos();//get the actualy position before run closeup
@@ -1122,7 +1074,7 @@ void MainWindow::setPasswordForConnection(int enabled)
 		title.append(_profilName);
 		title.append(" [" + _sessionName + " : ]");
 		setWindowTitle(title);
-		_info->setText(title);
+		_info = title;
 	}
 	else if (enabled == 2) //password is needed, we show it in the titlebar
 	{
@@ -1133,7 +1085,7 @@ void MainWindow::setPasswordForConnection(int enabled)
 		title.append(" [" + _sessionName + " : ");
 		title.append(_pwdCon + "]");
 		setWindowTitle(title);
-		_info->setText(title);
+		_info = title;
 	}
 }
 //#endif
@@ -1318,6 +1270,11 @@ int MainWindow::getDisplayedClientNameEnum()
 	return displayedClientNameEnum;
 }
 
+void MainWindow::info()
+{
+    QMessageBox::information(this, tr("Information"), _info);
+}
+
 MainWindow* MainWindow::myself = NULL;
 ConnectionList* MainWindow::conList = NULL;
 ConnectionWindow* MainWindow::conWin = NULL;
diff --git a/src/gui/mainWindow.h b/src/gui/mainWindow.h
index bbe9c49..cf618f0 100644
--- a/src/gui/mainWindow.h
+++ b/src/gui/mainWindow.h
@@ -123,7 +123,7 @@ private:
     QString _pwdCon;
     QString _sessionName;
     QString _profilName;
-    QLabel *_info;
+    QString _info;
 
     int displayedClientNameEnum; //to tell if username, loginname or ip is shown in clientList
 
@@ -182,6 +182,7 @@ public slots:
     void unCloseUp(ConnectionFrame* connFrame);
     void closeUp();
     void foto();
+    void info();
     void backgroundpicture();
     void repaintbackgroundpicture();
     void setdozenttoolbar();
diff --git a/src/gui/ui/clientConfigDialog.ui b/src/gui/ui/clientConfigDialog.ui
index bb4bdc9..aa73433 100644
--- a/src/gui/ui/clientConfigDialog.ui
+++ b/src/gui/ui/clientConfigDialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>445</width>
-    <height>266</height>
+    <width>366</width>
+    <height>195</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -27,7 +27,7 @@
       <enum>QTabWidget::North</enum>
      </property>
      <property name="currentIndex">
-      <number>2</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="tabPermissions">
       <attribute name="title">
@@ -130,30 +130,6 @@
          </property>
         </widget>
        </item>
-       <item>
-        <layout class="QVBoxLayout" name="verticalLayout_5">
-         <item>
-          <widget class="QCheckBox" name="checkBoxAllowChat">
-           <property name="text">
-            <string>Accept chat messages</string>
-           </property>
-           <property name="checked">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QCheckBox" name="checkBoxAllowFiletransfer">
-           <property name="text">
-            <string>Accept file transfers</string>
-           </property>
-           <property name="checked">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tabDisplay">
diff --git a/src/gui/ui/mainwindowtouch.ui b/src/gui/ui/mainwindowtouch.ui
index 7241895..651217e 100644
--- a/src/gui/ui/mainwindowtouch.ui
+++ b/src/gui/ui/mainwindowtouch.ui
@@ -116,6 +116,7 @@
      <string>&amp;File</string>
     </property>
     <addaction name="separator"/>
+    <addaction name="action_Info"/>
     <addaction name="action_Save_Profile"/>
     <addaction name="action_Manage_Profiles"/>
     <addaction name="separator"/>
@@ -491,6 +492,11 @@
     <string>Use Password</string>
    </property>
   </action>
+  <action name="action_Info">
+   <property name="text">
+    <string>&amp;Info</string>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="../../../pvsmgr.qrc"/>
diff --git a/src/net/mcast/CMakeLists.txt b/src/net/mcast/CMakeLists.txt
index e92b090..74c8a54 100644
--- a/src/net/mcast/CMakeLists.txt
+++ b/src/net/mcast/CMakeLists.txt
@@ -1,4 +1,4 @@
-INCLUDE(../../../OpenPGMConfig.cmake)
+INCLUDE( OpenPGMConfig )
 
 ADD_DEFINITIONS(
     ${LIBPGM_CXXFLAGS} 
diff --git a/src/pvs.cpp b/src/pvs.cpp
index 1f751b8..cf45dd7 100755..100644
--- a/src/pvs.cpp
+++ b/src/pvs.cpp
@@ -46,9 +46,7 @@ PVS::PVS() :
     _vncRequested = false;
     readPolicyFiles();
     loadCommands();
-    /*#ifndef __WIN32__*/
-        _blankScreen = NULL;
-    /*#endif*/
+    _blankScreen = NULL;
     _vncPort = -1;
 
     _masterMcastConfig = new McastConfiguration(this);
@@ -81,7 +79,6 @@ PVS::PVS() :
     _timerLockTest = 0;
     _timerLockDelay = 0;
 
-    #ifndef __WIN32__
     //add signalhandling for sigterm signals
     struct sigaction act;
     act.sa_handler = &PVS::signalHandler;
@@ -95,7 +92,6 @@ PVS::PVS() :
     sigaction(SIGQUIT, &act, 0);
 
     initializeInputEventHandling();
-    #endif /*__WIN32__*/
 }
 
 PVS::~PVS()
@@ -593,18 +589,12 @@ int PVS::startVNCScript(int port, QString pass, QString rwpass)
         if (!system(NULL))
             ConsoleLog writeError("No Command processor available");
         int result = system(commandLine.toUtf8().data());
-        #ifndef __WIN32__
-//TODO Win32
         result = WEXITSTATUS(result);
         if (result != 0)
             ConsoleLog writeError(QString("VNC-Server is not running, code: ") + int2String(result));
         else
             ConsoleLog writeLine("VNC-Server should be running");
         return result;
-        #else
-            /*Code fuer VNC-Aufruf unter Windows einfuegen*/
-            return 0;
-        #endif /*__WIN32__*/
     }
     else
     {
@@ -620,7 +610,6 @@ int PVS::stopVNCScript()
 {
     if (gotVNCScript())
     {
-        #ifndef __WIN32__
         ConsoleLog writeLine("Stopping VNC-Script");
         QString commandLine(_vncScriptPath);
         commandLine.append(" ");
@@ -632,10 +621,6 @@ int PVS::stopVNCScript()
         ConsoleLog writeLine("VNC-Server should be stopped");
         int result = system(commandLine.toUtf8().data());
         return WEXITSTATUS(result);
-        #else
-            /*Code fuer VNC-Server stoppen unter Windows einfuegen*/
-            return 0;
-        #endif /*__WIN32__*/
     }
     else
     {
@@ -713,7 +698,6 @@ QString PVS::getIpByNick(QString nick)
 void PVS::signalHandler(int signal)
 {
     ConsoleLog writeLine(QString("Received Signal ").append (int2String(signal)));
-	#ifndef __WIN32__
     switch (signal) {
         case SIGHUP:
             mainClient->quit();
@@ -728,10 +712,6 @@ void PVS::signalHandler(int signal)
             mainClient->quit();
             break;
     }
-    #else
-        ConsoleLog writeLine("Abfang nicht definiert fuer Windows");
-    #endif /*__WIN32__*/
-
 }
 
 bool PVS::createMulticastTransfer(QString const& objectPath, quint64& transferID, QString& errorReason)
diff --git a/src/pvs.h b/src/pvs.h
index 49c2b4c..b2a84cf 100755..100644
--- a/src/pvs.h
+++ b/src/pvs.h
@@ -13,10 +13,8 @@
 #define PVSCLIENT_H_
 
 #include <QtCore>
-#ifndef __WIN32__
-   #include <X11/Xlib.h>
-   #include <X11/cursorfont.h>
-#endif
+#include <X11/Xlib.h>
+#include <X11/cursorfont.h>
 #include <signal.h>
 
 #include "setup.h"
@@ -141,9 +139,7 @@ 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?)
-    /*#ifndef __WIN32__*/
-        BlankScreen *_blankScreen;///< object to blank the screen
-    /*#endif*/
+    BlankScreen *_blankScreen;///< object to blank the screen
 
     QFileSystemWatcher* _notify; ///< used to get notifies about file changes
     //vnc-server
diff --git a/src/pvsDaemon.cpp b/src/pvsDaemon.cpp
index 1784a14..9f2572c 100644
--- a/src/pvsDaemon.cpp
+++ b/src/pvsDaemon.cpp
@@ -64,9 +64,6 @@ int main(int argc, char** argv)
     bool _daemon = false;
     int frequency = 5;
     int port = -1;
-#ifdef as_daemon
-    bool no_fork = false;
-#endif
 
     QCoreApplication app(argc, argv);
     app.setOrganizationName("openslx");
@@ -78,11 +75,6 @@ int main(int argc, char** argv)
     app.installTranslator(&translator);
 
     QFileInfo script;
-#ifdef __WIN32__
-    //TODO Win32
-    if (!script.exists())
-        script.setFile(getHomeDir() + "/.pvs/pvs-vncsrv_win32.bat");
-#else
     QSettings settings;
     if (!QFile::exists(settings.fileName()))
     {
@@ -97,7 +89,6 @@ int main(int argc, char** argv)
         script.setFile("/usr/local/bin/pvs-vncsrv");
     if (!script.exists())
         script.setFile(getHomeDir() + "/.pvs/pvs-vncsrv");
-#endif //__WIN32__
 
     PVSLocalhostCommunicator com(getPolicyFilePath(QString(
                                      ".comfile")));
@@ -122,9 +113,6 @@ int main(int argc, char** argv)
             { "freq", required_argument, 0, 'f' },
             { "client", required_argument, 0, 'e' },
             { "script", required_argument, 0, 's' },
-#ifdef as_daemon
-            { "no-fork", no_argument, 0, 'F' },
-#endif
             { 0, 0, 0, 0 },
         };
         /* getopt_long stores the option index here. */
@@ -232,13 +220,6 @@ int main(int argc, char** argv)
             }
             break;
         }
-#ifdef as_daemon
-        case 'F':
-        {
-        	no_fork = true;
-        	break;
-        }
-#endif
         case '?':
         {
             ConsoleLog writeError(
@@ -264,11 +245,7 @@ int main(int argc, char** argv)
     ConsoleLog writeLine(QString("PVS-Client started."));
 
     if (_daemon)
-    {
-        #ifndef __WIN32__
         daemon(1, 1);
-        #endif /*__WIN32__*/
-    }
 
     mainClient = new PVS();
     com.getDispatcher()->addListener("*", mainClient, &PVS::onDaemonCommand);
diff --git a/src/pvsgui.cpp b/src/pvsgui.cpp
index 1f11790..4294206 100644
--- a/src/pvsgui.cpp
+++ b/src/pvsgui.cpp
@@ -345,7 +345,6 @@ void PVSGUI::disconnected()
 {
     statusLabel->setText(
             "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\"><html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">p, li { white-space: pre-wrap; }</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;\"><p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" color:#ff0000;\">Offline</span></p></body></html>");
-    showMessage(tr("PVS connection"), tr("Disconnected"));
     if (_hosts->contains(hostButton->text()))
         _hosts->value(hostButton->text())->setChecked(false);
     hostButton->setText("-");
diff --git a/src/util/clientGUIUtils.h b/src/util/clientGUIUtils.h
index 7f7ea47..e797ea0 100755..100644
--- a/src/util/clientGUIUtils.h
+++ b/src/util/clientGUIUtils.h
@@ -25,7 +25,6 @@ private:
     BlankScreen_Sysdep* _sysdep;
 };
 
-#ifndef __WIN32__
 # include <X11/Xlib.h>
 
 class X11Info
@@ -33,6 +32,5 @@ class X11Info
 public:
 	static Display* display();
 };
-#endif /* !__WIN32__ */
 
 #endif
diff --git a/src/util/clientGUIUtils_Win32.cpp b/src/util/clientGUIUtils_Win32.cpp
deleted file mode 100755
index 1b4d2ae..0000000
--- a/src/util/clientGUIUtils_Win32.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-

-#include "clientGUIUtils.h"

-#include <qwidget.h>

-

-struct BlankScreen_Sysdep {

-

-    bool locked;

-	QWidget* blankwin;

-

-    QString lockMsg;

-    int blackColor, whiteColor;

-    int offX, offY;

-};

-

-BlankScreen::BlankScreen()

-{

-	_sysdep = new BlankScreen_Sysdep;

-    _sysdep->blankwin = new QWidget(0, Qt::X11BypassWindowManagerHint | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);

-    _sysdep->blankwin->setWindowState(Qt::WindowFullScreen);

-    _sysdep->blankwin->show();

-}

-

-BlankScreen::~BlankScreen()

-{

-    delete _sysdep;

-}

-

-void BlankScreen::draw(bool force)

-{

-    

-}

-

-bool BlankScreen::lock()

-{

-   return true;

-}

-

-bool BlankScreen::lock_inputs()

-{

-    return true;

-}

-

-bool BlankScreen::unlock()

-{

-    return true;

-}

diff --git a/src/util/clientGUIUtils_X11.cpp b/src/util/clientGUIUtils_X11.cpp
index 4b5afe0..4b5afe0 100755..100644
--- a/src/util/clientGUIUtils_X11.cpp
+++ b/src/util/clientGUIUtils_X11.cpp
diff --git a/src/util/consoleLogger.cpp b/src/util/consoleLogger.cpp
index 9189543..9189543 100755..100644
--- a/src/util/consoleLogger.cpp
+++ b/src/util/consoleLogger.cpp
diff --git a/src/util/util.cpp b/src/util/util.cpp
index 05a209f..0fcfa84 100755..100644
--- a/src/util/util.cpp
+++ b/src/util/util.cpp
@@ -7,10 +7,6 @@
 #include <QStringList>
 #include <iostream>
 #include <QDir>
-#ifdef __WIN32__
-    #include <windows.h>
-	#include <Lmcons.h>
-#endif //__WIN32__
 
 PVSServerEntry::PVSServerEntry(QString name)
 {
@@ -49,11 +45,7 @@ int getRandom(int min, int max)
     if (init)
     {
         init = false;
-        #ifndef __WIN32__
         srand ( time(NULL) + getpid() );
-        #else
-            srand ( time(NULL) ); /*might be solved by another random factor*/
-        #endif
     }
     if (min >= max) return rand();
     return rand() % (max-min+1) + min;
@@ -193,24 +185,10 @@ QString colonSplitter(QString line, bool first)
 QString getUserName()
 {
     QString username;
-	#ifdef __WIN32__
-        WCHAR* lpszSystemInfo; // pointer to system information
-        DWORD cchBuff = 256; // size of user name
-        WCHAR tchBuffer[UNLEN + 1]; // buffer for expanded string
+    struct passwd* passUser = getpwuid(getuid());
+    if (passUser)
+        username = QString(passUser->pw_name);
 
-        lpszSystemInfo = tchBuffer;
-
-        // Get and display the user name.
-        GetUserNameW(lpszSystemInfo, &cchBuff);
-
-        //Unicode string needs to be converted
-        username = QString::fromWCharArray(lpszSystemInfo);
-    #else
-        struct passwd* passUser = getpwuid(getuid());
-        if (passUser)
-            username = QString(passUser->pw_name);
-
-    #endif //#ifdef __WIN32__
     if (username.isEmpty())
     {
         qDebug("USERNAME COULDNT BE RETRIEVED!");
@@ -223,21 +201,19 @@ QString getUserName()
 QString getFullUsername()
 {
     QString fullname = getUserName();
-	#ifndef __WIN32__
-        struct passwd *pd;
+    struct passwd *pd;
 
-        if (NULL == (pd = getpwuid(getuid())))
-        {ConsoleLog writeError("getpwuid() error.");}
-        else
+    if (NULL == (pd = getpwuid(getuid())))
+    {ConsoleLog writeError("getpwuid() error.");}
+    else
+    {
+        QString tmp = pd->pw_gecos;
+        QStringList userData = tmp.split(",");
+        if(userData[0].length() > 0 )
         {
-            QString tmp = pd->pw_gecos;
-            QStringList userData = tmp.split(",");
-            if(userData[0].length() > 0 )
-            {
-                fullname = userData[0];
-            }
+            fullname = userData[0];
         }
-	#endif //__WIN32__ //might be completed some time to a full solution for WIN32
+    }
     return fullname;
 }
 
diff --git a/src/util/util.h b/src/util/util.h
index 4f2d0ee..0fab33f 100755..100644
--- a/src/util/util.h
+++ b/src/util/util.h
@@ -1,19 +1,12 @@
 #include <QString>
 #include <cstdio>
-//#include <cstring>
 #include <list>
 #include <fstream>
 #include <iostream>
-#ifndef __WIN32__
-    #include <pwd.h>
-#else
-    /*#include "pwd_win32.h"*/
-#endif /*__WIN32*/
+#include <pwd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
-
-
 #ifndef _PVSSERVERENTRY_H_
 #define _PVSSERVERENTRY_H_
 class PVSServerEntry