summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
authorManuel Schneider2014-05-16 00:44:00 +0200
committerManuel Schneider2014-05-16 00:44:00 +0200
commit20a40ae90f6c0e4cac0345c57ac54f1bd671f633 (patch)
treef309be1cfe221d7e9fd8ecf2f5a7afaaad348576 /gui
parentFix segmentation fault after looking all screens and there is one client disc... (diff)
downloadpvs2-20a40ae90f6c0e4cac0345c57ac54f1bd671f633.tar.gz
pvs2-20a40ae90f6c0e4cac0345c57ac54f1bd671f633.tar.xz
pvs2-20a40ae90f6c0e4cac0345c57ac54f1bd671f633.zip
Several changes:
* Change the messagebox text * Add button stub for exclusiveStudentToTutor * Split prepareProjection in broacast, unicast and exclusiveunicast (stub) * Make multiple used, hardcoded strings static const member of mainwindow * Replace multiple loops asking for selection and tutor by membervariable * references to the connectionframe of the latter * Complete missing error messages
Diffstat (limited to 'gui')
-rw-r--r--gui/server_normal/mainwindow.ui10
1 files changed, 10 insertions, 0 deletions
diff --git a/gui/server_normal/mainwindow.ui b/gui/server_normal/mainwindow.ui
index f38747f..22e1b45 100644
--- a/gui/server_normal/mainwindow.ui
+++ b/gui/server_normal/mainwindow.ui
@@ -89,6 +89,7 @@
<addaction name="separator"/>
<addaction name="action_BroadcastScreen"/>
<addaction name="action_StudentToTutor"/>
+ <addaction name="action_StudentToTutorExclusive"/>
<addaction name="separator"/>
<addaction name="action_TutorToAll"/>
<addaction name="action_TutorToStudent"/>
@@ -152,6 +153,15 @@
<string>Student's Screen to Tutor</string>
</property>
</action>
+ <action name="action_StudentToTutorExclusive">
+ <property name="icon">
+ <iconset resource="../../pvsmgr.qrc">
+ <normaloff>:/student2tutor</normaloff>:/student2tutor</iconset>
+ </property>
+ <property name="text">
+ <string>Student's Screen to Tutor, others blanked</string>
+ </property>
+ </action>
<action name="action_TutorToStudent">
<property name="icon">
<iconset resource="../../pvsmgr.qrc">