diff options
| author | Manuel Schneider | 2014-07-09 17:33:53 +0200 |
|---|---|---|
| committer | Manuel Schneider | 2014-07-09 17:33:53 +0200 |
| commit | f93d51b8f880aeeb830fd94f60b45488a974c7cb (patch) | |
| tree | 631ff07d1e7c04e378d1d696303b43ce8abaebc9 /src/server/mainwindow/mainwindow.h | |
| parent | Remove non-existant files from CMakeLists (diff) | |
| parent | NEW feature: Possible to delete offline client by drag and drop to trash, whi... (diff) | |
| download | pvs2-f93d51b8f880aeeb830fd94f60b45488a974c7cb.tar.gz pvs2-f93d51b8f880aeeb830fd94f60b45488a974c7cb.tar.xz pvs2-f93d51b8f880aeeb830fd94f60b45488a974c7cb.zip | |
Merge branch 'master' of git.openslx.org:pvs2
Diffstat (limited to 'src/server/mainwindow/mainwindow.h')
| -rw-r--r-- | src/server/mainwindow/mainwindow.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/server/mainwindow/mainwindow.h b/src/server/mainwindow/mainwindow.h index fffa49a..524a0b1 100644 --- a/src/server/mainwindow/mainwindow.h +++ b/src/server/mainwindow/mainwindow.h @@ -39,7 +39,6 @@ private: int _tbIconSize; Qt::ToolBarArea _tbArea; int _tileWidth, _tileHeight; - ConnectionFrame *_tutorFrame, *_selectedFrame; static const int _tilesX = 9; static const int _tilesY = 7; @@ -54,7 +53,7 @@ private: Multicast, LockedMulticast } _mode; - Client * _streamingSource; + int _streamingSource; QMap<int, Client*> _watchers; QList<ConnectionFrame*> _clientFrames; @@ -70,6 +69,8 @@ private: static const QString sStrDestNdef; static const QString sStrDestOffline; static const QString sStrSourceDestSame; + static const QString sStrClientOnline; + static const QString sStrNoDestAv; void placeFrameInFreeSlot(ConnectionFrame* frame); ConnectionFrame* createFrame(); @@ -77,7 +78,6 @@ private: void savePosition(ConnectionFrame *cf); void changeProjection(Client *from, Mode mode = Mode::Broadcast, Client *to = NULL); void tellClientCurrentSituation(Client* client); - bool isManagerMachine(Client* client); void reset(); void closeEvent(QCloseEvent *e); @@ -86,6 +86,8 @@ private: void mouseReleaseEvent(QMouseEvent* e); Client* getClientFromId(int id); + ConnectionFrame* getTutorFrame(); + ConnectionFrame* getSelectedFrame(); protected slots: void onTutorListDownloaded(QByteArray& tutorList); |