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/client/toolbar/toolbar.cpp | |
| 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/client/toolbar/toolbar.cpp')
| -rw-r--r-- | src/client/toolbar/toolbar.cpp | 4 |
1 files changed, 2 insertions, 2 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(); |