diff options
| author | Christian Klinger | 2016-04-29 10:38:42 +0200 |
|---|---|---|
| committer | Christian Klinger | 2016-04-29 10:38:42 +0200 |
| commit | c14e1a8a49083f2468477efe5758864ae6aebcaa (patch) | |
| tree | 34e2510e044b9ab4daa07639cb91cf80e81defc6 | |
| parent | lock/unlocking of context-sensitive buttons. (diff) | |
| download | pvs2-c14e1a8a49083f2468477efe5758864ae6aebcaa.tar.gz pvs2-c14e1a8a49083f2468477efe5758864ae6aebcaa.tar.xz pvs2-c14e1a8a49083f2468477efe5758864ae6aebcaa.zip | |
Rearranged buttons a little.
| -rw-r--r-- | gui/server_normal/mainwindow.ui | 19 | ||||
| -rw-r--r-- | src/server/mainwindow/mainwindow.cpp | 3 |
2 files changed, 7 insertions, 15 deletions
diff --git a/gui/server_normal/mainwindow.ui b/gui/server_normal/mainwindow.ui index 903c6e7..418a63f 100644 --- a/gui/server_normal/mainwindow.ui +++ b/gui/server_normal/mainwindow.ui @@ -18,16 +18,7 @@ <property name="spacing"> <number>0</number> </property> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>0</number> - </property> - <property name="rightMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> + <property name="margin"> <number>0</number> </property> <item> @@ -77,7 +68,8 @@ <attribute name="toolBarBreak"> <bool>false</bool> </attribute> - <addaction name="action_Exit"/> + <addaction name="separator"/> + <addaction name="actionReload_Room_Configuration"/> <addaction name="separator"/> <addaction name="action_Lock"/> <addaction name="separator"/> @@ -89,16 +81,15 @@ <addaction name="separator"/> <addaction name="action_StudentToTutorExclusive"/> <addaction name="separator"/> - <addaction name="action_StopProjection"/> - <addaction name="separator"/> <addaction name="action_SetAsTutor"/> <addaction name="separator"/> <addaction name="action_DeleteClient"/> <addaction name="separator"/> - <addaction name="actionReload_Room_Configuration"/> + <addaction name="action_StopProjection"/> <addaction name="separator"/> <addaction name="action_Help"/> <addaction name="separator"/> + <addaction name="action_Exit"/> </widget> <action name="action_Exit"> <property name="icon"> diff --git a/src/server/mainwindow/mainwindow.cpp b/src/server/mainwindow/mainwindow.cpp index 67dee8a..3becb23 100644 --- a/src/server/mainwindow/mainwindow.cpp +++ b/src/server/mainwindow/mainwindow.cpp @@ -117,7 +117,8 @@ MainWindow::MainWindow(QString ipListUrl, QWidget* parent) : << ui->action_DeleteClient << ui->action_StudentToTutor << ui->action_StudentToTutorExclusive - << ui->action_SetAsTutor; + << ui->action_SetAsTutor + << ui->action_TutorToStudent; lockContextButtons(); |