1 files changed, 60 insertions, 29 deletions
diff --git a/gui/server_normal/mainwindow.ui b/gui/server_normal/mainwindow.ui
index 1f58ec4..c16d408 100644
--- a/gui/server_normal/mainwindow.ui
+++ b/gui/server_normal/mainwindow.ui
@@ -160,12 +160,12 @@ QLabel#examModeLabel {
      <normaloff>:/exit</normaloff>
      <normalon>:/exit</normalon>:/exit</iconset>
    </property>
-   <property name="text">
-    <string>&amp;Exit</string>
-   </property>
    <property name="toolTip">
     <string>Exit</string>
    </property>
+   <property name="text">
+    <string>Exit</string>
+   </property>
    <property name="shortcut">
     <string>Ctrl+Q</string>
    </property>
@@ -178,11 +178,11 @@ QLabel#examModeLabel {
     <iconset resource="../../pvsmgr.qrc">
      <normaloff>:/lock</normaloff>:/lock</iconset>
    </property>
-   <property name="text">
-    <string>lock</string>
-   </property>
    <property name="toolTip">
-    <string>Lock or Unlock all Clients</string>
+    <string>Lock/Unlock all clients</string>
+   </property>
+   <property name="text">
+    <string>This will show a black screen on all connected clients, except the tutor's client.</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+A</string>
@@ -193,17 +193,23 @@ QLabel#examModeLabel {
     <iconset resource="../../pvsmgr.qrc">
      <normaloff>:/student2tutor</normaloff>:/student2tutor</iconset>
    </property>
-   <property name="text">
+   <property name="toolTip">
     <string>Student's Screen to Tutor</string>
    </property>
+   <property name="text">
+    <string>Stream currently selected client's screen content to the tutor's client.</string>
+   </property>
   </action>
   <action name="action_StudentToTutorExclusive">
    <property name="icon">
     <iconset resource="../../pvsmgr.qrc">
      <normaloff>:/student2tutorextension</normaloff>:/student2tutorextension</iconset>
    </property>
+   <property name="toolTip">
+    <string>Student's Screen to Tutor, others blanked.</string>
+   </property>
    <property name="text">
-    <string>Student's Screen to Tutor, others blanked</string>
+    <string>Stream currently selected client's screen content to the tutor's client while showing a locked black screen on all other clients.</string>
    </property>
   </action>
   <action name="action_TutorToStudent">
@@ -211,26 +217,38 @@ QLabel#examModeLabel {
     <iconset resource="../../pvsmgr.qrc">
      <normaloff>:/tutor2student</normaloff>:/tutor2student</iconset>
    </property>
-   <property name="text">
+   <property name="toolTip">
     <string>Tutor's Screen to Student</string>
    </property>
+   <property name="text">
+    <string>Stream the tutor's screen contents to the currently selected client.</string>
+   </property>
   </action>
   <action name="action_TutorToAll">
    <property name="icon">
     <iconset resource="../../pvsmgr.qrc">
      <normaloff>:/tutor2all</normaloff>:/tutor2all</iconset>
    </property>
-   <property name="text">
+   <property name="toolTip">
     <string>Tutor's Screen to Everyone</string>
    </property>
+   <property name="text">
+    <string>Stream the tutor's screen contents to everyone.</string>
+   </property>
   </action>
   <action name="action_StopProjection">
    <property name="icon">
-    <iconset resource="../../pvsmgr.qrc">
+    <iconset resource="../../pvsclient.qrc">
      <normaloff>:/reset</normaloff>:/reset</iconset>
    </property>
+   <property name="toolTip">
+    <string>Reset</string>
+   </property>
    <property name="text">
-    <string>Stop Projection on every Client</string>
+    <string>Unlock all clients, stop any running screen content streaming.</string>
+   </property>
+   <property name="shortcut">
+    <string>R</string>
    </property>
   </action>
   <action name="action_SetAsTutor">
@@ -238,11 +256,14 @@ QLabel#examModeLabel {
     <iconset resource="../../pvsmgr.qrc">
      <normaloff>:/dozent</normaloff>:/dozent</iconset>
    </property>
+   <property name="toolTip">
+    <string>Declare tutor</string>
+   </property>
    <property name="text">
-    <string>SetAsTutor</string>
+    <string>Declare the currently selected client as tutor. The tutor will be excluded from screen locking and can be used as a fixed source/target for screen content streaming.</string>
    </property>
-   <property name="toolTip">
-    <string>Set current Frame as Tutor</string>
+   <property name="shortcut">
+    <string>T</string>
    </property>
   </action>
   <action name="action_DeleteClient">
@@ -250,12 +271,15 @@ QLabel#examModeLabel {
     <iconset resource="../../pvsmgr.qrc">
      <normaloff>:/trash</normaloff>:/trash</iconset>
    </property>
-   <property name="text">
-    <string>Delete Client</string>
-   </property>
    <property name="toolTip">
     <string>Delete Client</string>
    </property>
+   <property name="text">
+    <string>Delete currently selected client. Only allowed for disconnected clients.</string>
+   </property>
+   <property name="shortcut">
+    <string>Del</string>
+   </property>
    <property name="visible">
     <bool>true</bool>
    </property>
@@ -265,12 +289,15 @@ QLabel#examModeLabel {
     <iconset resource="../../pvsmgr.qrc">
      <normaloff>:/helpme</normaloff>:/helpme</iconset>
    </property>
-   <property name="text">
-    <string>Help</string>
-   </property>
    <property name="toolTip">
     <string>Help</string>
    </property>
+   <property name="text">
+    <string>Show this help text.</string>
+   </property>
+   <property name="shortcut">
+    <string>F1</string>
+   </property>
    <property name="visible">
     <bool>true</bool>
    </property>
@@ -280,11 +307,11 @@ QLabel#examModeLabel {
     <iconset resource="../../pvsmgr.qrc">
      <normaloff>:/reloadClassroom</normaloff>:/reloadClassroom</iconset>
    </property>
-   <property name="text">
-    <string>Reload Room Configuration</string>
-   </property>
    <property name="toolTip">
-    <string>Reload Room Configuration</string>
+    <string>Load a new room layout</string>
+   </property>
+   <property name="text">
+    <string>This shows a list of preconfigured rooms which you can load. This will reset the currently shown layout and disconnect all clients.</string>
    </property>
   </action>
   <action name="action_LockSingle">
@@ -292,16 +319,20 @@ QLabel#examModeLabel {
     <iconset resource="../../pvsmgr.qrc">
      <normaloff>:/lock-single</normaloff>:/lock-single</iconset>
    </property>
-   <property name="text">
+   <property name="toolTip">
     <string>Lock/Unlock single client</string>
    </property>
-   <property name="toolTip">
-    <string>Lock or unlock the selected client</string>
+   <property name="text">
+    <string>Lock or unlock the selected client only.</string>
+   </property>
+   <property name="shortcut">
+    <string>L</string>
    </property>
   </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>
+  <include location="../../pvsclient.qrc"/>
   <include location="../../pvsmgr.qrc"/>
  </resources>
  <connections/>