brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

status/remote-access: Visualize recordings as screen recording

Browse Source 
If a remote access is marked as a recording, visualize it the same way
as a built in recording. Also don't stop it if there is an actual screen
sharing going on, so that one can use a plain "recording" while still
disabling what is an actual screen sharing.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1372
This commit is contained in:
Jonas Ådahl 2020-04-21 18:06:06 +02:00
parent fdac0602db
commit 20dcc8aa87
1 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
js/ui/status/remoteAccess.js
View File

@ -24,7 +24,8 @@ class RemoteAccessApplet extends PanelMenu.SystemIndicator {
return; return;
this._handles = new Set(); this._handles = new Set();
this._indicator = null; this._sharedIndicator = null;
this._recordingIndicator = null;
this._menuSection = null; this._menuSection = null;
controller.connect('new-handle', (o, handle) => { controller.connect('new-handle', (o, handle) => {
@ -33,32 +34,49 @@ class RemoteAccessApplet extends PanelMenu.SystemIndicator {
} }
_ensureControls() { _ensureControls() {
if (this._indicator) if (this._sharedIndicator && this._recordingIndicator)
return; return;
this._indicator = this._addIndicator(); this._sharedIndicator = this._addIndicator();
this._indicator.icon_name = 'screen-shared-symbolic'; this._sharedIndicator.icon_name = 'screen-shared-symbolic';
this._indicator.add_style_class_name('remote-access-indicator'); this._sharedIndicator.add_style_class_name('remote-access-indicator');
this._item =
this._sharedItem =
new PopupMenu.PopupSubMenuMenuItem(_("Screen is Being Shared"), new PopupMenu.PopupSubMenuMenuItem(_("Screen is Being Shared"),
true); true);
this._item.menu.addAction(_("Turn off"), this._sharedItem.menu.addAction(_("Turn off"),
() => { () => {
for (let handle of this._handles) for (let handle of this._handles) {
handle.stop(); if (!handle.is_recording)
}); handle.stop();
this._item.icon.icon_name = 'screen-shared-symbolic'; }
this.menu.addMenuItem(this._item); });
this._sharedItem.icon.icon_name = 'screen-shared-symbolic';
this.menu.addMenuItem(this._sharedItem);
this._recordingIndicator = this._addIndicator();
this._recordingIndicator.icon_name = 'media-record-symbolic';
this._recordingIndicator.add_style_class_name('screencast-indicator');
}
_isScreenShared() {
return [...this._handles].some(handle => !handle.is_recording);
}
_isRecording() {
return [...this._handles].some(handle => handle.is_recording);
} }
_sync() { _sync() {
if (this._handles.size == 0) { if (this._isScreenShared()) {
this._indicator.visible = false; this._sharedIndicator.visible = true;
this._item.visible = false; this._sharedItem.visible = true;
} else { } else {
this._indicator.visible = true; this._sharedIndicator.visible = false;
this._item.visible = true; this._sharedItem.visible = false;
} }
this._recordingIndicator.visible = this._isRecording();
} }
_onStopped(handle) { _onStopped(handle) {
@ -70,9 +88,7 @@ class RemoteAccessApplet extends PanelMenu.SystemIndicator {
this._handles.add(handle); this._handles.add(handle);
handle.connect('stopped', this._onStopped.bind(this)); handle.connect('stopped', this._onStopped.bind(this));
if (this._handles.size == 1) { this._ensureControls();
this._ensureControls(); this._sync();
this._sync();
}
} }
}); });