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

status/remoteAccess: Move to quick settings

Browse Source 
And there goes the last icon-only indicator. From now on, some
actual work will be involved 😱️

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2392>
This commit is contained in:
Florian Müllner 2022-07-27 12:54:24 +02:00 committed by Marge Bot
parent b8cb5c6acd
commit 0f1f5bb174
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/ui/panel.js
View File

@ -383,7 +383,6 @@ class AggregateMenu extends PanelMenu.Button {
else else
this._bluetooth = null; this._bluetooth = null;
this._remoteAccess = new imports.ui.status.remoteAccess.RemoteAccessApplet();
this._power = new imports.ui.status.power.Indicator(); this._power = new imports.ui.status.power.Indicator();
this._powerProfiles = new imports.ui.status.powerProfiles.Indicator(); this._powerProfiles = new imports.ui.status.powerProfiles.Indicator();
this._rfkill = new imports.ui.status.rfkill.Indicator(); this._rfkill = new imports.ui.status.rfkill.Indicator();
@ -392,7 +391,6 @@ class AggregateMenu extends PanelMenu.Button {
this._system = new imports.ui.status.system.Indicator(); this._system = new imports.ui.status.system.Indicator();
this._nightLight = new imports.ui.status.nightLight.Indicator(); this._nightLight = new imports.ui.status.nightLight.Indicator();
this._indicators.add_child(this._remoteAccess);
this._indicators.add_child(this._nightLight); this._indicators.add_child(this._nightLight);
if (this._network) if (this._network)
this._indicators.add_child(this._network); this._indicators.add_child(this._network);
@ -412,7 +410,6 @@ class AggregateMenu extends PanelMenu.Button {
if (this._bluetooth) if (this._bluetooth)
this.menu.addMenuItem(this._bluetooth.menu); this.menu.addMenuItem(this._bluetooth.menu);
this.menu.addMenuItem(this._remoteAccess.menu);
this.menu.addMenuItem(this._rfkill.menu); this.menu.addMenuItem(this._rfkill.menu);
this.menu.addMenuItem(this._power.menu); this.menu.addMenuItem(this._power.menu);
this.menu.addMenuItem(this._powerProfiles.menu); this.menu.addMenuItem(this._powerProfiles.menu);
@ -439,14 +436,17 @@ class QuickSettings extends PanelMenu.Button {
this.setMenu(new QuickSettingsMenu(this, N_QUICK_SETTINGS_COLUMNS)); this.setMenu(new QuickSettingsMenu(this, N_QUICK_SETTINGS_COLUMNS));
this._remoteAccess = new imports.ui.status.remoteAccess.RemoteAccessApplet();
this._location = new imports.ui.status.location.Indicator(); this._location = new imports.ui.status.location.Indicator();
this._thunderbolt = new imports.ui.status.thunderbolt.Indicator(); this._thunderbolt = new imports.ui.status.thunderbolt.Indicator();
this._unsafeMode = new UnsafeModeIndicator(); this._unsafeMode = new UnsafeModeIndicator();
this._indicators.add_child(this._remoteAccess);
this._indicators.add_child(this._thunderbolt); this._indicators.add_child(this._thunderbolt);
this._indicators.add_child(this._location); this._indicators.add_child(this._location);
this._indicators.add_child(this._unsafeMode); this._indicators.add_child(this._unsafeMode);
this._addItems(this._remoteAccess.quickSettingsItems);
this._addItems(this._thunderbolt.quickSettingsItems); this._addItems(this._thunderbolt.quickSettingsItems);
this._addItems(this._location.quickSettingsItems); this._addItems(this._location.quickSettingsItems);
this._addItems(this._unsafeMode.quickSettingsItems); this._addItems(this._unsafeMode.quickSettingsItems);

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

@ -5,12 +5,13 @@ const { Atk, Clutter, GLib, GObject, Meta, St } = imports.gi;
const Main = imports.ui.main; const Main = imports.ui.main;
const PanelMenu = imports.ui.panelMenu; const PanelMenu = imports.ui.panelMenu;
const {SystemIndicator} = imports.ui.quickSettings;
// Minimum amount of time the shared indicator is visible (in micro seconds) // Minimum amount of time the shared indicator is visible (in micro seconds)
const MIN_SHARED_INDICATOR_VISIBLE_TIME_US = 5 * GLib.TIME_SPAN_SECOND; const MIN_SHARED_INDICATOR_VISIBLE_TIME_US = 5 * GLib.TIME_SPAN_SECOND;
var RemoteAccessApplet = GObject.registerClass( var RemoteAccessApplet = GObject.registerClass(
class RemoteAccessApplet extends PanelMenu.SystemIndicator { class RemoteAccessApplet extends SystemIndicator {
_init() { _init() {
super._init(); super._init();