summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
authorManuel Schneider2014-07-23 14:32:45 +0200
committerManuel Schneider2014-07-23 14:32:45 +0200
commita63e8432881b58f0dcfb47a39efc3305335e5c15 (patch)
tree216b5fe272a99b34d5d3ddd3f0418e0c45ba4c5f /gui
parentAgain fix oneclick-source-change-lock-bug. Note to myself: Never ever violate... (diff)
downloadpvs2-a63e8432881b58f0dcfb47a39efc3305335e5c15.tar.gz
pvs2-a63e8432881b58f0dcfb47a39efc3305335e5c15.tar.xz
pvs2-a63e8432881b58f0dcfb47a39efc3305335e5c15.zip
Clean up students broadcast
Diffstat (limited to 'gui')
-rw-r--r--gui/server_normal/mainwindow.ui19
1 files changed, 2 insertions, 17 deletions
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/>