From fa752110f3fb55131fe8819352f11b1db12bbf2f Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Tue, 19 Oct 2010 12:04:58 -0400 Subject: [PATCH] statusMenu: fix menu items to match latest mockups Rename a few, and add Suspend and Restart, although currently they do the same thing as Shut Down (ie, they bring up a dialog that lets you do any of those three). This will be fixed later when we have the in-shell modal dialogs for these features. https://bugzilla.gnome.org/show_bug.cgi?id=631193 --- js/ui/statusMenu.js | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/js/ui/statusMenu.js b/js/ui/statusMenu.js index 1979668e1..89eb4eb08 100644 --- a/js/ui/statusMenu.js +++ b/js/ui/statusMenu.js @@ -109,11 +109,11 @@ StatusMenuButton.prototype = { item = new PopupMenu.PopupSeparatorMenuItem(); this.menu.addMenuItem(item); - item = new PopupMenu.PopupMenuItem(_("Account Information...")); - item.connect('activate', Lang.bind(this, this._onAccountInformationActivate)); + item = new PopupMenu.PopupMenuItem(_("My Account...")); + item.connect('activate', Lang.bind(this, this._onMyAccountActivate)); this.menu.addMenuItem(item); - item = new PopupMenu.PopupMenuItem(_("System Settings...")); + item = new PopupMenu.PopupMenuItem(_("System Preferences...")); item.connect('activate', Lang.bind(this, this._onPreferencesActivate)); this.menu.addMenuItem(item); @@ -133,6 +133,17 @@ StatusMenuButton.prototype = { item.connect('activate', Lang.bind(this, this._onQuitSessionActivate)); this.menu.addMenuItem(item); + item = new PopupMenu.PopupSeparatorMenuItem(); + this.menu.addMenuItem(item); + + item = new PopupMenu.PopupMenuItem(_("Suspend")); + item.connect('activate', Lang.bind(this, this._onShutDownActivate)); + this.menu.addMenuItem(item); + + item = new PopupMenu.PopupMenuItem(_("Restart...")); + item.connect('activate', Lang.bind(this, this._onShutDownActivate)); + this.menu.addMenuItem(item); + item = new PopupMenu.PopupMenuItem(_("Shut Down...")); item.connect('activate', Lang.bind(this, this._onShutDownActivate)); this.menu.addMenuItem(item); @@ -142,7 +153,7 @@ StatusMenuButton.prototype = { this._presence.setStatus(status); }, - _onAccountInformationActivate: function() { + _onMyAccountActivate: function() { Main.overview.hide(); this._spawn(['gnome-about-me']); },