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

network: Remove separators between device sections

Browse Source 
This is not needed in the new design. Doing this allows us to
remove some complex section visibility tracking, also.

https://bugzilla.gnome.org/show_bug.cgi?id=704670
This commit is contained in:
Jasper St. Pierre 2013-04-26 01:37:19 -04:00
parent f8225141dc
commit 3271e65d56
1 changed files with 16 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1455,7 +1455,6 @@ const NMApplet = new Lang.Class({
})); }));
this._statusSection.actor.hide(); this._statusSection.actor.hide();
this.menu.addMenuItem(this._statusSection); this.menu.addMenuItem(this._statusSection);
this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
this._activeConnections = [ ]; this._activeConnections = [ ];
this._connections = [ ]; this._connections = [ ];
@ -1470,10 +1469,7 @@ const NMApplet = new Lang.Class({
section: new PopupMenu.PopupMenuSection(), section: new PopupMenu.PopupMenuSection(),
devices: [ ], devices: [ ],
}; };
this._devices.wired.section.actor.hide();
this.menu.addMenuItem(this._devices.wired.section); this.menu.addMenuItem(this._devices.wired.section);
this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
this._devices.wireless = { this._devices.wireless = {
section: new PopupMenu.PopupMenuSection(), section: new PopupMenu.PopupMenuSection(),
@ -1481,17 +1477,13 @@ const NMApplet = new Lang.Class({
item: this._makeWirelessToggle() item: this._makeWirelessToggle()
}; };
this._devices.wireless.section.addMenuItem(this._devices.wireless.item); this._devices.wireless.section.addMenuItem(this._devices.wireless.item);
this._devices.wireless.section.actor.hide();
this.menu.addMenuItem(this._devices.wireless.section); this.menu.addMenuItem(this._devices.wireless.section);
this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
this._devices.wwan = { this._devices.wwan = {
section: new PopupMenu.PopupMenuSection(), section: new PopupMenu.PopupMenuSection(),
devices: [ ], devices: [ ],
}; };
this._devices.wwan.section.actor.hide();
this.menu.addMenuItem(this._devices.wwan.section); this.menu.addMenuItem(this._devices.wwan.section);
this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
this._vpnSection = new NMVPNSection(this._client); this._vpnSection = new NMVPNSection(this._client);
this._vpnSection.connect('activation-failed', Lang.bind(this, this._onActivationFailed)); this._vpnSection.connect('activation-failed', Lang.bind(this, this._onActivationFailed));
@ -1539,29 +1531,22 @@ const NMApplet = new Lang.Class({
_syncSectionTitle: function(category) { _syncSectionTitle: function(category) {
let devices = this._devices[category].devices; let devices = this._devices[category].devices;
let item = this._devices[category].item; let item = this._devices[category].item;
let section = this._devices[category].section;
if (devices.length == 0) // Sync the relation between the section title
section.actor.hide(); // item (the one with the airplane mode switch)
else { // and the individual device switches
section.actor.show(); if (item) {
if (devices.length == 1) {
let dev = devices[0];
dev.statusItem.actor.hide();
item.updateForDevice(dev);
} else {
devices.forEach(function(dev) {
dev.statusItem.actor.show();
});
// Sync the relation between the section title // remove status text from the section title item
// item (the one with the airplane mode switch) item.updateForDevice(null);
// and the individual device switches
if (item) {
if (devices.length == 1) {
let dev = devices[0];
dev.statusItem.actor.hide();
item.updateForDevice(dev);
} else {
devices.forEach(function(dev) {
dev.statusItem.actor.show();
});
// remove status text from the section title item
item.updateForDevice(null);
}
} }
} }
}, },
@ -1900,9 +1885,8 @@ const NMApplet = new Lang.Class({
this._statusSection.actor.hide(); this._statusSection.actor.hide();
this._syncSectionTitle(NMConnectionCategory.WIRED); for (let category in this._devices)
this._syncSectionTitle(NMConnectionCategory.WIRELESS); this._devices[category].section.actor.show();
this._syncSectionTitle(NMConnectionCategory.WWAN);
}, },
_syncNMState: function() { _syncNMState: function() {