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

status: Port to a new SystemIndicator framework

Browse Source 
We can't silently replace the old behavior of separate status
icons into a new system. Replace SystemStatusButton with a new
SystemIndicator class which will allow for the flexibility we
need. For now, make it a subclass of Button so that it mostly
feels the same, but we'll soon be swapping it out with a dummy
implementation that the aggregate menu will use.

I think the code cleanup here is worth it.

https://bugzilla.gnome.org/show_bug.cgi?id=705845
This commit is contained in:
Jasper St. Pierre
2013-06-06 17:27:25 -04:00
parent a347f02545
commit 5cca26a565
9 changed files with 62 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
js/ui/panelMenu.js
View File

@ -233,51 +233,29 @@ const Button = new Lang.Class({
});
Signals.addSignalMethods(Button.prototype);
/* SystemStatusButton:
/* SystemIndicator:
*
* This class manages one System Status indicator (network, keyboard,
* volume, bluetooth...), which is just a PanelMenuButton with an
* icon.
* This class manages one system indicator, which are the icons
* that you see at the top right. A system indicator is composed
* of an icon and a menu section, which will be composed into the
* aggregate menu.
*/
const SystemStatusButton = new Lang.Class({
Name: 'SystemStatusButton',
const SystemIndicator = new Lang.Class({
Name: 'SystemIndicator',
Extends: Button,
_init: function(iconName, nameText) {
this.parent(0.0, nameText);
_init: function() {
this.parent(0.0);
this.actor.add_style_class_name('panel-status-button');
this._box = new St.BoxLayout({ style_class: 'panel-status-button-box' });
this.actor.add_actor(this._box);
if (iconName)
this.setIcon(iconName);
this.indicators = new St.BoxLayout({ style_class: 'panel-status-indicators-box' });
this.actor.add_actor(this.indicators);
},
get icons() {
return this._box.get_children();
},
addIcon: function(gicon) {
addIndicator: function(gicon) {
let icon = new St.Icon({ gicon: gicon,
style_class: 'system-status-icon' });
this._box.add_actor(icon);
this.emit('icons-changed');
this.indicators.add_actor(icon);
return icon;
},
setIcon: function(iconName) {
if (!this.mainIcon)
this.mainIcon = this.addIcon(null);
this.mainIcon.icon_name = iconName;
},
setGIcon: function(gicon) {
if (this.mainIcon)
this.mainIcon.gicon = gicon;
else
this.mainIcon = this.addIcon(gicon);
}
});