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

panel: Add quick settings indicator

Browse Source 
The new indicator will eventually expose all the system status
items that are currently provided by the aggregate menu, but in
a more accessible form than the current submenu-heavy menu.

Right now this just adds the new empty indicator to the top bar,
alongside the existing aggregate menu.

We can then move items over one-by-one.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2392>
This commit is contained in:
Florian Müllner 2022-07-24 19:49:58 +02:00 committed by Marge Bot
parent f18d103f83
commit 84a62cc868
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
js/ui/panel.js
View File

@ -11,6 +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 Main = imports.ui.main; const Main = imports.ui.main;
var PANEL_ICON_SIZE = 16; var PANEL_ICON_SIZE = 16;
@ -18,6 +19,8 @@ var APP_MENU_ICON_MARGIN = 0;
var BUTTON_DND_ACTIVATION_TIMEOUT = 250; var BUTTON_DND_ACTIVATION_TIMEOUT = 250;
const N_QUICK_SETTINGS_COLUMNS = 2;
/** /**
* AppMenuButton: * AppMenuButton:
* *
@ -432,10 +435,29 @@ class AggregateMenu extends PanelMenu.Button {
} }
}); });
var QuickSettings = GObject.registerClass(
class QuickSettings extends PanelMenu.Button {
_init() {
super._init(0.0, C_('System menu in the top bar', 'System'), true);
this._indicators = new St.BoxLayout({
style_class: 'panel-status-indicators-box',
});
this.add_child(this._indicators);
this.setMenu(new QuickSettingsMenu(this, N_QUICK_SETTINGS_COLUMNS));
}
_addItems(items, colSpan = 1) {
items.forEach(item => this.menu.addItem(item, colSpan));
}
});
const PANEL_ITEM_IMPLEMENTATIONS = { const PANEL_ITEM_IMPLEMENTATIONS = {
'activities': ActivitiesButton, 'activities': ActivitiesButton,
'aggregateMenu': AggregateMenu, 'aggregateMenu': AggregateMenu,
'appMenu': AppMenuButton, 'appMenu': AppMenuButton,
'quickSettings': QuickSettings,
'dateMenu': imports.ui.dateMenu.DateMenuButton, 'dateMenu': imports.ui.dateMenu.DateMenuButton,
'a11y': imports.ui.status.accessibility.ATIndicator, 'a11y': imports.ui.status.accessibility.ATIndicator,
'keyboard': imports.ui.status.keyboard.InputSourceIndicator, 'keyboard': imports.ui.status.keyboard.InputSourceIndicator,

6
js/ui/sessionMode.js
View File

@ -59,7 +59,7 @@ const _modes = {
panel: { panel: {
left: [], left: [],
center: ['dateMenu'], center: ['dateMenu'],
right: ['dwellClick', 'a11y', 'keyboard', 'aggregateMenu'], right: ['dwellClick', 'a11y', 'keyboard', 'quickSettings', 'aggregateMenu'],
}, },
panelStyle: 'login-screen', panelStyle: 'login-screen',
}, },
@ -71,7 +71,7 @@ const _modes = {
panel: { panel: {
left: [], left: [],
center: [], center: [],
right: ['dwellClick', 'a11y', 'keyboard', 'aggregateMenu'], right: ['dwellClick', 'a11y', 'keyboard', 'quickSettings', 'aggregateMenu'],
}, },
panelStyle: 'unlock-screen', panelStyle: 'unlock-screen',
}, },
@ -94,7 +94,7 @@ const _modes = {
panel: { panel: {
left: ['activities', 'appMenu'], left: ['activities', 'appMenu'],
center: ['dateMenu'], center: ['dateMenu'],
right: ['screenRecording', 'screenSharing', 'dwellClick', 'a11y', 'keyboard', 'aggregateMenu'], right: ['screenRecording', 'screenSharing', 'dwellClick', 'a11y', 'keyboard', 'quickSettings', 'aggregateMenu'],
}, },
}, },
}; };