diff options
| author | Manuel Schneider | 2014-09-03 15:40:39 +0200 |
|---|---|---|
| committer | Manuel Schneider | 2014-09-03 15:40:39 +0200 |
| commit | 6017ad54c22bcb991c832f90d2a19722198886bb (patch) | |
| tree | 384bbf35357aba506d2bae131abc4747b8c30af0 /gui | |
| parent | Change system settings path. Change name of config file (diff) | |
| parent | Added german translations for client. (diff) | |
| download | pvs2-6017ad54c22bcb991c832f90d2a19722198886bb.tar.gz pvs2-6017ad54c22bcb991c832f90d2a19722198886bb.tar.xz pvs2-6017ad54c22bcb991c832f90d2a19722198886bb.zip | |
Merge branch 'master' of git.openslx.org:pvs2
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/server_normal/mainwindow.ui | 13 | ||||
| -rw-r--r-- | gui/server_normal/reloadroom.ui | 86 |
2 files changed, 99 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..2013ed9 --- /dev/null +++ b/gui/server_normal/reloadroom.ui @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>ReloadRoom</class> + <widget class="QDialog" name="ReloadRoom"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>400</width> + <height>300</height> + </rect> + </property> + <property name="windowTitle"> + <string>Reload Room</string> + </property> + <property name="widgetResizable" stdset="0"> + <bool>true</bool> + </property> + <widget class="QWidget" name="scrollAreaWidgetContents" native="true"> + <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 class="QListWidget" name="roomList"> + <property name="geometry"> + <rect> + <x>70</x> + <y>50</y> + <width>256</width> + <height>192</height> + </rect> + </property> + <property name="font"> + <font> + <pointsize>20</pointsize> + <stylestrategy>PreferDefault</stylestrategy> + </font> + </property> + <property name="contextMenuPolicy"> + <enum>Qt::DefaultContextMenu</enum> + </property> + <property name="layoutDirection"> + <enum>Qt::LeftToRight</enum> + </property> + <property name="resizeMode"> + <enum>QListView::Adjust</enum> + </property> + </widget> + </widget> + </widget> + <resources/> + <connections/> +</ui> |