diff options
| author | Simon Rettberg | 2016-10-26 18:31:21 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2016-10-26 18:31:21 +0200 |
| commit | e19dcdfed2da5405c714bc0af56927fa8e4c2442 (patch) | |
| tree | f50f9223c03c2af4e5e3b72b7d69618e0148220a /src/client/clientapp/clientapp.cpp | |
| parent | Fix GUI translation: Don't create persistent objects on stack :/ (diff) | |
| download | pvs2-e19dcdfed2da5405c714bc0af56927fa8e4c2442.tar.gz pvs2-e19dcdfed2da5405c714bc0af56927fa8e4c2442.tar.xz pvs2-e19dcdfed2da5405c714bc0af56927fa8e4c2442.zip | |
[client] Move ServerConnection instance to ClientApp
Diffstat (limited to 'src/client/clientapp/clientapp.cpp')
| -rw-r--r-- | src/client/clientapp/clientapp.cpp | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/client/clientapp/clientapp.cpp b/src/client/clientapp/clientapp.cpp index 3b90dee..5528c65 100644 --- a/src/client/clientapp/clientapp.cpp +++ b/src/client/clientapp/clientapp.cpp @@ -1,5 +1,8 @@ #include "clientapp.h" #include <QNetworkInterface> +#include "../connectwindow/connectwindow.h" +#include "../toolbar/toolbar.h" +#include "../net/serverconnection.h" ClientApp::ClientApp(int& argc, char** argv) : QApplication(argc, argv), _connectionMode(ConnectionMode::None), _examMode(false), _isManagerPc(false) @@ -26,6 +29,8 @@ ClientApp::ClientApp(int& argc, char** argv) translator->load(":pvsclient"); installTranslator(translator); + _connectWindow = new ConnectWindow(NULL); + connect(_connectWindow, SIGNAL(connected(ServerConnection*)), this, SLOT(connected(ServerConnection*))); /* TODO: Move the connection handling to ClientApp */ if (_connectionMode == ConnectionMode::Auto) { _toolbar = new Toolbar(true); // auto connect client without session ID. @@ -103,3 +108,17 @@ void ClientApp::readIsManagerPc() } } +void ClientApp::connected(ServerConnection* connection) +{ + _connection = connection; +} + +void ClientApp::disconnected(ServerConnection* connection) +{ + if (connection != NULL) + connection->blockSignals(true); + if (_connection == connection) { + _connection = NULL; + } +} + |