diff options
| -rw-r--r-- | TODO | 12 | ||||
| -rw-r--r-- | gui/server_normal/mainwindow.ui | 19 | ||||
| -rw-r--r-- | src/server/mainwindow/mainwindow.cpp | 2 |
3 files changed, 12 insertions, 21 deletions
@@ -70,11 +70,19 @@ und zur> Session-ID-Einstellung. wenn PVS-Client auf Rechner online ist. Rechnersymbol soll schwarz werden. <sofern der Papierkorb bleiben soll. Ggfs ist die Funktion nicht nötig?> ---------------------------- V M C H O O S E R ---------------------------------- +--------------------------- V M C H O O S E R ---------------------------------- -[manuel bald, bald ... ] +[manuel] Im VMchooser (Client): -- Häkchen gesetzt, automatische Verbindung (Session-ID) -- wenn kein Häkchen gesetzt, soll dennoch manuelle Verbindung <per Session-ID> wählbar sein. <das heisst, der PVS soll in jedem Fall automatisch starten, ohne die Verbindung automatisch zu setzen> +[x] Start pvs in any case +[x] Adjust vmchooser2 to not set env + +-------------------------------------------------------------------------------- + +[ ] Test +[ ] Tests +[ ] TESTS diff --git a/gui/server_normal/mainwindow.ui b/gui/server_normal/mainwindow.ui index 8ab1c05..7e4ffec 100644 --- a/gui/server_normal/mainwindow.ui +++ b/gui/server_normal/mainwindow.ui @@ -103,7 +103,6 @@ <addaction name="separator"/> <addaction name="action_Lock"/> <addaction name="separator"/> - <addaction name="action_BroadcastScreen"/> <addaction name="action_TutorToAll"/> <addaction name="action_TutorToStudent"/> <addaction name="separator"/> @@ -150,21 +149,6 @@ <string>Ctrl+A</string> </property> </action> - <action name="action_BroadcastScreen"> - <property name="icon"> - <iconset resource="../../pvsmgr.qrc"> - <normaloff>:/student2all</normaloff>:/student2all</iconset> - </property> - <property name="text"> - <string>Broadcast Screen to Everyone</string> - </property> - <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"> <iconset resource="../../pvsmgr.qrc"> @@ -203,7 +187,7 @@ </action> <action name="action_StopProjection"> <property name="icon"> - <iconset resource="../../pvsmgr.qrc"> + <iconset resource="../../pvsclient.qrc"> <normaloff>:/reset</normaloff>:/reset</iconset> </property> <property name="text"> @@ -240,6 +224,7 @@ </widget> <layoutdefault spacing="6" margin="11"/> <resources> + <include location="../../pvsclient.qrc"/> <include location="../../pvsmgr.qrc"/> </resources> <connections/> diff --git a/src/server/mainwindow/mainwindow.cpp b/src/server/mainwindow/mainwindow.cpp index e021515..db161e6 100644 --- a/src/server/mainwindow/mainwindow.cpp +++ b/src/server/mainwindow/mainwindow.cpp @@ -92,7 +92,6 @@ MainWindow::MainWindow(QString ipListUrl, QWidget* parent) : // Close button in tool bar connect(ui->action_Exit, SIGNAL(triggered()), this, SLOT(onButtonExit())); - connect(ui->action_BroadcastScreen, SIGNAL(triggered()), this, SLOT(onButtonStudentToAll())); connect(ui->action_TutorToAll, SIGNAL(triggered()), this, SLOT(onButtonTutorToAll())); connect(ui->action_StudentToTutor, SIGNAL(triggered()), this, SLOT(onButtonStudentToTutor())); connect(ui->action_StudentToTutorExclusive, SIGNAL(triggered()), this, SLOT(onButtonStudentToTutorExclusive())); @@ -146,7 +145,6 @@ MainWindow::MainWindow(QString ipListUrl, QWidget* parent) : // Define the locking buttons _lockingButtons << ui->action_Lock - << ui->action_BroadcastScreen << ui->action_TutorToAll << ui->action_StudentToTutor << ui->action_TutorToStudent |