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

status/power: Update to new coding style

Browse Source 
https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/4431

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1901>
This commit is contained in:
Florian Müllner 2021-06-28 18:29:23 +02:00 committed by Marge Bot
parent c449058d44
commit 9e9ed42263
1 changed files with 39 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
js/ui/status/power.js
View File

@ -22,13 +22,17 @@ class Indicator extends PanelMenu.SystemIndicator {
_init() { _init() {
super._init(); super._init();
this._desktopSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.interface' }); this._desktopSettings = new Gio.Settings({
this._desktopSettings.connect('changed::%s'.format(SHOW_BATTERY_PERCENTAGE), schema_id: 'org.gnome.desktop.interface',
this._sync.bind(this)); });
this._desktopSettings.connect(
'changed::%s'.format(SHOW_BATTERY_PERCENTAGE), this._sync.bind(this));
this._indicator = this._addIndicator(); this._indicator = this._addIndicator();
this._percentageLabel = new St.Label({ y_expand: true, this._percentageLabel = new St.Label({
y_align: Clutter.ActorAlign.CENTER }); y_expand: true,
y_align: Clutter.ActorAlign.CENTER,
});
this.add_child(this._percentageLabel); this.add_child(this._percentageLabel);
this.add_style_class_name('power-status'); this.add_style_class_name('power-status');
@ -43,8 +47,9 @@ class Indicator extends PanelMenu.SystemIndicator {
this._sync(); this._sync();
}); });
this._item = new PopupMenu.PopupSubMenuMenuItem("", true); this._item = new PopupMenu.PopupSubMenuMenuItem('', true);
this._item.menu.addSettingsAction(_("Power Settings"), 'gnome-power-panel.desktop'); this._item.menu.addSettingsAction(_('Power Settings'),
'gnome-power-panel.desktop');
this.menu.addMenuItem(this._item); this.menu.addMenuItem(this._item);
Main.sessionMode.connect('updated', this._sessionUpdated.bind(this)); Main.sessionMode.connect('updated', this._sessionUpdated.bind(this));
@ -59,36 +64,38 @@ class Indicator extends PanelMenu.SystemIndicator {
_getStatus() { _getStatus() {
let seconds = 0; let seconds = 0;
if (this._proxy.State == UPower.DeviceState.FULLY_CHARGED) if (this._proxy.State === UPower.DeviceState.FULLY_CHARGED)
return _("Fully Charged"); return _('Fully Charged');
else if (this._proxy.State == UPower.DeviceState.CHARGING) else if (this._proxy.State === UPower.DeviceState.CHARGING)
seconds = this._proxy.TimeToFull; seconds = this._proxy.TimeToFull;
else if (this._proxy.State == UPower.DeviceState.DISCHARGING) else if (this._proxy.State === UPower.DeviceState.DISCHARGING)
seconds = this._proxy.TimeToEmpty; seconds = this._proxy.TimeToEmpty;
else if (this._proxy.State == UPower.DeviceState.PENDING_CHARGE) else if (this._proxy.State === UPower.DeviceState.PENDING_CHARGE)
return _("Not Charging"); return _('Not Charging');
// state is PENDING_DISCHARGE // state is PENDING_DISCHARGE
else else
return _("Estimating…"); return _('Estimating…');
let time = Math.round(seconds / 60); let time = Math.round(seconds / 60);
if (time == 0) { if (time === 0) {
// 0 is reported when UPower does not have enough data // 0 is reported when UPower does not have enough data
// to estimate battery life // to estimate battery life
return _("Estimating…"); return _('Estimating…');
} }
let minutes = time % 60; let minutes = time % 60;
let hours = Math.floor(time / 60); let hours = Math.floor(time / 60);
if (this._proxy.State == UPower.DeviceState.DISCHARGING) { if (this._proxy.State === UPower.DeviceState.DISCHARGING) {
// Translators: this is <hours>:<minutes> Remaining (<percentage>) // Translators: this is <hours>:<minutes> Remaining (<percentage>)
return _("%d\u2236%02d Remaining (%d\u2009%%)").format(hours, minutes, this._proxy.Percentage); return _('%d\u2236%02d Remaining (%d\u2009%%)').format(
hours, minutes, this._proxy.Percentage);
} }
if (this._proxy.State == UPower.DeviceState.CHARGING) { if (this._proxy.State === UPower.DeviceState.CHARGING) {
// Translators: this is <hours>:<minutes> Until Full (<percentage>) // Translators: this is <hours>:<minutes> Until Full (<percentage>)
return _("%d\u2236%02d Until Full (%d\u2009%%)").format(hours, minutes, this._proxy.Percentage); return _('%d\u2236%02d Until Full (%d\u2009%%)').format(
hours, minutes, this._proxy.Percentage);
} }
return null; return null;
@ -99,7 +106,8 @@ class Indicator extends PanelMenu.SystemIndicator {
let visible = this._proxy.IsPresent; let visible = this._proxy.IsPresent;
if (visible) { if (visible) {
this._item.show(); this._item.show();
this._percentageLabel.visible = this._desktopSettings.get_boolean(SHOW_BATTERY_PERCENTAGE); this._percentageLabel.visible =
this._desktopSettings.get_boolean(SHOW_BATTERY_PERCENTAGE);
} else { } else {
// If there's no battery, then we use the power icon. // If there's no battery, then we use the power icon.
this._item.hide(); this._item.hide();
@ -109,7 +117,7 @@ class Indicator extends PanelMenu.SystemIndicator {
} }
// The icons // The icons
let chargingState = this._proxy.State == UPower.DeviceState.CHARGING let chargingState = this._proxy.State === UPower.DeviceState.CHARGING
? '-charging' : ''; ? '-charging' : '';
let fillLevel = 10 * Math.floor(this._proxy.Percentage / 10); let fillLevel = 10 * Math.floor(this._proxy.Percentage / 10);
const charged = const charged =