| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of git.openslx.org:pvs2 | Björn Hagemeister | 2014-06-03 | 1 | -9/+10 |
| |\ | |||||
| | * | Merge branch 'master' of git.openslx.org:pvs2 | Manuel Schneider | 2014-06-03 | 1 | -0/+13 |
| | |\ | |||||
| | * | | Lock the buttons until the new vnc server sent a reply about its state. If ↵ | Manuel Schneider | 2014-06-03 | 1 | -9/+10 |
| | | | | | | | | | | | | | this fails, unlock the buttons after a timeout of 2 seconds | ||||
| * | | | Removed _watchers List. | Björn Hagemeister | 2014-06-03 | 1 | -11/+52 |
| | |/ |/| | | | | | | | 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 | 1 | -24/+2 |
| |\| | |||||
| | * | Remove MainWindow::isValidClient. Connect slots not queued. | Manuel Schneider | 2014-06-03 | 1 | -24/+2 |
| | | | |||||
| * | | Put searching for client with specific id into method, getClientFromId(int id). | Björn Hagemeister | 2014-06-03 | 1 | -0/+13 |
| |/ | |||||
| * | Merge branch 'master' of git.openslx.org:pvs2 | Manuel Schneider | 2014-06-03 | 1 | -13/+21 |
| |\ | |||||
| | * | Removed some unnecessary qDebug comments. | Björn Hagemeister | 2014-06-02 | 1 | -3/+1 |
| | | | |||||
| | * | Merge branch 'master' of git.openslx.org:pvs2 | Björn Hagemeister | 2014-06-02 | 1 | -9/+32 |
| | |\ | | | | | | | | | | | | | Conflicts: src/server/mainwindow/mainwindow.h | ||||
| | * | | Put Check if manager is running on machine into method. | Björn Hagemeister | 2014-06-02 | 1 | -10/+20 |
| | | | | | | | | | | | | | 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 | 1 | -0/+6 |
| | |/ |/| | |||||
| * | | Uncheck lock if any action is performed. | Manuel Schneider | 2014-05-28 | 1 | -9/+29 |
| | | | |||||
| * | | Give Exclusive student to tutor correct funtion. Kill all projections on lock. | Manuel Schneider | 2014-05-28 | 1 | -1/+4 |
| |/ | |||||
| * | Merge branch 'master' of git.openslx.org:pvs2 | Björn Hagemeister | 2014-05-27 | 1 | -79/+44 |
| |\ | |||||
| | * | Manual merge | Manuel Schneider | 2014-05-27 | 1 | -12/+23 |
| | |\ | |||||
| | * | | Adjust stopProjection | Manuel Schneider | 2014-05-27 | 1 | -14/+6 |
| | | | | |||||
| | * | | Unite BC and MC. Reducing complexity | Manuel Schneider | 2014-05-27 | 1 | -49/+30 |
| | | | | |||||
| | * | | 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 | 1 | -10/+21 |
| | | | | | | | | | 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 |
| |/ | |||||
| * | Drop _isBroadcastSource. The client must not know anything about the management. | Manuel Schneider | 2014-05-27 | 1 | -2/+0 |
| | | |||||
| * | Dont emit _currentProjectionSource in signal vncClientStateChange . (not used) | Manuel Schneider | 2014-05-27 | 1 | -2/+2 |
| | | |||||
| * | Use enums for modes since not all combinations of _broadcast and _lockOthers ↵ | Manuel Schneider | 2014-05-27 | 1 | -17/+19 |
| | | | | | make sense. | ||||
| * | Drop _desiredProjectionSource. Dont send a stopVncClient if it has not been ↵ | Manuel Schneider | 2014-05-27 | 1 | -64/+58 |
| | | | | | started before. | ||||
| * | Replace states by two flags indicating the state | Manuel Schneider | 2014-05-26 | 1 | -14/+9 |
| | | |||||
| * | Refactor unicast to multicast | Manuel Schneider | 2014-05-26 | 1 | -4/+4 |
| | | |||||
| * | Make tutor check implicit in lock screen | Manuel Schneider | 2014-05-26 | 1 | -1/+1 |
| | | |||||
| * | Several changes: | Björn Hagemeister | 2014-05-26 | 1 | -3/+16 |
| | | | | | | | 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 | 1 | -26/+42 |
| | | |||||
| * | Refactor ambigious projectionsSoure to BroadcastSource | Manuel Schneider | 2014-05-22 | 1 | -8/+8 |
| | | |||||
| * | Fix mitstake in rewrite 58646932664b6ab9014a410dc75dd443fb4f58b9 | Manuel Schneider | 2014-05-22 | 1 | -1/+1 |
| | | |||||
| * | Make vnc credentials completely private to client. Make VNCConnect work ↵ | Manuel Schneider | 2014-05-20 | 1 | -9/+9 |
| | | | | | client-internally only. Drop Client::computerID() (equivalent to Client::ip() XD ) | ||||
| * | Remove any knowledge of Networkmesage in Mainwindow | Manuel Schneider | 2014-05-20 | 1 | -45/+16 |
| | | |||||
| * | Merge branch 'master' of git.openslx.org:pvs2 | Manuel Schneider | 2014-05-20 | 1 | -0/+1 |
| |\ | |||||
| | * | Simple changes in Layout of Help Window. | Björn Hagemeister | 2014-05-20 | 1 | -0/+1 |
| | | | |||||
| * | | Reduce code | Manuel Schneider | 2014-05-20 | 1 | -38/+13 |
| | | | | | | | | | | | * Reduce code of prepareForProjection (broadcast part) * Make toolbar icons 48x48 px (were too large for standard windowsize) | ||||
| * | | Merge unicast implemetations into one. | Manuel Schneider | 2014-05-20 | 1 | -47/+9 |
| | | | |||||
| * | | Reduce codebase | Manuel Schneider | 2014-05-20 | 1 | -96/+14 |
| |/ | | | | | | * Drop Prepare MainWindow::prepareForProjection * Drop redundant code in prepareForProjection (now unicast) * Adjust comments | ||||
| * | Merge branch 'master' of git.openslx.org:pvs2 | Björn Hagemeister | 2014-05-19 | 1 | -66/+13 |
| |\ | |||||
| | * | Make toolbar static on left side | Manuel Schneider | 2014-05-16 | 1 | -66/+13 |
| | | | | | | | | | | | | | | | * Redudce unnecessary codebase by dropping curious nested timerId & timerTimeout * Use the resizeEvent properly * Make size of buttons static * Drop unnecesary ui properties | ||||
| * | | Help window | Björn Hagemeister | 2014-05-19 | 1 | -0/+11 |
| |/ | |||||
| * | Several changes: | Manuel Schneider | 2014-05-16 | 1 | -131/+218 |
| | | | | | | | | | | | * Change the messagebox text * Add button stub for exclusiveStudentToTutor * Split prepareProjection in broacast, unicast and exclusiveunicast (stub) * Make multiple used, hardcoded strings static const member of mainwindow * Replace multiple loops asking for selection and tutor by membervariable * references to the connectionframe of the latter * Complete missing error messages | ||||
| * | Fix segmentation fault after looking all screens and there is one client ↵ | Björn Hagemeister | 2014-05-13 | 1 | -1/+1 |
| | | | | | disconnected. | ||||
| * | Configured not locking the screen, if manager and client working on same ↵ | Björn Hagemeister | 2014-05-12 | 1 | -55/+51 |
| | | | | | | | machine. Plus changing symbol for tutor2all button. | ||||
| * | Fixed curious text in warnings | Manuel Schneider | 2014-05-05 | 1 | -1/+1 |
| | | |||||
| * | KISS'n'DRY for more cohesion | Manuel Schneider | 2014-04-30 | 1 | -26/+16 |
| | | |||||
 |
index : pvs2.git | |
| Pool Video Switch Version 2 | OpenSLX |
| summaryrefslogtreecommitdiffstats |