From 9e9ed42263861a742ef570ae4e5a04874addf5fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Mon, 28 Jun 2021 18:29:23 +0200 Subject: [PATCH] status/power: Update to new coding style https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/4431 Part-of: --- js/ui/status/power.js | 70 ++++++++++++++++++++++++------------------- 1 file changed, 39 insertions(+), 31 deletions(-) diff --git a/js/ui/status/power.js b/js/ui/status/power.js index 304f68d47..a43eeb65e 100644 --- a/js/ui/status/power.js +++ b/js/ui/status/power.js @@ -22,29 +22,34 @@ class Indicator extends PanelMenu.SystemIndicator { _init() { super._init(); - this._desktopSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.interface' }); - this._desktopSettings.connect('changed::%s'.format(SHOW_BATTERY_PERCENTAGE), - this._sync.bind(this)); + this._desktopSettings = new Gio.Settings({ + schema_id: 'org.gnome.desktop.interface', + }); + this._desktopSettings.connect( + 'changed::%s'.format(SHOW_BATTERY_PERCENTAGE), this._sync.bind(this)); this._indicator = this._addIndicator(); - this._percentageLabel = new St.Label({ y_expand: true, - y_align: Clutter.ActorAlign.CENTER }); + this._percentageLabel = new St.Label({ + y_expand: true, + y_align: Clutter.ActorAlign.CENTER, + }); this.add_child(this._percentageLabel); this.add_style_class_name('power-status'); this._proxy = new PowerManagerProxy(Gio.DBus.system, BUS_NAME, OBJECT_PATH, - (proxy, error) => { - if (error) { - log(error.message); - return; - } - this._proxy.connect('g-properties-changed', - this._sync.bind(this)); - this._sync(); - }); + (proxy, error) => { + if (error) { + log(error.message); + return; + } + this._proxy.connect('g-properties-changed', + this._sync.bind(this)); + this._sync(); + }); - this._item = new PopupMenu.PopupSubMenuMenuItem("", true); - this._item.menu.addSettingsAction(_("Power Settings"), 'gnome-power-panel.desktop'); + this._item = new PopupMenu.PopupSubMenuMenuItem('', true); + this._item.menu.addSettingsAction(_('Power Settings'), + 'gnome-power-panel.desktop'); this.menu.addMenuItem(this._item); Main.sessionMode.connect('updated', this._sessionUpdated.bind(this)); @@ -59,36 +64,38 @@ class Indicator extends PanelMenu.SystemIndicator { _getStatus() { let seconds = 0; - if (this._proxy.State == UPower.DeviceState.FULLY_CHARGED) - return _("Fully Charged"); - else if (this._proxy.State == UPower.DeviceState.CHARGING) + if (this._proxy.State === UPower.DeviceState.FULLY_CHARGED) + return _('Fully Charged'); + else if (this._proxy.State === UPower.DeviceState.CHARGING) seconds = this._proxy.TimeToFull; - else if (this._proxy.State == UPower.DeviceState.DISCHARGING) + else if (this._proxy.State === UPower.DeviceState.DISCHARGING) seconds = this._proxy.TimeToEmpty; - else if (this._proxy.State == UPower.DeviceState.PENDING_CHARGE) - return _("Not Charging"); + else if (this._proxy.State === UPower.DeviceState.PENDING_CHARGE) + return _('Not Charging'); // state is PENDING_DISCHARGE else - return _("Estimating…"); + return _('Estimating…'); let time = Math.round(seconds / 60); - if (time == 0) { + if (time === 0) { // 0 is reported when UPower does not have enough data // to estimate battery life - return _("Estimating…"); + return _('Estimating…'); } let minutes = 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 : Remaining () - 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 : Until Full () - 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; @@ -99,7 +106,8 @@ class Indicator extends PanelMenu.SystemIndicator { let visible = this._proxy.IsPresent; if (visible) { this._item.show(); - this._percentageLabel.visible = this._desktopSettings.get_boolean(SHOW_BATTERY_PERCENTAGE); + this._percentageLabel.visible = + this._desktopSettings.get_boolean(SHOW_BATTERY_PERCENTAGE); } else { // If there's no battery, then we use the power icon. this._item.hide(); @@ -109,7 +117,7 @@ class Indicator extends PanelMenu.SystemIndicator { } // The icons - let chargingState = this._proxy.State == UPower.DeviceState.CHARGING + let chargingState = this._proxy.State === UPower.DeviceState.CHARGING ? '-charging' : ''; let fillLevel = 10 * Math.floor(this._proxy.Percentage / 10); const charged =