[gnome-shell/wip/message-tray-menu: 20/20] fff

[Jasper St. Pierre <jstpierre src gnome org>]

commit 8ecd311e3c8d8147997ed05b7bb2f93260822e82
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Tue Apr 23 20:57:30 2013 -0400

    fff

 js/ui/panel.js             |   12 ++++++++----
 js/ui/status/brightness.js |    2 +-
 js/ui/status/power.js      |    2 +-
 js/ui/status/volume.js     |    2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/js/ui/panel.js b/js/ui/panel.js
index a614dc1..9765225 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -930,18 +930,22 @@ const AggregateMenu = new Lang.Class({
         this._indicators = new St.BoxLayout({ style_class: 'panel-status-button-box' });
         this.actor.add_child(this._indicators);
 
-        let network = new imports.ui.status.network.Indicator();
+        let network = new imports.ui.status.network.NMApplet();
+        let power = new imports.ui.status.power.Indicator();
         let volume = new imports.ui.status.volume.Indicator();
         let brightness = new imports.ui.status.brightness.Indicator();
         let userMenu = new imports.ui.userMenu.UserMenuButton();
 
         this._indicators.add_child(network.indicators);
+        this._indicators.add_child(power.indicators);
         this._indicators.add_child(volume.indicators);
 
-        this.menu.addMenuItem(volume.menu);
-        this.menu.addMenuItem(brightness.menu);
+        this.menu.addMenuItem(volume.menu, { expand: true, span: -1 });
+        this.menu.addMenuItem(brightness.menu, { expand: true, span: -1 });
         this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-        this.menu.addMenuItem(userMenu.menu);
+        this.menu.addMenuItem(power.menu, { expand: true, span: -1 });
+        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+        this.menu.addMenuItem(userMenu.menu, { expand: true, span: -1 });
     },
 });
 
diff --git a/js/ui/status/brightness.js b/js/ui/status/brightness.js
index 92d3770..066a844 100644
--- a/js/ui/status/brightness.js
+++ b/js/ui/status/brightness.js
@@ -38,7 +38,7 @@ const BrightnessSlider = new Lang.Class({
         this._actor.add_child(this._slider.actor);
         this._actor.add_child(new St.Icon({ icon_name: 'display-brightness-symbolic', icon_size: 16 }));
 
-        this._item.addActor(this._actor);
+        this._item.addActor(this._actor, { span: -1, expand: true });
         this.section.addMenuItem(this._item);
 
         this._updateBrightness();
diff --git a/js/ui/status/power.js b/js/ui/status/power.js
index 8fea38b..f425ae1 100644
--- a/js/ui/status/power.js
+++ b/js/ui/status/power.js
@@ -156,7 +156,7 @@ const Indicator = new Lang.Class({
             hasIcon = true;
         }
         this.mainIcon.visible = hasIcon;
-        this.actor.visible = hasIcon;
+        this.indicators.visible = hasIcon;
     },
 
     _devicesChanged: function() {
diff --git a/js/ui/status/volume.js b/js/ui/status/volume.js
index cf57c26..1e3c059 100644
--- a/js/ui/status/volume.js
+++ b/js/ui/status/volume.js
@@ -45,7 +45,7 @@ const StreamSlider = new Lang.Class({
         this._actor.add_child(this._slider.actor);
         this._actor.add_child(new St.Icon({ icon_name: iconMax, icon_size: 16 }));
 
-        this._item.addActor(this._actor);
+        this._item.addActor(this._actor, { span: -1, expand: true });
         this.section.addMenuItem(this._item);
 
         this._stream = null;