Changed Layout of helpWindow. Set Icon + Text into QFormLayout.

1 files changed, 217 insertions, 67 deletions

diff --git a/gui/server_normal/help.ui b/gui/server_normal/help.ui
index 9dbc55b..d3bcd6c 100644
--- a/gui/server_normal/help.ui
+++ b/gui/server_normal/help.ui
@@ -6,28 +6,47 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>601</width>
-    <height>483</height>
+    <width>603</width>
+    <height>657</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
+  <widget class="QPushButton" name="pushButton">
+   <property name="geometry">
+    <rect>
+     <x>240</x>
+     <y>600</y>
+     <width>121</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Cancel</string>
+   </property>
+  </widget>
   <widget class="QWidget" name="formLayoutWidget">
    <property name="geometry">
     <rect>
      <x>20</x>
-     <y>10</y>
-     <width>562</width>
-     <height>421</height>
+     <y>430</y>
+     <width>561</width>
+     <height>61</height>
     </rect>
    </property>
-   <layout class="QFormLayout" name="formLayout">
-    <property name="fieldGrowthPolicy">
-     <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+   <layout class="QFormLayout" name="Reset">
+    <property name="formAlignment">
+     <set>Qt::AlignCenter</set>
     </property>
     <item row="0" column="0">
-     <widget class="QLabel" name="lockScreenIcon">
+     <widget class="QLabel" name="resetIcon">
+      <property name="minimumSize">
+       <size>
+        <width>53</width>
+        <height>54</height>
+       </size>
+      </property>
       <property name="maximumSize">
        <size>
         <width>53</width>
@@ -35,13 +54,13 @@
        </size>
       </property>
       <property name="frameShape">
-       <enum>QFrame::Box</enum>
+       <enum>QFrame::NoFrame</enum>
       </property>
       <property name="text">
        <string/>
       </property>
       <property name="pixmap">
-       <pixmap resource="../../pvsmgr.qrc">:/lock</pixmap>
+       <pixmap resource="../../pvsmgr.qrc">:/reset</pixmap>
       </property>
       <property name="scaledContents">
        <bool>true</bool>
@@ -49,46 +68,85 @@
      </widget>
     </item>
     <item row="0" column="1">
-     <widget class="QLabel" name="lockScreen">
+     <widget class="QLabel" name="reset">
       <property name="text">
-       <string>Lock all connected students screens.</string>
+       <string>Stop running projections.</string>
       </property>
      </widget>
     </item>
-    <item row="1" column="0">
-     <widget class="QLabel" name="tutor2allIcon">
-      <property name="maximumSize">
+   </layout>
+  </widget>
+  <widget class="QWidget" name="formLayoutWidget_3">
+   <property name="geometry">
+    <rect>
+     <x>20</x>
+     <y>350</y>
+     <width>561</width>
+     <height>61</height>
+    </rect>
+   </property>
+   <layout class="QFormLayout" name="Student2Tutor_exclusiv">
+    <property name="formAlignment">
+     <set>Qt::AlignCenter</set>
+    </property>
+    <item row="0" column="0">
+     <widget class="QLabel" name="student2tutor_exclIcon">
+      <property name="minimumSize">
        <size>
         <width>53</width>
         <height>54</height>
        </size>
       </property>
-      <property name="autoFillBackground">
-       <bool>false</bool>
+      <property name="maximumSize">
+       <size>
+        <width>53</width>
+        <height>54</height>
+       </size>
       </property>
       <property name="frameShape">
-       <enum>QFrame::Box</enum>
+       <enum>QFrame::NoFrame</enum>
       </property>
       <property name="text">
        <string/>
       </property>
       <property name="pixmap">
-       <pixmap resource="../../pvsmgr.qrc">:/tutor2all</pixmap>
+       <pixmap resource="../../pvsmgr.qrc">:/student2tutorextension</pixmap>
       </property>
       <property name="scaledContents">
        <bool>true</bool>
       </property>
      </widget>
     </item>
-    <item row="1" column="1">
-     <widget class="QLabel" name="tutor2all">
+    <item row="0" column="1">
+     <widget class="QLabel" name="student2tutor_exclusive">
       <property name="text">
-       <string>Start projection from tutor to all connected students.</string>
+       <string>Start projection from selected student to tutor and hide all other screens.</string>
       </property>
      </widget>
     </item>
-    <item row="2" column="0">
-     <widget class="QLabel" name="tutor2studentIcon">
+   </layout>
+  </widget>
+  <widget class="QWidget" name="formLayoutWidget_4">
+   <property name="geometry">
+    <rect>
+     <x>20</x>
+     <y>270</y>
+     <width>561</width>
+     <height>61</height>
+    </rect>
+   </property>
+   <layout class="QFormLayout" name="Student2Tutor">
+    <property name="formAlignment">
+     <set>Qt::AlignCenter</set>
+    </property>
+    <item row="0" column="0">
+     <widget class="QLabel" name="student2tutorIcon">
+      <property name="minimumSize">
+       <size>
+        <width>53</width>
+        <height>54</height>
+       </size>
+      </property>
       <property name="maximumSize">
        <size>
         <width>53</width>
@@ -96,28 +154,49 @@
        </size>
       </property>
       <property name="frameShape">
-       <enum>QFrame::Box</enum>
+       <enum>QFrame::NoFrame</enum>
       </property>
       <property name="text">
        <string/>
       </property>
       <property name="pixmap">
-       <pixmap resource="../../pvsmgr.qrc">:/tutor2student</pixmap>
+       <pixmap resource="../../pvsmgr.qrc">:/student2tutor</pixmap>
       </property>
       <property name="scaledContents">
        <bool>true</bool>
       </property>
      </widget>
     </item>
-    <item row="2" column="1">
-     <widget class="QLabel" name="tutor2student">
+    <item row="0" column="1">
+     <widget class="QLabel" name="student2tutor">
       <property name="text">
-       <string>Start projection from tutor to selected student.</string>
+       <string>Start projection from selected student to tutor.</string>
       </property>
      </widget>
     </item>
-    <item row="3" column="0">
-     <widget class="QLabel" name="student2tutorIcon">
+   </layout>
+  </widget>
+  <widget class="QWidget" name="formLayoutWidget_5">
+   <property name="geometry">
+    <rect>
+     <x>19</x>
+     <y>190</y>
+     <width>561</width>
+     <height>61</height>
+    </rect>
+   </property>
+   <layout class="QFormLayout" name="Tutor2Student">
+    <property name="formAlignment">
+     <set>Qt::AlignCenter</set>
+    </property>
+    <item row="0" column="0">
+     <widget class="QLabel" name="tutor2studentIcon">
+      <property name="minimumSize">
+       <size>
+        <width>53</width>
+        <height>54</height>
+       </size>
+      </property>
       <property name="maximumSize">
        <size>
         <width>53</width>
@@ -125,82 +204,166 @@
        </size>
       </property>
       <property name="frameShape">
-       <enum>QFrame::Box</enum>
+       <enum>QFrame::NoFrame</enum>
       </property>
       <property name="text">
        <string/>
       </property>
       <property name="pixmap">
-       <pixmap resource="../../pvsmgr.qrc">:/student2tutor</pixmap>
+       <pixmap resource="../../pvsmgr.qrc">:/tutor2student</pixmap>
       </property>
       <property name="scaledContents">
        <bool>true</bool>
       </property>
      </widget>
     </item>
-    <item row="3" column="1">
-     <widget class="QLabel" name="student2tutor">
+    <item row="0" column="1">
+     <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>
      </widget>
     </item>
-    <item row="4" column="0">
-     <widget class="QLabel" name="student2tutor_exclIcon">
+   </layout>
+  </widget>
+  <widget class="QWidget" name="formLayoutWidget_6">
+   <property name="geometry">
+    <rect>
+     <x>20</x>
+     <y>110</y>
+     <width>561</width>
+     <height>61</height>
+    </rect>
+   </property>
+   <layout class="QFormLayout" name="Tutor2All">
+    <property name="formAlignment">
+     <set>Qt::AlignCenter</set>
+    </property>
+    <item row="0" column="0">
+     <widget class="QLabel" name="tutor2allIcon">
+      <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="autoFillBackground">
+       <bool>false</bool>
+      </property>
       <property name="frameShape">
-       <enum>QFrame::Box</enum>
+       <enum>QFrame::NoFrame</enum>
       </property>
       <property name="text">
        <string/>
       </property>
       <property name="pixmap">
-       <pixmap resource="../../pvsmgr.qrc">:/student2tutorextension</pixmap>
+       <pixmap resource="../../pvsmgr.qrc">:/tutor2all</pixmap>
       </property>
       <property name="scaledContents">
        <bool>true</bool>
       </property>
      </widget>
     </item>
-    <item row="4" column="1">
-     <widget class="QLabel" name="student2tutor_exclusive">
+    <item row="0" column="1">
+     <widget class="QLabel" name="tutor2all">
       <property name="text">
-       <string>Start projection from selected student to tutor and hide all other screens.</string>
+       <string>Start projection from tutor to all connected students.</string>
       </property>
      </widget>
     </item>
-    <item row="5" column="0">
-     <widget class="QLabel" name="resetIcon">
+   </layout>
+  </widget>
+  <widget class="QWidget" name="formLayoutWidget_7">
+   <property name="geometry">
+    <rect>
+     <x>20</x>
+     <y>30</y>
+     <width>561</width>
+     <height>69</height>
+    </rect>
+   </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>
+    <item row="0" column="0">
+     <widget class="QLabel" name="lockScreenIcon">
+      <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::Box</enum>
+       <enum>QFrame::NoFrame</enum>
       </property>
       <property name="text">
        <string/>
       </property>
       <property name="pixmap">
-       <pixmap resource="../../pvsmgr.qrc">:/reset</pixmap>
+       <pixmap resource="../../pvsmgr.qrc">:/lock</pixmap>
       </property>
       <property name="scaledContents">
        <bool>true</bool>
       </property>
      </widget>
     </item>
-    <item row="5" column="1">
-     <widget class="QLabel" name="reset">
+    <item row="0" column="1">
+     <widget class="QLabel" name="lockScreen">
       <property name="text">
-       <string>Stop running projections.</string>
+       <string>Lock all connected students screens.</string>
       </property>
      </widget>
     </item>
-    <item row="6" column="0">
+   </layout>
+  </widget>
+  <widget class="QWidget" name="formLayoutWidget_2">
+   <property name="geometry">
+    <rect>
+     <x>20</x>
+     <y>510</y>
+     <width>561</width>
+     <height>61</height>
+    </rect>
+   </property>
+   <layout class="QFormLayout" name="SetTutor">
+    <property name="formAlignment">
+     <set>Qt::AlignCenter</set>
+    </property>
+    <item row="0" column="0">
      <widget class="QLabel" name="setTutorIcon">
+      <property name="minimumSize">
+       <size>
+        <width>54</width>
+        <height>53</height>
+       </size>
+      </property>
+      <property name="maximumSize">
+       <size>
+        <width>53</width>
+        <height>54</height>
+       </size>
+      </property>
       <property name="frameShape">
-       <enum>QFrame::Box</enum>
+       <enum>QFrame::NoFrame</enum>
       </property>
       <property name="text">
        <string/>
@@ -213,7 +376,7 @@
       </property>
      </widget>
     </item>
-    <item row="6" column="1">
+    <item row="0" column="1">
      <widget class="QLabel" name="setTutor">
       <property name="text">
        <string>Set selected client to tutor.</string>
@@ -222,19 +385,6 @@
     </item>
    </layout>
   </widget>
-  <widget class="QPushButton" name="pushButton">
-   <property name="geometry">
-    <rect>
-     <x>240</x>
-     <y>440</y>
-     <width>121</width>
-     <height>31</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>Cancel</string>
-   </property>
-  </widget>
  </widget>
  <resources>
   <include location="../../pvsmgr.qrc"/>