| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | Merge branch 'master' of git.openslx.org:pvs2 | Björn Hagemeister | 2014-06-03 | 2 | -10/+11 | |
| |\ | ||||||
| | * | Merge branch 'master' of git.openslx.org:pvs2 | Manuel Schneider | 2014-06-03 | 2 | -0/+15 | |
| | |\ | ||||||
| | * | | Lock the buttons until the new vnc server sent a reply about its state. If ↵ | Manuel Schneider | 2014-06-03 | 2 | -10/+11 | |
| | | | | | | | | | | | | | this fails, unlock the buttons after a timeout of 2 seconds | |||||
| * | | | Removed _watchers List. | Björn Hagemeister | 2014-06-03 | 2 | -11/+55 | |
| | |/ |/| | | | | | | | Set flag in client.h _isWatcher with getter and setter, and controlling the watchers over this value. | |||||
| * | | Merge branch 'master' of git.openslx.org:pvs2 | Björn Hagemeister | 2014-06-03 | 2 | -25/+2 | |
| |\| | ||||||
| | * | Remove MainWindow::isValidClient. Connect slots not queued. | Manuel Schneider | 2014-06-03 | 2 | -25/+2 | |
| | | | ||||||
| * | | Put searching for client with specific id into method, getClientFromId(int id). | Björn Hagemeister | 2014-06-03 | 2 | -0/+15 | |
| |/ | ||||||
| * | Merge branch 'master' of git.openslx.org:pvs2 | Manuel Schneider | 2014-06-03 | 4 | -16/+22 | |
| |\ | ||||||
| | * | Removed some unnecessary qDebug comments. | Björn Hagemeister | 2014-06-02 | 4 | -6/+1 | |
| | | | ||||||
| | * | Merge branch 'master' of git.openslx.org:pvs2 | Björn Hagemeister | 2014-06-02 | 4 | -34/+67 | |
| | |\ | | | | | | | | | | | | | Conflicts: src/server/mainwindow/mainwindow.h | |||||
| | * | | Put Check if manager is running on machine into method. | Björn Hagemeister | 2014-06-02 | 2 | -10/+21 | |
| | | | | | | | | | | | | | If student2tutor_exclusive is running, the manager running machine is not locked now. | |||||
| * | | | Remove client list from listenServer. Check maxClients in Mainwindow | Manuel Schneider | 2014-06-03 | 3 | -10/+6 | |
| | |/ |/| | ||||||
| * | | Uncheck lock if any action is performed. | Manuel Schneider | 2014-05-28 | 2 | -9/+30 | |
| | | | ||||||
| * | | Give Exclusive student to tutor correct funtion. Kill all projections on lock. | Manuel Schneider | 2014-05-28 | 1 | -1/+4 | |
| | | | ||||||
| * | | Increase timeout for debugging | Manuel Schneider | 2014-05-28 | 1 | -2/+2 | |
| | | | ||||||
| * | | Remove TODO. User get visual feedback via cam icon. | Manuel Schneider | 2014-05-27 | 1 | -1/+0 | |
| | | | ||||||
| * | | Add several documentation stubs. Remove autogenreated TODO | Manuel Schneider | 2014-05-27 | 1 | -22/+32 | |
| |/ | ||||||
| * | Merge branch 'master' of git.openslx.org:pvs2 | Björn Hagemeister | 2014-05-27 | 2 | -83/+46 | |
| |\ | ||||||
| | * | Manual merge | Manuel Schneider | 2014-05-27 | 2 | -12/+24 | |
| | |\ | ||||||
| | * | | Adjust stopProjection | Manuel Schneider | 2014-05-27 | 1 | -14/+6 | |
| | | | | ||||||
| | * | | Unite BC and MC. Reducing complexity | Manuel Schneider | 2014-05-27 | 2 | -53/+32 | |
| | | | | ||||||
| | * | | Make it possible to exclude a client from multicast. | Manuel Schneider | 2014-05-27 | 1 | -10/+12 | |
| | | | | ||||||
| | * | | Lock is already handled in onVncServerStateChange. | Manuel Schneider | 2014-05-27 | 1 | -8/+0 | |
| | | | | ||||||
| | * | | Mainwindow takes full control over management. No need for abritrary polls. | Manuel Schneider | 2014-05-27 | 1 | -9/+0 | |
| | | | | ||||||
| * | | | Enable, to set locked client to tutor and unlock selected one afterwards. | Björn Hagemeister | 2014-05-27 | 1 | -4/+14 | |
| | |/ |/| | ||||||
| * | | Put the clients adaption to current class room situation into method. | Björn Hagemeister | 2014-05-27 | 2 | -10/+22 | |
| | | | | | | | | | Now clients who where just inactive also follow immediatly the actual actions. | |||||
| * | | By pushing reset button, also unlock all currently locked screens. | Björn Hagemeister | 2014-05-27 | 1 | -11/+4 | |
| |/ | ||||||
| * | Add icon for locked screen. Add monochrome and stylized connectionframe icons. | Manuel Schneider | 2014-05-27 | 4 | -6/+15 | |
| | | ||||||
| * | Drop _isBroadcastSource. The client must not know anything about the management. | Manuel Schneider | 2014-05-27 | 3 | -6/+0 | |
| | | ||||||
| * | Change _currentProjectionSource before emit. Fixes Appearance bug. | Manuel Schneider | 2014-05-27 | 1 | -2/+2 | |
| | | ||||||
| * | Dont emit _currentProjectionSource in signal vncClientStateChange . (not used) | Manuel Schneider | 2014-05-27 | 5 | -7/+7 | |
| | | ||||||
| * | Use enums for modes since not all combinations of _broadcast and _lockOthers ↵ | Manuel Schneider | 2014-05-27 | 2 | -19/+25 | |
| | | | | | make sense. | |||||
| * | Drop unused _state. Introduce member _locked to avoid unnecessary messages. | Manuel Schneider | 2014-05-27 | 2 | -14/+4 | |
| | | ||||||
| * | Drop _activeVncClient. _currentProjectionSource holds this information. | Manuel Schneider | 2014-05-27 | 2 | -10/+5 | |
| | | ||||||
| * | Drop _desiredProjectionSource. Dont send a stopVncClient if it has not been ↵ | Manuel Schneider | 2014-05-27 | 4 | -87/+70 | |
| | | | | | started before. | |||||
| * | Replace states by two flags indicating the state | Manuel Schneider | 2014-05-26 | 2 | -22/+11 | |
| | | ||||||
| * | Refactor unicast to multicast | Manuel Schneider | 2014-05-26 | 2 | -5/+6 | |
| | | ||||||
| * | Make tutor check implicit in lock screen | Manuel Schneider | 2014-05-26 | 2 | -1/+3 | |
| | | ||||||
| * | Remove unnecessary slots | Manuel Schneider | 2014-05-26 | 2 | -30/+5 | |
| | | ||||||
| * | Several changes: | Björn Hagemeister | 2014-05-26 | 3 | -3/+18 | |
| | | | | | | | Fixed segmentaion fault, which occured after streaming to all clients. Added sessionName as command line argument to client, so that it connects immediatly after running to given sessionName. If pvsclient shows connected status also display IP-Adress of the running pvsmanager. | |||||
| * | First approach for an exclusive unicast. T.b.c. | Manuel Schneider | 2014-05-22 | 2 | -33/+62 | |
| | | ||||||
| * | Refactor ambigious projectionsSoure to BroadcastSource | Manuel Schneider | 2014-05-22 | 4 | -14/+14 | |
| | | ||||||
| * | Fix mitstake in rewrite 58646932664b6ab9014a410dc75dd443fb4f58b9 | Manuel Schneider | 2014-05-22 | 1 | -1/+1 | |
| | | ||||||
| * | Fix segfault. Drop nullpointer polls since SslSocket is now const. [id == ↵ | Manuel Schneider | 2014-05-22 | 2 | -50/+40 | |
| | | | | | _VNCCLIENT] Logical reduction. Cleanup header. | |||||
| * | [Client] Make setTutor inline and drop the communication stuff since the ↵ | Manuel Schneider | 2014-05-21 | 2 | -21/+30 | |
| | | | | | client does not handle it. Add a state stub t.b.c. | |||||
| * | Several changes: | Manuel Schneider | 2014-05-21 | 2 | -44/+33 | |
| | | | | | | | | | * [Client] Remove unneccessary members _ip, * [Client] Remove unneccessary class forward of QSslSocket * [Client] Make member initializer list of non-const members part of ctor * [Client] Make _socket pointer const member * [Client] Drop socket-delete indirektion | |||||
| * | Fix ip bug | Manuel Schneider | 2014-05-20 | 1 | -1/+1 | |
| | | ||||||
| * | Make vnc credentials completely private to client. Make VNCConnect work ↵ | Manuel Schneider | 2014-05-20 | 4 | -27/+20 | |
| | | | | | client-internally only. Drop Client::computerID() (equivalent to Client::ip() XD ) | |||||
| * | Remvoe unneccesary membervariable _toClient and method buildErrorMessage ↵ | Manuel Schneider | 2014-05-20 | 2 | -46/+47 | |
| | | | | | (implicit cast does it as well) | |||||
| * | Remove any knowledge of Networkmesage in Mainwindow | Manuel Schneider | 2014-05-20 | 3 | -91/+74 | |
| | | ||||||
 |
index : pvs2.git | |
| Pool Video Switch Version 2 | OpenSLX |
| summaryrefslogtreecommitdiffstats |