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

network: add security icons to WEP/WPA wireless networks

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=645647
This commit is contained in:
Dan Winship 2011-03-25 11:27:56 -04:00
parent 3bbdecc6b3
commit 526d11809f
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/theme/gnome-shell.css
View File

@ -185,6 +185,10 @@ StTooltip StLabel {
background-image: url("toggle-on-intl.svg"); background-image: url("toggle-on-intl.svg");
} }
.nm-menu-item-icons {
spacing: .5em;
}
/* Panel */ /* Panel */
#panel { #panel {

22
js/ui/status/network.js
View File

@ -92,16 +92,32 @@ function NMNetworkMenuItem() {
} }
NMNetworkMenuItem.prototype = { NMNetworkMenuItem.prototype = {
__proto__: PopupMenu.PopupImageMenuItem.prototype, __proto__: PopupMenu.PopupBaseMenuItem.prototype,
_init: function(accessPoints, title, params) { _init: function(accessPoints, title, params) {
PopupMenu.PopupBaseMenuItem.prototype._init.call(this, params);
accessPoints = sortAccessPoints(accessPoints); accessPoints = sortAccessPoints(accessPoints);
this.bestAP = accessPoints[0]; this.bestAP = accessPoints[0];
let ssid = this.bestAP.get_ssid(); let ssid = this.bestAP.get_ssid();
title = title || NetworkManager.utils_ssid_to_utf8(ssid) || _("<unknown>"); title = title || NetworkManager.utils_ssid_to_utf8(ssid) || _("<unknown>");
PopupMenu.PopupImageMenuItem.prototype._init.call(this, title, this._getIcon(), params); this._label = new St.Label({ text: title });
this.addActor(this._label);
this._icons = new St.BoxLayout({ style_class: 'nm-menu-item-icons' });
this.addActor(this._icons, { align: St.Align.END });
this._signalIcon = new St.Icon({ icon_name: this._getIcon(),
style_class: 'popup-menu-icon' });
this._icons.add_actor(this._signalIcon);
if (this.bestAP._secType != NMAccessPointSecurity.UNKNOWN &&
this.bestAP._secType != NMAccessPointSecurity.NONE) {
this._secureIcon = new St.Icon({ icon_name: 'network-wireless-encrypted',
style_class: 'popup-menu-icon' });
this._icons.add_actor(this._secureIcon);
}
this._accessPoints = [ ]; this._accessPoints = [ ];
for (let i = 0; i < accessPoints.length; i++) { for (let i = 0; i < accessPoints.length; i++) {
@ -120,7 +136,7 @@ NMNetworkMenuItem.prototype = {
if (strength > this.bestAP.strength) if (strength > this.bestAP.strength)
this.bestAP = ap; this.bestAP = ap;
this.setIcon(this._getIcon()); this._signalIcon.icon_name = this._getIcon();
}, },
_getIcon: function() { _getIcon: function() {