Merge remote branch 'openslx/master' into mcastft

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

3 files changed, 32 insertions, 46 deletions

diff --git a/src/gui/ui/clientToolbar.ui b/src/gui/ui/clientToolbar.ui
index 5a59c5f..d70857a 100644
--- a/src/gui/ui/clientToolbar.ui
+++ b/src/gui/ui/clientToolbar.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>577</width>
+    <width>328</width>
     <height>28</height>
    </rect>
   </property>
@@ -144,46 +144,6 @@ p, li { white-space: pre-wrap; }
        </spacer>
       </item>
       <item>
-       <widget class="QCheckBox" name="vncCheckBox">
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>Enable/Disable VNC only for this session</string>
-        </property>
-        <property name="text">
-         <string>Allow VNC</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="horizontalSpacer_2">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QLabel" name="label">
-        <property name="text">
-         <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:10pt; font-weight:600; font-style:italic; color:#0055ff;&quot;&gt;Pool Video Switch&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-        </property>
-       </widget>
-      </item>
-      <item>
        <widget class="QLabel" name="label_3">
         <property name="maximumSize">
          <size>
diff --git a/src/gui/ui/mainwindow.ui b/src/gui/ui/mainwindow.ui
index 7b8f2b4..7913e38 100644
--- a/src/gui/ui/mainwindow.ui
+++ b/src/gui/ui/mainwindow.ui
@@ -28,8 +28,8 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>776</width>
-         <height>534</height>
+         <width>778</width>
+         <height>542</height>
         </rect>
        </property>
        <layout class="QGridLayout" name="gridLayout_2">
@@ -195,7 +195,7 @@
      <x>0</x>
      <y>0</y>
      <width>838</width>
-     <height>28</height>
+     <height>23</height>
     </rect>
    </property>
    <widget class="QMenu" name="menu_File">
@@ -293,6 +293,7 @@
    <addaction name="actionView"/>
    <addaction name="actionLock"/>
    <addaction name="actionChat"/>
+   <addaction name="actionShowProcesses"/>
   </widget>
   <action name="actionShow_Username">
    <property name="checkable">
@@ -546,6 +547,18 @@
     <string>Configure Network Parameters</string>
    </property>
   </action>
+  <action name="actionShowProcesses">
+   <property name="icon">
+    <iconset resource="../../../pvsmgr.qrc">
+     <normaloff>:/icons/gears.png</normaloff>:/icons/gears.png</iconset>
+   </property>
+   <property name="text">
+    <string>showProcesses</string>
+   </property>
+   <property name="toolTip">
+    <string>Show Processes of the selected Client</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>
diff --git a/src/gui/ui/mainwindowtouch.ui b/src/gui/ui/mainwindowtouch.ui
index cf7e411..24f40b6 100644
--- a/src/gui/ui/mainwindowtouch.ui
+++ b/src/gui/ui/mainwindowtouch.ui
@@ -28,8 +28,8 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>1327</width>
-         <height>658</height>
+         <width>1329</width>
+         <height>660</height>
         </rect>
        </property>
        <layout class="QGridLayout" name="gridLayout_3">
@@ -367,6 +367,7 @@
    <addaction name="actionDozent"/>
    <addaction name="separator"/>
    <addaction name="actionConfigure_Network"/>
+   <addaction name="actionShowProcesses"/>
   </widget>
   <action name="actionShow_Username">
    <property name="checkable">
@@ -647,6 +648,18 @@
     <string>Configure Network...</string>
    </property>
   </action>
+  <action name="actionShowProcesses">
+   <property name="icon">
+    <iconset resource="../../../pvsmgr.qrc">
+     <normaloff>:/icons/gears.png</normaloff>:/icons/gears.png</iconset>
+   </property>
+   <property name="text">
+    <string>showProcesses</string>
+   </property>
+   <property name="toolTip">
+    <string>Show Processes of the selected Client</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>