summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
authorBjörn Hagemeister2014-08-05 15:36:12 +0200
committerBjörn Hagemeister2014-08-05 15:36:12 +0200
commit18564ae28f17b447ccd14a98743ebcb195138dae (patch)
tree5912cbd9a984fdc04b18a59a1e34748925b0a323 /gui
parentMinimal changes: some qDebugs(), changed index of for - loop. (diff)
downloadpvs2-18564ae28f17b447ccd14a98743ebcb195138dae.tar.gz
pvs2-18564ae28f17b447ccd14a98743ebcb195138dae.tar.xz
pvs2-18564ae28f17b447ccd14a98743ebcb195138dae.zip
Started including button for reloading room configuration by choosing your own room first.
Is not working right now.
Diffstat (limited to 'gui')
-rw-r--r--gui/server_normal/mainwindow.ui13
-rw-r--r--gui/server_normal/reloadroom.ui61
2 files changed, 74 insertions, 0 deletions
diff --git a/gui/server_normal/mainwindow.ui b/gui/server_normal/mainwindow.ui
index fe8ff10..fe87433 100644
--- a/gui/server_normal/mainwindow.ui
+++ b/gui/server_normal/mainwindow.ui
@@ -113,6 +113,7 @@
<addaction name="separator"/>
<addaction name="action_SetAsTutor"/>
<addaction name="separator"/>
+ <addaction name="actionReload_Room_Configuration"/>
<addaction name="action_Help"/>
</widget>
<action name="action_Exit">
@@ -221,6 +222,18 @@
<bool>true</bool>
</property>
</action>
+ <action name="actionReload_Room_Configuration">
+ <property name="icon">
+ <iconset resource="../../pvsmgr.qrc">
+ <normaloff>:/refresh</normaloff>:/refresh</iconset>
+ </property>
+ <property name="text">
+ <string>Reload Room Configuration</string>
+ </property>
+ <property name="toolTip">
+ <string>Reload Room Configuration</string>
+ </property>
+ </action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<resources>
diff --git a/gui/server_normal/reloadroom.ui b/gui/server_normal/reloadroom.ui
new file mode 100644
index 0000000..ab120a7
--- /dev/null
+++ b/gui/server_normal/reloadroom.ui
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ScrollArea</class>
+ <widget class="QScrollArea" name="ScrollArea">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>400</width>
+ <height>300</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>ScrollArea</string>
+ </property>
+ <property name="widgetResizable">
+ <bool>true</bool>
+ </property>
+ <widget class="QWidget" name="scrollAreaWidgetContents">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>398</width>
+ <height>298</height>
+ </rect>
+ </property>
+ <widget class="QLabel" name="label">
+ <property name="geometry">
+ <rect>
+ <x>60</x>
+ <y>10</y>
+ <width>281</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Choose room configuration to reload:</string>
+ </property>
+ </widget>
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="geometry">
+ <rect>
+ <x>210</x>
+ <y>260</y>
+ <width>181</width>
+ <height>27</height>
+ </rect>
+ </property>
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+ </property>
+ <property name="centerButtons">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>