summaryrefslogtreecommitdiffstats
path: root/src/server/mainwindow/mainwindow.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git.openslx.org:pvs2Manuel Schneider2014-07-211-2/+55
|\
| * Tried to implement the fixed room settings, but is not working correctly ↵Björn Hagemeister2014-07-211-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 tabsManuel Schneider2014-07-211-173/+173
| |
* | 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-211-74/+153
|/ | | | client more information about past progjectionSource
* NEW feature: Possible to delete offline client by drag and drop to trash, ↵Björn Hagemeister2014-06-191-3/+44
| | | | which is positioned in the right bottom corner of manager.
* Delete connected clients and connectionFrames after sessionName has changed.Björn Hagemeister2014-06-171-1/+10
| | | | Surround camera and eye icon with borderline for better contrast on frames.
* Moved method isManagerMachine() from MainWindow to Client.Björn Hagemeister2014-06-171-20/+2Star
| | | | isManagerMachine() is now called just once directly in lockScreen().
* Removed _tutorFrame and _selectedFrame out of MainWindow to prevent possible ↵Björn Hagemeister2014-06-171-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 Hagemeister2014-06-051-30/+44
| | | | clients id, instead of real pointers.
* Merge branch 'master' of git.openslx.org:pvs2Björn Hagemeister2014-06-031-9/+10
|\
| * Merge branch 'master' of git.openslx.org:pvs2Manuel Schneider2014-06-031-0/+13
| |\
| * | Lock the buttons until the new vnc server sent a reply about its state. If ↵Manuel Schneider2014-06-031-9/+10
| | | | | | | | | | | | this fails, unlock the buttons after a timeout of 2 seconds
* | | Removed _watchers List.Björn Hagemeister2014-06-031-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:pvs2Björn Hagemeister2014-06-031-24/+2Star
|\|
| * Remove MainWindow::isValidClient. Connect slots not queued.Manuel Schneider2014-06-031-24/+2Star
| |
* | Put searching for client with specific id into method, getClientFromId(int id).Björn Hagemeister2014-06-031-0/+13
|/
* Merge branch 'master' of git.openslx.org:pvs2Manuel Schneider2014-06-031-13/+21
|\
| * Removed some unnecessary qDebug comments.Björn Hagemeister2014-06-021-3/+1Star
| |
| * Merge branch 'master' of git.openslx.org:pvs2Björn Hagemeister2014-06-021-9/+32
| |\ | | | | | | | | | | | | Conflicts: src/server/mainwindow/mainwindow.h
| * | Put Check if manager is running on machine into method.Björn Hagemeister2014-06-021-10/+20
| | | | | | | | | | | | If student2tutor_exclusive is running, the manager running machine is not locked now.
* | | Remove client list from listenServer. Check maxClients in MainwindowManuel Schneider2014-06-031-0/+6
| |/ |/|
* | Uncheck lock if any action is performed.Manuel Schneider2014-05-281-9/+29
| |
* | Give Exclusive student to tutor correct funtion. Kill all projections on lock.Manuel Schneider2014-05-281-1/+4
|/
* Merge branch 'master' of git.openslx.org:pvs2Björn Hagemeister2014-05-271-79/+44Star
|\
| * Manual mergeManuel Schneider2014-05-271-12/+23
| |\
| * | Adjust stopProjectionManuel Schneider2014-05-271-14/+6Star
| | |
| * | Unite BC and MC. Reducing complexityManuel Schneider2014-05-271-49/+30Star
| | |
| * | 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-271-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 Hagemeister2014-05-271-11/+4Star
|/
* Drop _isBroadcastSource. The client must not know anything about the management.Manuel Schneider2014-05-271-2/+0Star
|
* Dont emit _currentProjectionSource in signal vncClientStateChange . (not used)Manuel Schneider2014-05-271-2/+2
|
* Use enums for modes since not all combinations of _broadcast and _lockOthers ↵Manuel Schneider2014-05-271-17/+19
| | | | make sense.
* Drop _desiredProjectionSource. Dont send a stopVncClient if it has not been ↵Manuel Schneider2014-05-271-64/+58Star
| | | | started before.
* Replace states by two flags indicating the stateManuel Schneider2014-05-261-14/+9Star
|
* Refactor unicast to multicastManuel Schneider2014-05-261-4/+4
|
* Make tutor check implicit in lock screenManuel Schneider2014-05-261-1/+1
|
* Several changes:Björn Hagemeister2014-05-261-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 Schneider2014-05-221-26/+42
|
* Refactor ambigious projectionsSoure to BroadcastSourceManuel Schneider2014-05-221-8/+8
|
* Fix mitstake in rewrite 58646932664b6ab9014a410dc75dd443fb4f58b9Manuel Schneider2014-05-221-1/+1
|
* Make vnc credentials completely private to client. Make VNCConnect work ↵Manuel Schneider2014-05-201-9/+9
| | | | client-internally only. Drop Client::computerID() (equivalent to Client::ip() XD )
* Remove any knowledge of Networkmesage in MainwindowManuel Schneider2014-05-201-45/+16Star
|
* Merge branch 'master' of git.openslx.org:pvs2Manuel Schneider2014-05-201-0/+1
|\
| * Simple changes in Layout of Help Window.Björn Hagemeister2014-05-201-0/+1
| |
* | Reduce codeManuel Schneider2014-05-201-38/+13Star
| | | | | | | | | | * Reduce code of prepareForProjection (broadcast part) * Make toolbar icons 48x48 px (were too large for standard windowsize)