summaryrefslogtreecommitdiffstats
path: root/src/server
Commit message (Collapse)AuthorAgeFilesLines
* Fix oneclick-source-change-lock-bugManuel Schneider2014-07-222-35/+18Star
|
* Drop the watchers concept, since the desiredProjectionSource essentially ↵Manuel Schneider2014-07-223-36/+25Star
| | | | implies it
* Bugfix: One click source change now fully supportedManuel Schneider2014-07-222-77/+67Star
| | | | | | | Since the async nature of this protocol introduces race conditions when changing the source of the projection, the possiblity that two servers exist at a moment is still there. Even though we thought we do not support multiple sources. This is the reason why _desiredProjectionSource is needed after all.
* Remove dead button action.Manuel Schneider2014-07-222-40/+0Star
|
* Merge branch 'master' of git.openslx.org:pvs2Manuel Schneider2014-07-213-2/+61
|\
| * Tried to implement the fixed room settings, but is not working correctly ↵Björn Hagemeister2014-07-213-2/+61
| | | | | | | | | | | | | | | | 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 tabsManuel Schneider2014-07-2110-219/+219
| |
* | Finally implemented one click projectionsource changeManuel Schneider2014-07-211-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 Schneider2014-07-214-83/+167
|/ | | | client more information about past progjectionSource
* NEW feature: Possible to delete offline client by drag and drop to trash, ↵Björn Hagemeister2014-06-193-3/+47
| | | | which is positioned in the right bottom corner of manager.
* Delete connected clients and connectionFrames after sessionName has changed.Björn Hagemeister2014-06-172-2/+15
| | | | Surround camera and eye icon with borderline for better contrast on frames.
* Moved method isManagerMachine() from MainWindow to Client.Björn Hagemeister2014-06-174-22/+20Star
| | | | isManagerMachine() is now called just once directly in lockScreen().
* Removed _tutorFrame and _selectedFrame out of MainWindow to prevent possible ↵Björn Hagemeister2014-06-174-52/+94
| | | | | | | 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 Hagemeister2014-06-052-31/+45
| | | | clients id, instead of real pointers.
* Merge branch 'master' of git.openslx.org:pvs2Björn Hagemeister2014-06-032-10/+11
|\
| * Merge branch 'master' of git.openslx.org:pvs2Manuel Schneider2014-06-032-0/+15
| |\
| * | Lock the buttons until the new vnc server sent a reply about its state. If ↵Manuel Schneider2014-06-032-10/+11
| | | | | | | | | | | | this fails, unlock the buttons after a timeout of 2 seconds
* | | Removed _watchers List.Björn Hagemeister2014-06-032-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:pvs2Björn Hagemeister2014-06-032-25/+2Star
|\|
| * Remove MainWindow::isValidClient. Connect slots not queued.Manuel Schneider2014-06-032-25/+2Star
| |
* | Put searching for client with specific id into method, getClientFromId(int id).Björn Hagemeister2014-06-032-0/+15
|/
* Merge branch 'master' of git.openslx.org:pvs2Manuel Schneider2014-06-034-16/+22
|\
| * Removed some unnecessary qDebug comments.Björn Hagemeister2014-06-024-6/+1Star
| |
| * Merge branch 'master' of git.openslx.org:pvs2Björn Hagemeister2014-06-024-34/+67
| |\ | | | | | | | | | | | | Conflicts: src/server/mainwindow/mainwindow.h
| * | Put Check if manager is running on machine into method.Björn Hagemeister2014-06-022-10/+21
| | | | | | | | | | | | If student2tutor_exclusive is running, the manager running machine is not locked now.
* | | Remove client list from listenServer. Check maxClients in MainwindowManuel Schneider2014-06-033-10/+6Star
| |/ |/|
* | Uncheck lock if any action is performed.Manuel Schneider2014-05-282-9/+30
| |
* | Give Exclusive student to tutor correct funtion. Kill all projections on lock.Manuel Schneider2014-05-281-1/+4
| |
* | Increase timeout for debuggingManuel Schneider2014-05-281-2/+2
| |
* | Remove TODO. User get visual feedback via cam icon.Manuel Schneider2014-05-271-1/+0Star
| |
* | Add several documentation stubs. Remove autogenreated TODOManuel Schneider2014-05-271-22/+32
|/
* Merge branch 'master' of git.openslx.org:pvs2Björn Hagemeister2014-05-272-83/+46Star
|\
| * Manual mergeManuel Schneider2014-05-272-12/+24
| |\
| * | Adjust stopProjectionManuel Schneider2014-05-271-14/+6Star
| | |
| * | Unite BC and MC. Reducing complexityManuel Schneider2014-05-272-53/+32Star
| | |
| * | Make it possible to exclude a client from multicast.Manuel Schneider2014-05-271-10/+12
| | |
| * | Lock is already handled in onVncServerStateChange.Manuel Schneider2014-05-271-8/+0Star
| | |
| * | Mainwindow takes full control over management. No need for abritrary polls.Manuel Schneider2014-05-271-9/+0Star
| | |
* | | Enable, to set locked client to tutor and unlock selected one afterwards.Björn Hagemeister2014-05-271-4/+14
| |/ |/|
* | Put the clients adaption to current class room situation into method.Björn Hagemeister2014-05-272-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 Hagemeister2014-05-271-11/+4Star
|/
* Add icon for locked screen. Add monochrome and stylized connectionframe icons.Manuel Schneider2014-05-274-6/+15
|
* Drop _isBroadcastSource. The client must not know anything about the management.Manuel Schneider2014-05-273-6/+0Star
|
* Change _currentProjectionSource before emit. Fixes Appearance bug.Manuel Schneider2014-05-271-2/+2
|
* Dont emit _currentProjectionSource in signal vncClientStateChange . (not used)Manuel Schneider2014-05-275-7/+7
|
* Use enums for modes since not all combinations of _broadcast and _lockOthers ↵Manuel Schneider2014-05-272-19/+25
| | | | make sense.
* Drop unused _state. Introduce member _locked to avoid unnecessary messages.Manuel Schneider2014-05-272-14/+4Star
|
* Drop _activeVncClient. _currentProjectionSource holds this information.Manuel Schneider2014-05-272-10/+5Star
|
* Drop _desiredProjectionSource. Dont send a stopVncClient if it has not been ↵Manuel Schneider2014-05-274-87/+70Star
| | | | started before.
* Replace states by two flags indicating the stateManuel Schneider2014-05-262-22/+11Star
|