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

panel: Move unsafe-mode indicator to quick settings

Browse Source 
As the inicator doesn't have any UI besides the top bar icon,
the move is trivial.

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

12
js/ui/panel.js
View File

@ -11,7 +11,7 @@ const DND = imports.ui.dnd;
const Overview = imports.ui.overview; const Overview = imports.ui.overview;
const PopupMenu = imports.ui.popupMenu; const PopupMenu = imports.ui.popupMenu;
const PanelMenu = imports.ui.panelMenu; const PanelMenu = imports.ui.panelMenu;
const {QuickSettingsMenu} = imports.ui.quickSettings; const {QuickSettingsMenu, SystemIndicator} = imports.ui.quickSettings;
const Main = imports.ui.main; const Main = imports.ui.main;
var PANEL_ICON_SIZE = 16; var PANEL_ICON_SIZE = 16;
@ -319,7 +319,7 @@ class ActivitiesButton extends PanelMenu.Button {
}); });
const UnsafeModeIndicator = GObject.registerClass( const UnsafeModeIndicator = GObject.registerClass(
class UnsafeModeIndicator extends PanelMenu.SystemIndicator { class UnsafeModeIndicator extends SystemIndicator {
_init() { _init() {
super._init(); super._init();
@ -393,7 +393,6 @@ class AggregateMenu extends PanelMenu.Button {
this._location = new imports.ui.status.location.Indicator(); this._location = new imports.ui.status.location.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._thunderbolt = new imports.ui.status.thunderbolt.Indicator();
this._unsafeMode = new UnsafeModeIndicator();
this._indicators.add_child(this._remoteAccess); this._indicators.add_child(this._remoteAccess);
this._indicators.add_child(this._thunderbolt); this._indicators.add_child(this._thunderbolt);
@ -405,7 +404,6 @@ class AggregateMenu extends PanelMenu.Button {
this._indicators.add_child(this._bluetooth); this._indicators.add_child(this._bluetooth);
this._indicators.add_child(this._rfkill); this._indicators.add_child(this._rfkill);
this._indicators.add_child(this._volume); this._indicators.add_child(this._volume);
this._indicators.add_child(this._unsafeMode);
this._indicators.add_child(this._power); this._indicators.add_child(this._power);
this._indicators.add_child(this._powerProfiles); this._indicators.add_child(this._powerProfiles);
@ -446,6 +444,12 @@ class QuickSettings extends PanelMenu.Button {
this.add_child(this._indicators); this.add_child(this._indicators);
this.setMenu(new QuickSettingsMenu(this, N_QUICK_SETTINGS_COLUMNS)); this.setMenu(new QuickSettingsMenu(this, N_QUICK_SETTINGS_COLUMNS));
this._unsafeMode = new UnsafeModeIndicator();
this._indicators.add_child(this._unsafeMode);
this._addItems(this._unsafeMode.quickSettingsItems);
} }
_addItems(items, colSpan = 1) { _addItems(items, colSpan = 1) {