diff options
author | Manuel Schneider | 2014-05-22 14:19:06 +0200 |
---|---|---|
committer | Manuel Schneider | 2014-05-22 14:19:06 +0200 |
commit | 2c771673608bbaa9617da6a545cbb5d9a8c2114d (patch) | |
tree | e86d3dc06e6c51b373bd95dae2420c4a32f462c9 /src/client/toolbar/toolbar.cpp | |
parent | Make VNCServer::isrunning inline (diff) | |
download | pvs2-2c771673608bbaa9617da6a545cbb5d9a8c2114d.tar.gz pvs2-2c771673608bbaa9617da6a545cbb5d9a8c2114d.tar.xz pvs2-2c771673608bbaa9617da6a545cbb5d9a8c2114d.zip |
Stop suggesting the user to be recorded:
* Delete red dot camera icons
* Disable camera blinking in clients toolbar (sorry bjoern)
* Adjust ressource files
Diffstat (limited to 'src/client/toolbar/toolbar.cpp')
-rw-r--r-- | src/client/toolbar/toolbar.cpp | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/src/client/toolbar/toolbar.cpp b/src/client/toolbar/toolbar.cpp index 6d9e9a5..7f6d8ad 100644 --- a/src/client/toolbar/toolbar.cpp +++ b/src/client/toolbar/toolbar.cpp @@ -24,7 +24,7 @@ */ Toolbar::Toolbar(QWidget *parent) : QWidget(parent), _ui(new Ui::Toolbar), _hideTimer(this), _connection(NULL), - _blinkTimer(this),_cam32(":cam32.svg"), _camOff32(":cam_off32.svg") + _cam32(":cam32.svg"), _camOff32(":cam_off32.svg") { /* Initialize the GUI */ _ui->setupUi(this); @@ -71,10 +71,6 @@ Toolbar::Toolbar(QWidget *parent) : _hideTimer.setSingleShot(true); connect(&_hideTimer, SIGNAL(timeout()), this, SLOT(hideBar())); _hideTimer.start(); // initially show PVS and hide later - - /* Setup blink timer */ - _blinkTimer.setInterval(500); - connect(&_blinkTimer, SIGNAL(timeout()), this, SLOT(cameraBlink())); } @@ -125,25 +121,6 @@ void Toolbar::enterEvent(QEvent* e) */ /***************************************************************************//** - * A slot for changing the camera icon. This slot should be called permanently - * if the vnc server is recording the screen. - */ -void Toolbar::cameraBlink() -{ - static bool showRedDot = false; - if (!showRedDot) - { - _ui->icon_cam->setPixmap(_camOff32); - showRedDot = true; - } - else - { - _ui->icon_cam->setPixmap(_cam32); - showRedDot = false; - } -} - -/***************************************************************************//** * A slot for the VncServerIsRunning signal. This slot will change the UI * according to the state fo the VncServer. * @param[in] port Indicates the state of the VncServer. @@ -151,12 +128,10 @@ void Toolbar::cameraBlink() void Toolbar::onVncServerIsRunning(int port) { if (port > 0){ - _blinkTimer.start(); _ui->lblStatus->setStyleSheet("color:red"); - _ui->lblStatus->setText(tr("Recording")); + _ui->lblStatus->setText(tr("Streaming")); showBar(); } else { - _blinkTimer.stop(); _ui->icon_cam->setPixmap(_cam32); _ui->lblStatus->setStyleSheet("color:green"); _ui->lblStatus->setText(tr("Online")); |