| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Remove dead button action. | Manuel Schneider | 2014-07-22 | 1 | -39/+0![]() |
| | | |||||
| * | Merge branch 'master' of git.openslx.org:pvs2 | Manuel Schneider | 2014-07-21 | 1 | -2/+55 |
| |\ | |||||
| | * | Tried to implement the fixed room settings, but is not working correctly ↵ | Björn Hagemeister | 2014-07-21 | 1 | -2/+55 |
| | | | | | | | | | | | | | | | | | right now. Problem is, the frames do not appear at setted position because of placeFrameInFreeCell() - call. Also, after updateSessionName(), all frames and clients are currently deleted if SessionName want to be setted manually. | ||||
| * | | Correct indenting by tabs | Manuel Schneider | 2014-07-21 | 1 | -173/+173 |
| | | | |||||
| * | | Finally implemented one click projectionsource change | Manuel Schneider | 2014-07-21 | 1 | -18/+29 |
| | | | | | | | | | Prevent the new projectionsource from beeing killed by stop clients wrt the connections | ||||
| * | | Rename modes. Move code in slots to avoid unnecessary branching. Give the ↵ | Manuel Schneider | 2014-07-21 | 1 | -74/+153 |
| |/ | | | | client more information about past progjectionSource | ||||
| * | NEW feature: Possible to delete offline client by drag and drop to trash, ↵ | Björn Hagemeister | 2014-06-19 | 1 | -3/+44 |
| | | | | | which is positioned in the right bottom corner of manager. | ||||
| * | Delete connected clients and connectionFrames after sessionName has changed. | Björn Hagemeister | 2014-06-17 | 1 | -1/+10 |
| | | | | | Surround camera and eye icon with borderline for better contrast on frames. | ||||
| * | Moved method isManagerMachine() from MainWindow to Client. | Björn Hagemeister | 2014-06-17 | 1 | -20/+2![]() |
| | | | | | isManagerMachine() is now called just once directly in lockScreen(). | ||||
| * | Removed _tutorFrame and _selectedFrame out of MainWindow to prevent possible ↵ | Björn Hagemeister | 2014-06-17 | 1 | -43/+84 |
| | | | | | | | | SegFaults because of too many Pointers to ConnectionFrames. Wrote to getters getTutorFrame() and getSelectedFrame(), which are just iterating over ConnectionFrames and looking for flags _isTutor and _isSelected. | ||||
| * | Fixed SegFauls by setting _streamingSource to integer and just using the ↵ | Björn Hagemeister | 2014-06-05 | 1 | -30/+44 |
| | | | | | clients id, instead of real pointers. | ||||
| * | 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 |
| | | | |||||

