Changeset View
Changeset View
Standalone View
Standalone View
applets/batterymonitor/package/contents/ui/batterymonitor.qml
| Show First 20 Lines • Show All 43 Lines • ▼ Show 20 Line(s) | 43 | if (pmSource.data.Battery["Has Cumulative"] | |||
|---|---|---|---|---|---|
| 44 | && pmSource.data["Battery"]["State"] !== "FullyCharged") { | 44 | && pmSource.data["Battery"]["State"] !== "FullyCharged") { | ||
| 45 | return PlasmaCore.Types.ActiveStatus | 45 | return PlasmaCore.Types.ActiveStatus | ||
| 46 | } | 46 | } | ||
| 47 | 47 | | |||
| 48 | return PlasmaCore.Types.PassiveStatus | 48 | return PlasmaCore.Types.PassiveStatus | ||
| 49 | } | 49 | } | ||
| 50 | 50 | | |||
| 51 | Plasmoid.toolTipMainText: { | 51 | Plasmoid.toolTipMainText: { | ||
| 52 | if (batteries.count === 0) { | 52 | if (batteries.count === 0 || !pmSource.data["Battery"]["Has Cumulative"]) { | ||
| 53 | return i18n("No Batteries Available"); | 53 | return plasmoid.title | ||
broulik: You can probably just return `plasmoid.title` in the default case.
Also, what's the reason for… | |||||
You still haven't addressed this. Don't just return when powermanagementDisabled, I would still want to see my battery state when this is the case? broulik: You still haven't addressed this. Don't just `return` when `powermanagementDisabled`, I would… | |||||
OK, would you like to see: mthw: OK, would you like to see:
MainText: Power management disabled
SubText: Battery at X%, HH:MM… | |||||
| 54 | } else if (!pmSource.data["Battery"]["Has Cumulative"]) { | | |||
| 55 | // Bug 362924: Distinguish between no batteries and no power supply batteries | | |||
| 56 | // just show the generic applet title in the latter case | | |||
| 57 | return i18n("Battery and Brightness") | | |||
| 58 | } else if (pmSource.data["Battery"]["State"] === "FullyCharged") { | 54 | } else if (pmSource.data["Battery"]["State"] === "FullyCharged") { | ||
| 59 | return i18n("Fully Charged"); | 55 | return i18n("Fully Charged"); | ||
| 60 | } else if (pmSource.data["AC Adapter"] && pmSource.data["AC Adapter"]["Plugged in"]) { | 56 | } | ||
ngraham: Un-capitalize the B | |||||
| 61 | var percent = pmSource.data.Battery.Percent | 57 | if (pmSource.data["AC Adapter"] && pmSource.data["AC Adapter"]["Plugged in"]) { | ||
| 62 | var state = pmSource.data.Battery.State | 58 | if (pmSource.data.Battery.State === "NoCharge") { | ||
| 63 | if (state === "Charging") { | 59 | return i18n("Battery at %1%, not Charging", pmSource.data.Battery.Percent) | ||
ngraham: un-capitalize the R | |||||
ngraham: Un-capitalize the R | |||||
ngraham: Un-capitalize the B | |||||
| 64 | return i18n("%1% Charging", percent) | | |||
| 65 | } else if (state === "NoCharge") { | | |||
| 66 | return i18n("%1% Plugged in, not Charging", percent) | | |||
| 67 | } else { | | |||
| 68 | return i18n("%1% Plugged in", percent) | | |||
| 69 | } | 60 | } | ||
| 70 | } else { | 61 | } else { | ||
| 71 | if (remainingTime > 0) { | 62 | return i18n("Battery at %1%", pmSource.data.Battery.Percent); | ||
| 72 | return i18nc("%1 is remaining time, %2 is percentage", "%1 Remaining (%2%)", | 63 | } | ||
| 73 | KCoreAddons.Format.formatDuration(remainingTime, KCoreAddons.FormatTypes.HideSeconds), | 64 | } | ||
| 74 | pmSource.data["Battery"]["Percent"]) | 65 | | ||
| 66 | Plasmoid.toolTipSubText: { | ||||
| 67 | var parts = []; | ||||
| 68 | if (batteries.count === 0) { | ||||
When power management is disabled the subtext shows no useful information now. Powermanagement disabled means disabled screen powermanagement (i.e. keep screen always on), has nothing to do with the battery percentage, which is still useful to have. broulik: When power management is disabled the subtext shows no useful information now.
Powermanagement… | |||||
| 69 | parts.push("No Batteries Available"); | ||||
This early return still hasn't been addressed. broulik: This early return still hasn't been addressed.
When I keep the screen on I still want to see my… | |||||
| 70 | } else if (remainingTime > 0) { | ||||
| 71 | var remainingTimeString = KCoreAddons.Format.formatDuration(remainingTime, KCoreAddons.FormatTypes.HideSeconds); | ||||
| 72 | if (pmSource.data["Battery"]["State"] === "FullyCharged") { | ||||
| 73 | // Don't add anything | ||||
| 74 | } else if (pmSource.data["AC Adapter"] && pmSource.data["AC Adapter"]["Plugged in"]) { | ||||
| 75 | parts.push(i18nc("time until fully charged - HH:MM","%1 until fully charged", remainingTimeString)); | ||||
| 75 | } else { | 76 | } else { | ||
ngraham: This block also needs` if (remainingTime > 0) {` like the one below it | |||||
| 76 | return i18n("%1% Battery Remaining", pmSource.data["Battery"]["Percent"]); | 77 | parts.push(i18nc("remaining time left of battery usage - HH:MM","%1 remaining", remainingTimeString)); | ||
broulik: Keep the `i18nc` explaining that %1 is remaining time | |||||
| 77 | } | 78 | } | ||
| 79 | } else if (pmSource.data.Battery.State === "NoCharge") { | ||||
| 80 | return i18n("Not charging") | ||||
broulik: Why this early return? | |||||
| 81 | } // otherwise, don't add anything | ||||
| 82 | | ||||
| 83 | if (powermanagementDisabled) { | ||||
| 84 | parts.push(i18n("Power management is disabled")); | ||||
ngraham: Un-capitalize the B | |||||
| 78 | } | 85 | } | ||
| 86 | return parts.join("\n"); | ||||
broulik: This code path will never be reached | |||||
| 79 | } | 87 | } | ||
broulik: What in the `else` case? Perhaps at least explicitly `return "";` | |||||
| 80 | Plasmoid.toolTipSubText: powermanagementDisabled ? i18n("Power management is disabled") : "" | 88 | | ||
| 81 | Plasmoid.icon: "battery" | 89 | Plasmoid.icon: "battery" | ||
| 82 | 90 | | |||
| 83 | property bool disableBrightnessUpdate: true | 91 | property bool disableBrightnessUpdate: true | ||
| 84 | 92 | | |||
| 85 | property int screenBrightness | 93 | property int screenBrightness | ||
| 86 | readonly property int maximumScreenBrightness: pmSource.data["PowerDevil"] ? pmSource.data["PowerDevil"]["Maximum Screen Brightness"] || 0 : 0 | 94 | readonly property int maximumScreenBrightness: pmSource.data["PowerDevil"] ? pmSource.data["PowerDevil"]["Maximum Screen Brightness"] || 0 : 0 | ||
| 87 | 95 | | |||
| 88 | property int keyboardBrightness | 96 | property int keyboardBrightness | ||
| ▲ Show 20 Lines • Show All 172 Lines • Show Last 20 Lines | |||||
You can probably just return plasmoid.title in the default case.
Also, what's the reason for not showing percentage when power management is disabled? This isn't about the service not running or being a desktop PC, this is true when screens are forced on.