adapted help-window to reflect the new order in the toolbar.

1 files changed, 143 insertions, 74 deletions

diff --git a/gui/server_normal/help.ui b/gui/server_normal/help.ui
index a4795ff..1bf4d6d 100644
--- a/gui/server_normal/help.ui
+++ b/gui/server_normal/help.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>603</width>
-    <height>657</height>
+    <height>675</height>
    </rect>
   </property>
   <property name="minimumSize">
@@ -21,29 +21,17 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QFrame" name="formFrame_7">
+    <widget class="QFrame" name="fromFrame_8">
      <property name="frameShape">
-      <enum>QFrame::Panel</enum>
+      <enum>QFrame::Box</enum>
      </property>
-     <layout class="QFormLayout" name="LockScreen">
-      <property name="formAlignment">
-       <set>Qt::AlignCenter</set>
-      </property>
-      <property name="horizontalSpacing">
-       <number>6</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item row="0" column="0">
-       <widget class="QLabel" name="lockScreenIcon">
+     <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <item>
+       <widget class="QLabel" name="refreshIcon">
         <property name="minimumSize">
          <size>
-          <width>53</width>
-          <height>54</height>
+          <width>54</width>
+          <height>53</height>
          </size>
         </property>
         <property name="maximumSize">
@@ -59,17 +47,20 @@
          <string/>
         </property>
         <property name="pixmap">
-         <pixmap resource="../../pvsmgr.qrc">:/lock</pixmap>
+         <pixmap resource="../../pvsmgr.qrc">:/reloadClassroom</pixmap>
         </property>
         <property name="scaledContents">
          <bool>true</bool>
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
-       <widget class="QLabel" name="lockScreen">
+      <item>
+       <widget class="QLabel" name="refresh">
         <property name="text">
-         <string>Lock all connected students screens.</string>
+         <string>Refresh classroom configuration after choosing the room.</string>
+        </property>
+        <property name="scaledContents">
+         <bool>false</bool>
         </property>
         <property name="alignment">
          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -83,14 +74,20 @@
     </widget>
    </item>
    <item>
-    <widget class="QFrame" name="formFrame_6">
+    <widget class="QFrame" name="formFrame_7">
      <property name="frameShape">
       <enum>QFrame::Panel</enum>
      </property>
-     <layout class="QFormLayout" name="Tutor2All">
+     <layout class="QFormLayout" name="LockScreen">
+      <property name="fieldGrowthPolicy">
+       <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+      </property>
       <property name="formAlignment">
        <set>Qt::AlignCenter</set>
       </property>
+      <property name="horizontalSpacing">
+       <number>6</number>
+      </property>
       <property name="topMargin">
        <number>0</number>
       </property>
@@ -98,7 +95,7 @@
        <number>0</number>
       </property>
       <item row="0" column="0">
-       <widget class="QLabel" name="tutor2allIcon">
+       <widget class="QLabel" name="lockScreenIcon">
         <property name="minimumSize">
          <size>
           <width>53</width>
@@ -111,9 +108,6 @@
           <height>54</height>
          </size>
         </property>
-        <property name="autoFillBackground">
-         <bool>false</bool>
-        </property>
         <property name="frameShape">
          <enum>QFrame::NoFrame</enum>
         </property>
@@ -121,7 +115,7 @@
          <string/>
         </property>
         <property name="pixmap">
-         <pixmap resource="../../pvsmgr.qrc">:/tutor2all</pixmap>
+         <pixmap resource="../../pvsmgr.qrc">:/lock</pixmap>
         </property>
         <property name="scaledContents">
          <bool>true</bool>
@@ -129,9 +123,9 @@
        </widget>
       </item>
       <item row="0" column="1">
-       <widget class="QLabel" name="tutor2all">
+       <widget class="QLabel" name="lockScreen">
         <property name="text">
-         <string>Start projection from tutor to all connected students.</string>
+         <string>Lock all connected students screens.</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -145,11 +139,14 @@
     </widget>
    </item>
    <item>
-    <widget class="QFrame" name="formFrame_5">
+    <widget class="QFrame" name="formFrame_6">
      <property name="frameShape">
       <enum>QFrame::Panel</enum>
      </property>
-     <layout class="QFormLayout" name="Tutor2Student">
+     <layout class="QFormLayout" name="Tutor2All">
+      <property name="fieldGrowthPolicy">
+       <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+      </property>
       <property name="formAlignment">
        <set>Qt::AlignCenter</set>
       </property>
@@ -160,7 +157,7 @@
        <number>0</number>
       </property>
       <item row="0" column="0">
-       <widget class="QLabel" name="tutor2studentIcon">
+       <widget class="QLabel" name="tutor2allIcon">
         <property name="minimumSize">
          <size>
           <width>53</width>
@@ -173,6 +170,9 @@
           <height>54</height>
          </size>
         </property>
+        <property name="autoFillBackground">
+         <bool>false</bool>
+        </property>
         <property name="frameShape">
          <enum>QFrame::NoFrame</enum>
         </property>
@@ -180,7 +180,7 @@
          <string/>
         </property>
         <property name="pixmap">
-         <pixmap resource="../../pvsmgr.qrc">:/tutor2student</pixmap>
+         <pixmap resource="../../pvsmgr.qrc">:/tutor2all</pixmap>
         </property>
         <property name="scaledContents">
          <bool>true</bool>
@@ -188,9 +188,9 @@
        </widget>
       </item>
       <item row="0" column="1">
-       <widget class="QLabel" name="tutor2student">
+       <widget class="QLabel" name="tutor2all">
         <property name="text">
-         <string>Start projection from tutor to selected student.</string>
+         <string>Start projection from tutor to all connected students.</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -204,11 +204,11 @@
     </widget>
    </item>
    <item>
-    <widget class="QFrame" name="formFrame_4">
+    <widget class="QFrame" name="formFrame_5">
      <property name="frameShape">
       <enum>QFrame::Panel</enum>
      </property>
-     <layout class="QFormLayout" name="Student2Tutor">
+     <layout class="QFormLayout" name="Tutor2Student">
       <property name="formAlignment">
        <set>Qt::AlignCenter</set>
       </property>
@@ -219,7 +219,7 @@
        <number>0</number>
       </property>
       <item row="0" column="0">
-       <widget class="QLabel" name="student2tutorIcon">
+       <widget class="QLabel" name="tutor2studentIcon">
         <property name="minimumSize">
          <size>
           <width>53</width>
@@ -239,7 +239,7 @@
          <string/>
         </property>
         <property name="pixmap">
-         <pixmap resource="../../pvsmgr.qrc">:/student2tutor</pixmap>
+         <pixmap resource="../../pvsmgr.qrc">:/tutor2student</pixmap>
         </property>
         <property name="scaledContents">
          <bool>true</bool>
@@ -247,9 +247,9 @@
        </widget>
       </item>
       <item row="0" column="1">
-       <widget class="QLabel" name="student2tutor">
+       <widget class="QLabel" name="tutor2student">
         <property name="text">
-         <string>Start projection from selected student to tutor.</string>
+         <string>Start projection from tutor to selected student.</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -263,11 +263,11 @@
     </widget>
    </item>
    <item>
-    <widget class="QFrame" name="formFrame_3">
+    <widget class="QFrame" name="formFrame_4">
      <property name="frameShape">
       <enum>QFrame::Panel</enum>
      </property>
-     <layout class="QFormLayout" name="Student2Tutor_exclusiv">
+     <layout class="QFormLayout" name="Student2Tutor">
       <property name="formAlignment">
        <set>Qt::AlignCenter</set>
       </property>
@@ -278,7 +278,7 @@
        <number>0</number>
       </property>
       <item row="0" column="0">
-       <widget class="QLabel" name="student2tutor_exclIcon">
+       <widget class="QLabel" name="student2tutorIcon">
         <property name="minimumSize">
          <size>
           <width>53</width>
@@ -298,7 +298,7 @@
          <string/>
         </property>
         <property name="pixmap">
-         <pixmap resource="../../pvsmgr.qrc">:/student2tutorextension</pixmap>
+         <pixmap resource="../../pvsmgr.qrc">:/student2tutor</pixmap>
         </property>
         <property name="scaledContents">
          <bool>true</bool>
@@ -306,9 +306,9 @@
        </widget>
       </item>
       <item row="0" column="1">
-       <widget class="QLabel" name="student2tutor_exclusive">
+       <widget class="QLabel" name="student2tutor">
         <property name="text">
-         <string>Start projection from selected student to tutor and blank all others.</string>
+         <string>Start projection from selected student to tutor.</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -316,20 +316,17 @@
         <property name="wordWrap">
          <bool>true</bool>
         </property>
-        <property name="indent">
-         <number>0</number>
-        </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
-    <widget class="QFrame" name="formFrame">
+    <widget class="QFrame" name="formFrame_3">
      <property name="frameShape">
       <enum>QFrame::Panel</enum>
      </property>
-     <layout class="QFormLayout" name="Reset">
+     <layout class="QFormLayout" name="Student2Tutor_exclusiv">
       <property name="formAlignment">
        <set>Qt::AlignCenter</set>
       </property>
@@ -340,7 +337,7 @@
        <number>0</number>
       </property>
       <item row="0" column="0">
-       <widget class="QLabel" name="resetIcon">
+       <widget class="QLabel" name="student2tutor_exclIcon">
         <property name="minimumSize">
          <size>
           <width>53</width>
@@ -360,7 +357,7 @@
          <string/>
         </property>
         <property name="pixmap">
-         <pixmap resource="../../pvsmgr.qrc">:/reset</pixmap>
+         <pixmap resource="../../pvsmgr.qrc">:/student2tutorextension</pixmap>
         </property>
         <property name="scaledContents">
          <bool>true</bool>
@@ -368,9 +365,9 @@
        </widget>
       </item>
       <item row="0" column="1">
-       <widget class="QLabel" name="reset">
+       <widget class="QLabel" name="student2tutor_exclusive">
         <property name="text">
-         <string>Stop running projections.</string>
+         <string>Start projection from selected student to tutor and blank all others.</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -378,6 +375,9 @@
         <property name="wordWrap">
          <bool>true</bool>
         </property>
+        <property name="indent">
+         <number>0</number>
+        </property>
        </widget>
       </item>
      </layout>
@@ -446,17 +446,89 @@
     </widget>
    </item>
    <item>
-    <widget class="QFrame" name="fromFrame_8">
+    <widget class="QFrame" name="frame">
      <property name="frameShape">
-      <enum>QFrame::Box</enum>
+      <enum>QFrame::Panel</enum>
      </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_2">
-      <item>
-       <widget class="QLabel" name="refreshIcon">
+     <property name="frameShadow">
+      <enum>QFrame::Plain</enum>
+     </property>
+     <widget class="QLabel" name="deleteIcon">
+      <property name="geometry">
+       <rect>
+        <x>10</x>
+        <y>0</y>
+        <width>53</width>
+        <height>54</height>
+       </rect>
+      </property>
+      <property name="minimumSize">
+       <size>
+        <width>53</width>
+        <height>54</height>
+       </size>
+      </property>
+      <property name="maximumSize">
+       <size>
+        <width>53</width>
+        <height>54</height>
+       </size>
+      </property>
+      <property name="frameShape">
+       <enum>QFrame::NoFrame</enum>
+      </property>
+      <property name="text">
+       <string/>
+      </property>
+      <property name="pixmap">
+       <pixmap resource="../../pvsmgr.qrc">:/trash</pixmap>
+      </property>
+      <property name="scaledContents">
+       <bool>true</bool>
+      </property>
+     </widget>
+     <widget class="QLabel" name="reset_2">
+      <property name="geometry">
+       <rect>
+        <x>70</x>
+        <y>0</y>
+        <width>506</width>
+        <height>54</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>Delete selected client</string>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+      </property>
+      <property name="wordWrap">
+       <bool>true</bool>
+      </property>
+     </widget>
+    </widget>
+   </item>
+   <item>
+    <widget class="QFrame" name="formFrame">
+     <property name="frameShape">
+      <enum>QFrame::Panel</enum>
+     </property>
+     <layout class="QFormLayout" name="Reset">
+      <property name="formAlignment">
+       <set>Qt::AlignCenter</set>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item row="0" column="0">
+       <widget class="QLabel" name="resetIcon">
         <property name="minimumSize">
          <size>
-          <width>54</width>
-          <height>53</height>
+          <width>53</width>
+          <height>54</height>
          </size>
         </property>
         <property name="maximumSize">
@@ -472,20 +544,17 @@
          <string/>
         </property>
         <property name="pixmap">
-         <pixmap resource="../../pvsmgr.qrc">:/reloadClassroom</pixmap>
+         <pixmap resource="../../pvsmgr.qrc">:/reset</pixmap>
         </property>
         <property name="scaledContents">
          <bool>true</bool>
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QLabel" name="refresh">
+      <item row="0" column="1">
+       <widget class="QLabel" name="reset">
         <property name="text">
-         <string>Refresh classroom configuration after choosing the room.</string>
-        </property>
-        <property name="scaledContents">
-         <bool>false</bool>
+         <string>Stop running projections.</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>