panel: Move statuses to the aggregate menu
Swap out the implementation of SystemIndicator with a dummy, and build the aggregate menu. At the same time, remove the poweroff and login screen menus, as those were fake aggregate menus beforehand. We lose some flexibility as we lose session-mode-based menu layout, but as each component of the aggregate menu is supposed to be "smart" in response to updating itself when session state changes, I believe it's better than a declarative model. https://bugzilla.gnome.org/show_bug.cgi?id=705845
This commit is contained in:
@ -48,8 +48,7 @@ const _modes = {
|
||||
panel: {
|
||||
left: [],
|
||||
center: ['dateMenu'],
|
||||
right: ['a11yGreeter', 'display', 'keyboard',
|
||||
'volume', 'battery', 'powerMenu']
|
||||
right: ['a11yGreeter', 'keyboard', 'aggregateMenu'],
|
||||
},
|
||||
panelStyle: 'login-screen'
|
||||
},
|
||||
@ -62,7 +61,7 @@ const _modes = {
|
||||
panel: {
|
||||
left: [],
|
||||
center: [],
|
||||
right: ['lockScreen']
|
||||
right: ['aggregateMenu']
|
||||
},
|
||||
panelStyle: 'lock-screen'
|
||||
},
|
||||
@ -74,7 +73,7 @@ const _modes = {
|
||||
panel: {
|
||||
left: [],
|
||||
center: [],
|
||||
right: ['a11y', 'keyboard', 'lockScreen']
|
||||
right: ['a11y', 'keyboard', 'aggregateMenu']
|
||||
},
|
||||
panelStyle: 'unlock-screen'
|
||||
},
|
||||
@ -96,8 +95,7 @@ const _modes = {
|
||||
panel: {
|
||||
left: ['activities', 'appMenu'],
|
||||
center: ['dateMenu'],
|
||||
right: ['a11y', 'keyboard', 'volume', 'bluetooth',
|
||||
'network', 'battery', 'system']
|
||||
right: ['a11y', 'keyboard', 'aggregateMenu']
|
||||
}
|
||||
}
|
||||
};
|
||||
|
Reference in New Issue
Block a user