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

status/thunderbolt: Move to quick settings

Browse Source 
... and another icon-only indicator that can be just moved.

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

5
js/ui/panel.js
View File

@ -391,10 +391,8 @@ class AggregateMenu extends PanelMenu.Button {
this._brightness = new imports.ui.status.brightness.Indicator(); this._brightness = new imports.ui.status.brightness.Indicator();
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._thunderbolt = new imports.ui.status.thunderbolt.Indicator();
this._indicators.add_child(this._remoteAccess); this._indicators.add_child(this._remoteAccess);
this._indicators.add_child(this._thunderbolt);
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);
@ -442,11 +440,14 @@ class QuickSettings extends PanelMenu.Button {
this.setMenu(new QuickSettingsMenu(this, N_QUICK_SETTINGS_COLUMNS)); this.setMenu(new QuickSettingsMenu(this, N_QUICK_SETTINGS_COLUMNS));
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._unsafeMode = new UnsafeModeIndicator(); this._unsafeMode = new UnsafeModeIndicator();
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._thunderbolt.quickSettingsItems);
this._addItems(this._location.quickSettingsItems); this._addItems(this._location.quickSettingsItems);
this._addItems(this._unsafeMode.quickSettingsItems); this._addItems(this._unsafeMode.quickSettingsItems);
} }

4
js/ui/status/thunderbolt.js
View File

@ -8,7 +8,7 @@ const Signals = imports.misc.signals;
const Main = imports.ui.main; const Main = imports.ui.main;
const MessageTray = imports.ui.messageTray; const MessageTray = imports.ui.messageTray;
const PanelMenu = imports.ui.panelMenu; const {SystemIndicator} = imports.ui.quickSettings;
const { loadInterfaceXML } = imports.misc.fileUtils; const { loadInterfaceXML } = imports.misc.fileUtils;
@ -216,7 +216,7 @@ var AuthRobot = class extends Signals.EventEmitter {
/* eof client.js */ /* eof client.js */
var Indicator = GObject.registerClass( var Indicator = GObject.registerClass(
class Indicator extends PanelMenu.SystemIndicator { class Indicator extends SystemIndicator {
_init() { _init() {
super._init(); super._init();