summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Hagemeister2014-05-07 16:58:47 +0200
committerBjörn Hagemeister2014-05-07 16:58:47 +0200
commitd4969ff35ff80aee9a90ad855a08561a386ea11d (patch)
tree8cc67f08b8a490afda81c35dea2934e352985db8
parentMerge branch 'master' of git.openslx.org:pvs2 (diff)
downloadpvs2-d4969ff35ff80aee9a90ad855a08561a386ea11d.tar.gz
pvs2-d4969ff35ff80aee9a90ad855a08561a386ea11d.tar.xz
pvs2-d4969ff35ff80aee9a90ad855a08561a386ea11d.zip
Setting right pixmap after stopping vnc server on client.
-rw-r--r--src/client/connectwindow/connectwindow.cpp5
-rw-r--r--src/client/toolbar/toolbar.cpp2
2 files changed, 4 insertions, 3 deletions
diff --git a/src/client/connectwindow/connectwindow.cpp b/src/client/connectwindow/connectwindow.cpp
index 365f327..0a09b0e 100644
--- a/src/client/connectwindow/connectwindow.cpp
+++ b/src/client/connectwindow/connectwindow.cpp
@@ -83,6 +83,7 @@ void ConnectWindow::setState(const ConnectionState state)
/**
* Handle changes in state and update window.
+ * Also changing TextLabel which shows the user what the program is doing.
*/
void ConnectWindow::updateState()
{
@@ -204,7 +205,7 @@ void ConnectWindow::timerEvent(QTimerEvent* event)
}
/**
- * Close Event e and hide window.
+ * Handle incoming closeEvent and hide window.
* @param e
*/
void ConnectWindow::closeEvent(QCloseEvent *e)
@@ -336,7 +337,7 @@ void ConnectWindow::onConnectionStateChange(ConnectWindow::ConnectionState state
}
/**
- * Set _connection = NULL.
+ * If connection is closed set _connection = NULL.
* @param connection
*/
void ConnectWindow::onConnectionClosed(QObject* connection)
diff --git a/src/client/toolbar/toolbar.cpp b/src/client/toolbar/toolbar.cpp
index 5083ef9..b7fe6d3 100644
--- a/src/client/toolbar/toolbar.cpp
+++ b/src/client/toolbar/toolbar.cpp
@@ -122,12 +122,12 @@ void Toolbar::onVncServerIsRunning(int port, QString&, QString&)
{
if (port > 0){
_blinkTimer.start();
-
_ui->lblStatus->setStyleSheet("color:red");
_ui->lblStatus->setText(tr("Recording"));
showBar();
} else {
_blinkTimer.stop();
+ _ui->icon_cam->setPixmap(_cam32);
_ui->lblStatus->setStyleSheet("color:green");
_ui->lblStatus->setText(tr("Online"));
hideBar();