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

status-menu: Rename to userMenu

Browse Source 
We haven't actually been calling the top-right menu "status menu" for
quite some time, so use the upcoming code changes as an excuse for
renaming it to "user menu".
This commit is contained in:
Florian Müllner 2011-08-29 21:56:22 +02:00
parent 5d138e1b79
commit 07660f7fcf
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/Makefile.am
View File

@ -56,7 +56,6 @@ nobase_dist_js_DATA = \
ui/searchDisplay.js \ ui/searchDisplay.js \
ui/shellDBus.js \ ui/shellDBus.js \
ui/statusIconDispatcher.js \ ui/statusIconDispatcher.js \
ui/statusMenu.js \
ui/status/accessibility.js \ ui/status/accessibility.js \
ui/status/keyboard.js \ ui/status/keyboard.js \
ui/status/network.js \ ui/status/network.js \
@ -65,6 +64,7 @@ nobase_dist_js_DATA = \
ui/status/bluetooth.js \ ui/status/bluetooth.js \
ui/telepathyClient.js \ ui/telepathyClient.js \
ui/tweener.js \ ui/tweener.js \
ui/userMenu.js \
ui/viewSelector.js \ ui/viewSelector.js \
ui/windowAttentionHandler.js \ ui/windowAttentionHandler.js \
ui/windowManager.js \ ui/windowManager.js \

4
js/ui/panel.js
View File

@ -16,7 +16,7 @@ const Layout = imports.ui.layout;
const Overview = imports.ui.overview; const Overview = imports.ui.overview;
const PopupMenu = imports.ui.popupMenu; const PopupMenu = imports.ui.popupMenu;
const PanelMenu = imports.ui.panelMenu; const PanelMenu = imports.ui.panelMenu;
const StatusMenu = imports.ui.statusMenu; const UserMenu = imports.ui.userMenu;
const DateMenu = imports.ui.dateMenu; const DateMenu = imports.ui.dateMenu;
const Main = imports.ui.main; const Main = imports.ui.main;
const Tweener = imports.ui.tweener; const Tweener = imports.ui.tweener;
@ -954,7 +954,7 @@ Panel.prototype = {
this._rightBox.add(this._statusBox); this._rightBox.add(this._statusBox);
if (global.session_type == Shell.SessionType.USER) { if (global.session_type == Shell.SessionType.USER) {
this._userMenu = new StatusMenu.StatusMenuButton(); this._userMenu = new UserMenu.UserMenuButton();
this._userMenu.actor.name = 'panelStatus'; this._userMenu.actor.name = 'panelStatus';
this._rightBox.add(this._userMenu.actor); this._rightBox.add(this._userMenu.actor);
} }

4
js/ui/statusMenu.js → js/ui/userMenu.js
View File

@ -27,11 +27,11 @@ const DISABLE_LOG_OUT_KEY = 'disable-log-out';
// Copyright (C) 2004-2005 James M. Cape <jcape@ignore-your.tv>. // Copyright (C) 2004-2005 James M. Cape <jcape@ignore-your.tv>.
// Copyright (C) 2008,2009 Red Hat, Inc. // Copyright (C) 2008,2009 Red Hat, Inc.
function StatusMenuButton() { function UserMenuButton() {
this._init(); this._init();
} }
StatusMenuButton.prototype = { UserMenuButton.prototype = {
__proto__: PanelMenu.Button.prototype, __proto__: PanelMenu.Button.prototype,
_init: function() { _init: function() {

2
po/POTFILES.in
View File

@ -26,11 +26,11 @@ js/ui/shellMountOperation.js
js/ui/status/accessibility.js js/ui/status/accessibility.js
js/ui/status/bluetooth.js js/ui/status/bluetooth.js
js/ui/status/keyboard.js js/ui/status/keyboard.js
js/ui/statusMenu.js
js/ui/status/network.js js/ui/status/network.js
js/ui/status/power.js js/ui/status/power.js
js/ui/status/volume.js js/ui/status/volume.js
js/ui/telepathyClient.js js/ui/telepathyClient.js
js/ui/userMenu.js
js/ui/viewSelector.js js/ui/viewSelector.js
js/ui/windowAttentionHandler.js js/ui/windowAttentionHandler.js
src/gvc/gvc-mixer-control.c src/gvc/gvc-mixer-control.c