diff options
| author | Simon Rettberg | 2014-04-16 19:19:50 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2014-04-16 19:19:50 +0200 |
| commit | fc74ee225c6d0c85aa990e20c07b51aca5098c5b (patch) | |
| tree | cbddf7f053b018a00a1eeb9480971de3424bc29f /src/server/mainwindow/mainwindow.h | |
| parent | Don't recreate/clean language files on every run, only when UPDATE_TRANSLATIO... (diff) | |
| parent | New feature. Download of tutor-ip-list and automated assingment. (diff) | |
| download | pvs2-fc74ee225c6d0c85aa990e20c07b51aca5098c5b.tar.gz pvs2-fc74ee225c6d0c85aa990e20c07b51aca5098c5b.tar.xz pvs2-fc74ee225c6d0c85aa990e20c07b51aca5098c5b.zip | |
Merge branch 'master'
Conflicts:
CMakeLists.txt
Diffstat (limited to 'src/server/mainwindow/mainwindow.h')
| -rw-r--r-- | src/server/mainwindow/mainwindow.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/server/mainwindow/mainwindow.h b/src/server/mainwindow/mainwindow.h index 9b6c6d3..5d0bb18 100644 --- a/src/server/mainwindow/mainwindow.h +++ b/src/server/mainwindow/mainwindow.h @@ -4,6 +4,7 @@ #include <QtGui> #include <QMainWindow> #include "../net/client.h" +#include "../net/filedownloader.h" class SessionNameWindow; class ConnectionFrame; @@ -32,6 +33,8 @@ private: ListenServer *_listenServer; DiscoveryListener *_discoveryListener; qint64 _buttonBlockTime; + FileDownloader _fileDownloader; + QStringList _tutorList; void placeFrameInFreeSlot(ConnectionFrame* frame); ConnectionFrame* createFrame(); @@ -54,6 +57,7 @@ protected: protected slots: // This + void onTutorListDownloaded(QByteArray& tutorList); void onSessionNameClick(); void onSessionNameUpdate(); void onButtonSettings(); |