summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
authorBjörn Hagemeister2014-05-16 16:03:53 +0200
committerBjörn Hagemeister2014-05-16 16:03:53 +0200
commit7643b0a9179464d1ee337bb1b2bda00e3a3dd99e (patch)
treedfba42616601adf3c8084d344de6fe9bbd364315 /gui
parentSeveral changes: (diff)
downloadpvs2-7643b0a9179464d1ee337bb1b2bda00e3a3dd99e.tar.gz
pvs2-7643b0a9179464d1ee337bb1b2bda00e3a3dd99e.tar.xz
pvs2-7643b0a9179464d1ee337bb1b2bda00e3a3dd99e.zip
Changing some icons plus adding Button "help" without implementing its function.
The button broadcast is just set to invisible, not deleted!
Diffstat (limited to 'gui')
-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 22e1b45..135544d 100644
--- a/gui/server_normal/mainwindow.ui
+++ b/gui/server_normal/mainwindow.ui
@@ -88,15 +88,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">
@@ -143,6 +145,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">
@@ -156,7 +161,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>
@@ -182,8 +187,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>
@@ -201,9 +206,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/>