summaryrefslogtreecommitdiffstats
path: root/gui/server_normal
diff options
context:
space:
mode:
authorManuel Schneider2014-05-19 15:15:55 +0200
committerManuel Schneider2014-05-19 15:15:55 +0200
commit8b901d972695d9188244cac8bbe5b93c73962c78 (patch)
treef34dcab535f4b7f79aedb44bc1b6a12e98ae736e /gui/server_normal
parentMake toolbar static on left side (diff)
parentChanging some icons plus adding Button "help" without implementing its function. (diff)
downloadpvs2-8b901d972695d9188244cac8bbe5b93c73962c78.tar.gz
pvs2-8b901d972695d9188244cac8bbe5b93c73962c78.tar.xz
pvs2-8b901d972695d9188244cac8bbe5b93c73962c78.zip
Merge branch 'master' of git.openslx.org:pvs2
Diffstat (limited to 'gui/server_normal')
-rw-r--r--gui/server_normal/mainwindow.ui33
1 files changed, 27 insertions, 6 deletions
diff --git a/gui/server_normal/mainwindow.ui b/gui/server_normal/mainwindow.ui
index fab8440..9bf32aa 100644
--- a/gui/server_normal/mainwindow.ui
+++ b/gui/server_normal/mainwindow.ui
@@ -82,15 +82,17 @@
<addaction name="action_Lock"/>
<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"/>
<addaction name="separator"/>
+ <addaction name="action_StudentToTutor"/>
+ <addaction name="action_StudentToTutorExclusive"/>
+ <addaction name="separator"/>
<addaction name="action_StopProjection"/>
<addaction name="separator"/>
<addaction name="action_SetAsTutor"/>
+ <addaction name="separator"/>
+ <addaction name="action_Help"/>
</widget>
<action name="action_Exit">
<property name="icon">
@@ -137,6 +139,9 @@
<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">
@@ -150,7 +155,7 @@
<action name="action_StudentToTutorExclusive">
<property name="icon">
<iconset resource="../../pvsmgr.qrc">
- <normaloff>:/student2tutor</normaloff>:/student2tutor</iconset>
+ <normaloff>:/student2tutorextension</normaloff>:/student2tutorextension</iconset>
</property>
<property name="text">
<string>Student's Screen to Tutor, others blanked</string>
@@ -176,8 +181,8 @@
</action>
<action name="action_StopProjection">
<property name="icon">
- <iconset resource="../../pvsmgr.qrc">
- <normaloff>:/stopprojection</normaloff>:/stopprojection</iconset>
+ <iconset resource="../../pvsclient.qrc">
+ <normaloff>:/reset</normaloff>:/reset</iconset>
</property>
<property name="text">
<string>Stop Projection on every Client</string>
@@ -195,9 +200,25 @@
<string>Set current Frame as Tutor</string>
</property>
</action>
+ <action name="action_Help">
+ <property name="icon">
+ <iconset resource="../../pvsmgr.qrc">
+ <normaloff>:/helpme</normaloff>:/helpme</iconset>
+ </property>
+ <property name="text">
+ <string>Help</string>
+ </property>
+ <property name="toolTip">
+ <string>Help</string>
+ </property>
+ <property name="visible">
+ <bool>true</bool>
+ </property>
+ </action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<resources>
+ <include location="../../pvsclient.qrc"/>
<include location="../../pvsmgr.qrc"/>
</resources>
<connections/>