summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* | Add several documentation stubs. Remove autogenreated TODOManuel Schneider2014-05-271-22/+48
| |
* | 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
|
* Refactor unicast to multicastManuel Schneider2014-05-262-5/+6
|
* Make tutor check implicit in lock screenManuel Schneider2014-05-262-1/+3
|
* Remove unnecessary slotsManuel Schneider2014-05-262-30/+5Star
|
* Several changes:Björn Hagemeister2014-05-269-44/+89
| | | | | | 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.
* Merge branch 'master' of git.openslx.org:pvs2Manuel Schneider2014-05-222-3/+30
|\
| * Merge branch 'master' of git.openslx.org:pvs2Björn Hagemeister2014-05-223-13/+4Star
| |\ | | | | | | | | | | | | | | | | | | | | | (Eye icon for VNC streaming) Conflicts: pvsclient.qrc src/client/toolbar/toolbar.cpp
| * | Changed the blinking red dot in toolbar while beeing vnc server to blinking eye.Björn Hagemeister2014-05-222-8/+8
| | |
* | | First approach for an exclusive unicast. T.b.c.Manuel Schneider2014-05-222-33/+62
| |/ |/|
* | Stop suggesting the user to be recorded:Manuel Schneider2014-05-222-29/+2Star
| | | | | | | | | | | | * Delete red dot camera icons * Disable camera blinking in clients toolbar (sorry bjoern) * Adjust ressource files
* | Make VNCServer::isrunning inlineManuel Schneider2014-05-222-11/+2Star
|/
* Refactor ambigious projectionsSoure to BroadcastSourceManuel Schneider2014-05-224-14/+14
|
* Fix mitstake in rewrite 58646932664b6ab9014a410dc75dd443fb4f58b9Manuel Schneider2014-05-221-1/+1
|
* Fix segfault. Drop nullpointer polls since SslSocket is now const. [id == ↵Manuel Schneider2014-05-223-52/+42Star
| | | | _VNCCLIENT] Logical reduction. Cleanup header.
* [Client] Make setTutor inline and drop the communication stuff since the ↵Manuel Schneider2014-05-212-21/+30
| | | | client does not handle it. Add a state stub t.b.c.
* Several changes:Manuel Schneider2014-05-214-46/+35Star
| | | | | | | | * [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 bugManuel Schneider2014-05-201-1/+1
|
* Make vnc credentials completely private to client. Make VNCConnect work ↵Manuel Schneider2014-05-204-27/+20Star
| | | | client-internally only. Drop Client::computerID() (equivalent to Client::ip() XD )
* Remvoe unneccesary membervariable _toClient and method buildErrorMessage ↵Manuel Schneider2014-05-204-52/+47Star
| | | | (implicit cast does it as well)
* Remove any knowledge of Networkmesage in MainwindowManuel Schneider2014-05-203-91/+74Star
|
* 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)
* | Merge unicast implemetations into one.Manuel Schneider2014-05-202-49/+10Star
| |
* | Reduce codebaseManuel Schneider2014-05-203-101/+16Star
|/ | | | | | * Drop Prepare MainWindow::prepareForProjection * Drop redundant code in prepareForProjection (now unicast) * Adjust comments
* Merge branch 'master' of git.openslx.org:pvs2Björn Hagemeister2014-05-192-68/+13Star
|\
| * Make toolbar static on left sideManuel Schneider2014-05-162-68/+13Star
| | | | | | | | | | | | | | * Redudce unnecessary codebase by dropping curious nested timerId & timerTimeout * Use the resizeEvent properly * Make size of buttons static * Drop unnecesary ui properties
* | Help windowBjörn Hagemeister2014-05-194-0/+71
|/
* Several changes:Manuel Schneider2014-05-162-167/+255
| | | | | | | | | | * 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 Hagemeister2014-05-131-1/+1
| | | | disconnected.