diff options
| author | Björn Hagemeister | 2014-05-22 15:28:53 +0200 |
|---|---|---|
| committer | Björn Hagemeister | 2014-05-22 15:28:53 +0200 |
| commit | 2834b4e955e8498b4ad4b45ef3bda6c6cf84ba9b (patch) | |
| tree | bd02cb4e67fef2edcc64ec698ba4be1f8e4a0881 /src | |
| parent | Changed the blinking red dot in toolbar while beeing vnc server to blinking eye. (diff) | |
| parent | Stop suggesting the user to be recorded: (diff) | |
| download | pvs2-2834b4e955e8498b4ad4b45ef3bda6c6cf84ba9b.tar.gz pvs2-2834b4e955e8498b4ad4b45ef3bda6c6cf84ba9b.tar.xz pvs2-2834b4e955e8498b4ad4b45ef3bda6c6cf84ba9b.zip | |
Merge branch 'master' of git.openslx.org:pvs2
(Eye icon for VNC streaming)
Conflicts:
pvsclient.qrc
src/client/toolbar/toolbar.cpp
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/toolbar/toolbar.cpp | 4 | ||||
| -rw-r--r-- | src/client/vnc/vncserver.cpp | 11 | ||||
| -rw-r--r-- | src/client/vnc/vncserver.h | 2 |
3 files changed, 4 insertions, 13 deletions
diff --git a/src/client/toolbar/toolbar.cpp b/src/client/toolbar/toolbar.cpp index 7731eca..bfe4e24 100644 --- a/src/client/toolbar/toolbar.cpp +++ b/src/client/toolbar/toolbar.cpp @@ -150,10 +150,10 @@ void Toolbar::cameraBlink() */ void Toolbar::onVncServerIsRunning(int port) { - if (port > 0){ + if (port > 0) { _blinkTimer.start(); _ui->lblStatus->setStyleSheet("color:red"); - _ui->lblStatus->setText(tr("Recording")); + _ui->lblStatus->setText(tr("Streaming")); showBar(); } else { _blinkTimer.stop(); diff --git a/src/client/vnc/vncserver.cpp b/src/client/vnc/vncserver.cpp index 56800f4..2b341fb 100644 --- a/src/client/vnc/vncserver.cpp +++ b/src/client/vnc/vncserver.cpp @@ -55,13 +55,6 @@ VncServer::~VncServer() // TODO Auto-generated destructor stub } -bool VncServer::isVncServerRunning() -{ - if (_port > 0) - return true; - return false; -} - void VncServer::start() { // Keep things clean @@ -121,9 +114,7 @@ void VncServer::start() args << rect; qDebug() << "Arguments are: " << args; - _process->start("x11vnc", - args, - QIODevice::ReadOnly); + _process->start("x11vnc", args, QIODevice::ReadOnly); } void VncServer::stop() diff --git a/src/client/vnc/vncserver.h b/src/client/vnc/vncserver.h index 790b295..ac45822 100644 --- a/src/client/vnc/vncserver.h +++ b/src/client/vnc/vncserver.h @@ -31,7 +31,7 @@ private: public: static VncServer *instance(); - bool isVncServerRunning(); + inline bool isVncServerRunning(){ return _port > 0; } void start(); void stop(); |