diff --git a/apps/DesktopStreamer/MainWindow.cpp b/apps/DesktopStreamer/MainWindow.cpp index 0218573..0bf0b42 100644 --- a/apps/DesktopStreamer/MainWindow.cpp +++ b/apps/DesktopStreamer/MainWindow.cpp @@ -80,6 +80,12 @@ MainWindow::MainWindow() { setupUi( this ); +#ifndef __APPLE__ + // Event injection support is currently limited to OSX + _remoteControlLabel->setVisible( false ); + _remoteControlCheckBox->setVisible( false ); +#endif + connect( _hostComboBox, &QComboBox::currentTextChanged, [&]( const QString& text ) { @@ -117,7 +123,7 @@ MainWindow::MainWindow() adjustSize(); #endif - connect( _desktopInteractionCheckBox, &QCheckBox::clicked, + connect( _remoteControlCheckBox, &QCheckBox::clicked, this, &MainWindow::_onStreamEventsBoxClicked ); connect( _streamButton, &QPushButton::clicked, @@ -220,7 +226,7 @@ void MainWindow::_updateStreams() continue; } - if( _desktopInteractionCheckBox->isChecked( )) + if( _remoteControlCheckBox->isChecked( )) stream->registerForEvents(); streams[ index ] = stream; @@ -249,7 +255,7 @@ void MainWindow::_updateStreams() host )); if( stream->isConnected( )) { - if( _desktopInteractionCheckBox->isChecked( )) + if( _remoteControlCheckBox->isChecked( )) stream->registerForEvents(); _streams[ index ] = stream; _startStreaming(); @@ -262,7 +268,7 @@ void MainWindow::_updateStreams() void MainWindow::_processStreamEvents() { - const bool interact = _desktopInteractionCheckBox->checkState(); + const bool interact = _remoteControlCheckBox->checkState(); std::vector< ConstStreamPtr > closedStreams; for( auto i = _streams.begin(); i != _streams.end(); ) diff --git a/apps/DesktopStreamer/MainWindow.ui b/apps/DesktopStreamer/MainWindow.ui index e074c40..aed8fee 100644 --- a/apps/DesktopStreamer/MainWindow.ui +++ b/apps/DesktopStreamer/MainWindow.ui @@ -186,16 +186,16 @@ - + - Interaction + Remote control - + - true + false diff --git a/doc/Changelog.md b/doc/Changelog.md index 99cff37..dba56e2 100644 --- a/doc/Changelog.md +++ b/doc/Changelog.md @@ -5,6 +5,8 @@ Changelog {#Changelog} ### 0.11.0 (git master) +* [106](https://github.com/BlueBrain/Deflect/pull/106): + DesktopStreamer: Rename 'interaction' -> 'remote control', off by default. * [103](https://github.com/BlueBrain/Deflect/pull/103): DesktopStreamer: prevent AppNap of being re-enabled automatically * [102](https://github.com/BlueBrain/Deflect/pull/102):