From a63e8432881b58f0dcfb47a39efc3305335e5c15 Mon Sep 17 00:00:00 2001
From: Manuel Schneider
Date: Wed, 23 Jul 2014 14:32:45 +0200
Subject: Clean up students broadcast

---
 gui/server_normal/mainwindow.ui | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

(limited to 'gui')

diff --git a/gui/server_normal/mainwindow.ui b/gui/server_normal/mainwindow.ui
index 8ab1c05..7e4ffec 100644
--- a/gui/server_normal/mainwindow.ui
+++ b/gui/server_normal/mainwindow.ui
@@ -103,7 +103,6 @@
    <addaction name="separator"/>
    <addaction name="action_Lock"/>
    <addaction name="separator"/>
-   <addaction name="action_BroadcastScreen"/>
    <addaction name="action_TutorToAll"/>
    <addaction name="action_TutorToStudent"/>
    <addaction name="separator"/>
@@ -150,21 +149,6 @@
     <string>Ctrl+A</string>
    </property>
   </action>
-  <action name="action_BroadcastScreen">
-   <property name="icon">
-    <iconset resource="../../pvsmgr.qrc">
-     <normaloff>:/student2all</normaloff>:/student2all</iconset>
-   </property>
-   <property name="text">
-    <string>Broadcast Screen to Everyone</string>
-   </property>
-   <property name="toolTip">
-    <string>Student's Screen to Everyone</string>
-   </property>
-   <property name="visible">
-    <bool>false</bool>
-   </property>
-  </action>
   <action name="action_StudentToTutor">
    <property name="icon">
     <iconset resource="../../pvsmgr.qrc">
@@ -203,7 +187,7 @@
   </action>
   <action name="action_StopProjection">
    <property name="icon">
-    <iconset resource="../../pvsmgr.qrc">
+    <iconset resource="../../pvsclient.qrc">
      <normaloff>:/reset</normaloff>:/reset</iconset>
    </property>
    <property name="text">
@@ -240,6 +224,7 @@
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>
+  <include location="../../pvsclient.qrc"/>
   <include location="../../pvsmgr.qrc"/>
  </resources>
  <connections/>
-- 
cgit v1.2.3-55-g7522