diff options
author | Björn Hagemeister | 2014-05-06 15:36:00 +0200 |
---|---|---|
committer | Björn Hagemeister | 2014-05-06 15:36:00 +0200 |
commit | 63765ee9a9e6d05d577e738f8161bccf9420d8e8 (patch) | |
tree | 58f36937035ee6c0d441a61aa28bd2b9d36ee35b /src/client/toolbar | |
parent | Merge branch 'master' of git.openslx.org:pvs2 (diff) | |
download | pvs2-63765ee9a9e6d05d577e738f8161bccf9420d8e8.tar.gz pvs2-63765ee9a9e6d05d577e738f8161bccf9420d8e8.tar.xz pvs2-63765ee9a9e6d05d577e738f8161bccf9420d8e8.zip |
New Feature: Showing client toolbar while vnc server is running.
Diffstat (limited to 'src/client/toolbar')
-rw-r--r-- | src/client/toolbar/toolbar.cpp | 15 | ||||
-rw-r--r-- | src/client/toolbar/toolbar.h | 1 |
2 files changed, 15 insertions, 1 deletions
diff --git a/src/client/toolbar/toolbar.cpp b/src/client/toolbar/toolbar.cpp index 34dafd5..8e80fe3 100644 --- a/src/client/toolbar/toolbar.cpp +++ b/src/client/toolbar/toolbar.cpp @@ -25,6 +25,7 @@ Toolbar::Toolbar(QWidget *parent) : _connectWindow = new ConnectWindow(NULL); connect(_connectWindow, SIGNAL(disconnect()), this, SLOT(onDoDisconnect())); connect(_connectWindow, SIGNAL(connected(ServerConnection*)), this, SLOT(onConnected(ServerConnection*))); + connect(VncServer::instance(), SIGNAL(started(int, QString&, QString&)), this, SLOT(onVncServerIsRunning(int, QString&, QString&))); // setupMenu(); setLocation(); @@ -110,7 +111,8 @@ void Toolbar::setBarVisible(bool shown) bool Toolbar::hideBar() { - if (_menu->isVisible()) // Don't hide window if any menu is open + // Don't hide window if any menu is open or VNC Server is running from this client. + if (_menu->isVisible() || VncServer::instance()->isVncServerRunning()) return false; setBarVisible(false); return true; @@ -158,6 +160,17 @@ void Toolbar::timerEvent(QTimerEvent* event) * Slots */ +void Toolbar::onVncServerIsRunning(int port, QString&, QString&) +{ + if (port > 0) + { + setBarVisible(true); + return; + } + hideBar(); + return; +} + void Toolbar::onDisconnected() { _connectWindow->setConnected(false); diff --git a/src/client/toolbar/toolbar.h b/src/client/toolbar/toolbar.h index 8887ca7..8a9da6f 100644 --- a/src/client/toolbar/toolbar.h +++ b/src/client/toolbar/toolbar.h @@ -68,6 +68,7 @@ protected: */ private slots: + void onVncServerIsRunning(int port, QString& ropass, QString& rwpass); void onDisconnected(); void onConnected(ServerConnection* connection); void onDoDisconnect(); |