[gnome-shell/wip/aggregate-menu: 78/101] power: Implement new power menu design
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/wip/aggregate-menu: 78/101] power: Implement new power menu design
- Date: Mon, 15 Jul 2013 17:18:25 +0000 (UTC)
commit 8fcdf8198607046cc7f811c9ec1b80484186a21e
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Wed May 22 14:19:00 2013 -0400
power: Implement new power menu design
data/theme/gnome-shell.css | 8 ----
js/ui/status/power.js | 80 +++++++++++++++++++++++++++-----------------
2 files changed, 49 insertions(+), 39 deletions(-)
---
diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 4a0de2e..b0a319d 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -225,10 +225,6 @@ StScrollBar StButton#vhandle:active {
font-weight: bold;
}
-.popup-device-menu-item {
- spacing: .5em;
-}
-
.popup-status-menu-item {
font-weight: normal;
color: #999;
@@ -247,10 +243,6 @@ StScrollBar StButton#vhandle:active {
icon-size: 1.09em;
}
-.popup-battery-percentage {
- padding-left: 24px;
-}
-
/* Switches */
.toggle-switch {
width: 65px;
diff --git a/js/ui/status/power.js b/js/ui/status/power.js
index 20eb545..343344f 100644
--- a/js/ui/status/power.js
+++ b/js/ui/status/power.js
@@ -5,6 +5,7 @@ const Lang = imports.lang;
const St = imports.gi.St;
const UPower = imports.gi.UPowerGlib;
+const Main = imports.ui.main;
const PanelMenu = imports.ui.panelMenu;
const PopupMenu = imports.ui.popupMenu;
@@ -41,47 +42,63 @@ const Indicator = new Lang.Class({
this._devicesChanged();
}));
- this.item = new PopupMenu.PopupMenuItem('', { reactive: false });
- this._primaryPercentage = new St.Label({ style_class: 'popup-battery-percentage' });
- this.item.addActor(this._primaryPercentage, { align: St.Align.END });
- this.menu.addMenuItem(this.item);
+ this._batteryItem = new PopupMenu.PopupSubMenuMenuItem(_("Battery"), true);
+ this._batteryItem.menu.addSettingsAction(_("Power Settings"), 'gnome-power-panel.desktop');
+ this.menu.addMenuItem(this._batteryItem);
+
+ Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
+ this._sessionUpdated();
+ },
+
+ _sessionUpdated: function() {
+ let sensitive = !Main.sessionMode.isLocked && !Main.sessionMode.isGreeter;
+ this.menu.setSensitive(sensitive);
+ },
+
+ _statusForDevice: function(device) {
+ let [device_id, device_type, icon, percentage, state, seconds] = device;
+
+ if (state == UPower.DeviceState.FULLY_CHARGED)
+ return _("Fully Charged");
+
+ let time = Math.round(seconds / 60);
+ if (time == 0) {
+ // 0 is reported when UPower does not have enough data
+ // to estimate battery life
+ return _("Estimating…");
+ }
+
+ let minutes = time % 60;
+ let hours = Math.floor(time / 60);
+
+ if (state == UPower.DeviceState.DISCHARGING) {
+ // Translators: this is <hours>:<minutes> Remaining (<percentage>)
+ return _("%d\u2236%d Remaining (%d%%)".format(hours, minutes, percentage));
+ }
+
+ if (state == UPower.DeviceState.CHARGING) {
+ // Translators: this is <hours>:<minutes> Until Full (<percentage>)
+ return _("%d\u2236%d Until Full (%d%%)".format(hours, minutes, percentage));
+ }
+
+ // state is one of PENDING_CHARGING, PENDING_DISCHARGING
+ return _("Estimating…");
},
_readPrimaryDevice: function() {
this._proxy.GetPrimaryDeviceRemote(Lang.bind(this, function(result, error) {
if (error) {
- this.item.actor.hide();
+ this._batteryItem.actor.hide();
return;
}
- let [[device_id, device_type, icon, percentage, state, seconds]] = result;
+ let [device] = result;
+ let [device_id, device_type] = device;
if (device_type == UPower.DeviceKind.BATTERY) {
- let time = Math.round(seconds / 60);
- if (time == 0) {
- // 0 is reported when UPower does not have enough data
- // to estimate battery life
- this.item.label.text = _("Estimating…");
- } else {
- let minutes = time % 60;
- let hours = Math.floor(time / 60);
- let timestring;
- if (time >= 60) {
- if (minutes == 0) {
- timestring = ngettext("%d hour remaining", "%d hours remaining",
hours).format(hours);
- } else {
- /* TRANSLATORS: this is a time string, as in "%d hours %d minutes remaining" */
- let template = _("%d %s %d %s remaining");
-
- timestring = template.format (hours, ngettext("hour", "hours", hours), minutes,
ngettext("minute", "minutes", minutes));
- }
- } else
- timestring = ngettext("%d minute remaining", "%d minutes remaining",
minutes).format(minutes);
- this.item.label.text = timestring;
- }
- this._primaryPercentage.text = C_("percent of battery remaining",
"%d%%").format(Math.round(percentage));
- this.item.actor.show();
+ this._batteryItem.status.text = this._statusForDevice(device);
+ this._batteryItem.actor.show();
} else {
- this.item.actor.hide();
+ this._batteryItem.actor.hide();
}
}));
},
@@ -93,6 +110,7 @@ const Indicator = new Lang.Class({
if (icon) {
let gicon = Gio.icon_new_for_string(icon);
this.setGIcon(gicon);
+ this._batteryItem.icon.gicon = gicon;
hasIcon = true;
}
this.mainIcon.visible = hasIcon;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]