Skip to content

DesktopStreamer: Rename 'interaction' -> 'remote control', off by default #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rdumusc merged 1 commit into from
Jun 14, 2016
Merged

DesktopStreamer: Rename 'interaction' -> 'remote control', off by default #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions apps/DesktopStreamer/MainWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
{
Expand Down Expand Up @@ -117,7 +123,7 @@ MainWindow::MainWindow()
adjustSize();
#endif

connect( _desktopInteractionCheckBox, &QCheckBox::clicked,
connect( _remoteControlCheckBox, &QCheckBox::clicked,
this, &MainWindow::_onStreamEventsBoxClicked );

connect( _streamButton, &QPushButton::clicked,
Expand Down Expand Up @@ -220,7 +226,7 @@ void MainWindow::_updateStreams()
continue;
}

if( _desktopInteractionCheckBox->isChecked( ))
if( _remoteControlCheckBox->isChecked( ))
stream->registerForEvents();

streams[ index ] = stream;
Expand Down Expand Up @@ -249,7 +255,7 @@ void MainWindow::_updateStreams()
host ));
if( stream->isConnected( ))
{
if( _desktopInteractionCheckBox->isChecked( ))
if( _remoteControlCheckBox->isChecked( ))
stream->registerForEvents();
_streams[ index ] = stream;
_startStreaming();
Expand All @@ -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(); )
Expand Down
8 changes: 4 additions & 4 deletions apps/DesktopStreamer/MainWindow.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,16 +186,16 @@
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="desktopInteractionLabel">
<widget class="QLabel" name="_remoteControlLabel">
<property name="text">
<string>Interaction</string>
<string>Remote control</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QCheckBox" name="_desktopInteractionCheckBox">
<widget class="QCheckBox" name="_remoteControlCheckBox">
<property name="checked">
<bool>true</bool>
<bool>false</bool>
</property>
</widget>
</item>
Expand Down
2 changes: 2 additions & 0 deletions doc/Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down