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

Revert "location: Allow user to disable GPS"

Browse Source 
This reverts commit 5d05b669024b7115fc9b6e128961655c5d105d34.

Had a long discussion with Bastien Nocera and Allan Day on IRC about
this and in the end we decided to go with the simple on/off controls for
now.

Conflicts:
	js/ui/status/location.js

https://bugzilla.gnome.org/show_bug.cgi?id=723684
This commit is contained in:
Zeeshan Ali (Khattak) 2014-02-17 15:42:48 +00:00
parent a012ca4fac
commit bec57a6cee
1 changed files with 6 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
js/ui/status/location.js
View File

@ -35,14 +35,6 @@ var AgentIface = '<node> \
</interface> \ </interface> \
</node>'; </node>';
const AccuracyLevel = {
NONE: 0,
COUNTRY: 1,
CITY: 4,
STREET: 6,
EXACT: 8,
};
const Indicator = new Lang.Class({ const Indicator = new Lang.Class({
Name: 'LocationIndicator', Name: 'LocationIndicator',
Extends: PanelMenu.SystemIndicator, Extends: PanelMenu.SystemIndicator,
@ -69,18 +61,6 @@ const Indicator = new Lang.Class({
this._item.status.text = _("On"); this._item.status.text = _("On");
this._onOffAction = this._item.menu.addAction(_("Turn Off"), Lang.bind(this, this._onOnOffAction)); this._onOffAction = this._item.menu.addAction(_("Turn Off"), Lang.bind(this, this._onOnOffAction));
this._accurateItem = new PopupMenu.PopupMenuItem(_("Accurate (GPS + Network)"), false);
this._accurateItem.connect('activate', Lang.bind(this, this._onAccurateItemActivated));
this._item.menu.addMenuItem(this._accurateItem);
this._powerSavingItem = new PopupMenu.PopupMenuItem(_("Power Saving (Network Only)"), false);
this._powerSavingItem.connect('activate', Lang.bind(this, this._onPowerSavingItemActivated));
this._item.menu.addMenuItem(this._powerSavingItem);
this._offItem = new PopupMenu.PopupMenuItem(_("Off"), false);
this._offItem.connect('activate', Lang.bind(this, this._onOffItemActivated));
this._item.menu.addMenuItem(this._offItem);
this.menu.addMenuItem(this._item); this.menu.addMenuItem(this._item);
this._watchId = Gio.bus_watch_name(Gio.BusType.SYSTEM, this._watchId = Gio.bus_watch_name(Gio.BusType.SYSTEM,
@ -170,48 +150,16 @@ const Indicator = new Lang.Class({
if (this._getMaxAccuracyLevel() == 0) if (this._getMaxAccuracyLevel() == 0)
this._settings.set_enum(MAX_ACCURACY_LEVEL, this._availableAccuracyLevel); this._settings.set_enum(MAX_ACCURACY_LEVEL, this._availableAccuracyLevel);
else else
this._settings.set_enum(MAX_ACCURACY_LEVEL, AccuracyLevel.NONE); this._settings.set_enum(MAX_ACCURACY_LEVEL, 0);
},
_onAccurateItemActivated: function() {
this._settings.set_enum(MAX_ACCURACY_LEVEL, AccuracyLevel.EXACT);
},
_onPowerSavingItemActivated: function() {
this._settings.set_enum(MAX_ACCURACY_LEVEL, AccuracyLevel.STREET);
},
_onOffItemActivated: function() {
this._settings.set_enum(MAX_ACCURACY_LEVEL, AccuracyLevel.NONE);
}, },
_onMaxAccuracyLevelChanged: function() { _onMaxAccuracyLevelChanged: function() {
let maxAccuracyLevel = this._getMaxAccuracyLevel(); if (this._getMaxAccuracyLevel() == 0) {
if (this._availableAccuracyLevel < AccuracyLevel.EXACT) { this._item.status.text = _("Off");
if (maxAccuracyLevel == 0) { this._onOffAction.label.text = _("Turn On");
this._item.status.text = _("Off");
this._onOffAction.label.text = _("Turn On");
} else {
this._item.status.text = _("On");
this._onOffAction.label.text = _("Turn Off");
}
} else { } else {
if (maxAccuracyLevel == 0) { this._item.status.text = _("On");
this._item.status.text = _("Off"); this._onOffAction.label.text = _("Turn Off");
this._offItem.setOrnament(PopupMenu.Ornament.DOT);
this._accurateItem.setOrnament(PopupMenu.Ornament.NONE);
this._powerSavingItem.setOrnament(PopupMenu.Ornament.NONE);
} else if (maxAccuracyLevel < AccuracyLevel.EXACT) {
this._item.status.text = _("Power Saving");
this._powerSavingItem.setOrnament(PopupMenu.Ornament.DOT);
this._accurateItem.setOrnament(PopupMenu.Ornament.NONE);
this._offItem.setOrnament(PopupMenu.Ornament.NONE);
} else {
this._item.status.text = _("Accurate");
this._accurateItem.setOrnament(PopupMenu.Ornament.DOT);
this._offItem.setOrnament(PopupMenu.Ornament.NONE);
this._powerSavingItem.setOrnament(PopupMenu.Ornament.NONE);
}
} }
// Gotta ensure geoclue is up and we are registered as agent to it // Gotta ensure geoclue is up and we are registered as agent to it
@ -232,22 +180,6 @@ const Indicator = new Lang.Class({
_updateMenu: function() { _updateMenu: function() {
this._availableAccuracyLevel = this._proxy.AvailableAccuracyLevel; this._availableAccuracyLevel = this._proxy.AvailableAccuracyLevel;
this.menu.actor.visible = (this._availableAccuracyLevel != 0); this.menu.actor.visible = (this._availableAccuracyLevel != 0);
if (this._availableAccuracyLevel == 0)
return;
if (this._availableAccuracyLevel < AccuracyLevel.EXACT) {
this._onOffAction.actor.show();
this._accurateItem.actor.hide();
this._powerSavingItem.actor.hide();
this._offItem.actor.hide();
} else {
this._onOffAction.actor.hide();
this._accurateItem.actor.show();
this._powerSavingItem.actor.show();
this._offItem.actor.show();
}
this._onMaxAccuracyLevelChanged();
}, },
_onGeocluePropsChanged: function(proxy, properties) { _onGeocluePropsChanged: function(proxy, properties) {