[gnome-shell/wip/aggregate-menu: 11/57] popupMenu: Add a status label and icon to submenu menu items

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

commit f8ec2a36284eb7cb93eeefc86ec45ff61becf699
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Thu Jun 6 14:17:41 2013 -0400

    popupMenu: Add a status label and icon to submenu menu items
    
    This will allow us to implement the new submenu designs in the
    aggregate menu.

 js/ui/popupMenu.js |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index 971a9f9..e52ffc4 100644
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -1189,14 +1189,23 @@ const PopupSubMenuMenuItem = new Lang.Class({
     Name: 'PopupSubMenuMenuItem',
     Extends: PopupBaseMenuItem,
 
-    _init: function(text) {
+    _init: function(text, wantIcon) {
         this.parent();
 
         this.actor.add_style_class_name('popup-submenu-menu-item');
 
+        if (wantIcon) {
+            this.icon = new St.Icon({ style_class: 'popup-menu-icon' });
+            this.addActor(this.icon, { align: St.Align.MIDDLE });
+        }
+
         this.label = new St.Label({ text: text });
         this.addActor(this.label);
         this.actor.label_actor = this.label;
+
+        this.status = new St.Label({ style_class: 'popup-status-menu-item' });
+        this.addActor(this.status, { align: St.Align.END });
+
         this._triangle = new St.Label({ text: '\u25B8' });
         this.addActor(this._triangle, { align: St.Align.END });