From e39fb9fd90abfc89fe50b9cffbfeb9cb4333bb7b Mon Sep 17 00:00:00 2001 From: rememberber Date: Sat, 8 Jan 2022 09:32:49 +0800 Subject: [PATCH] add battery wastage indicator --- .../com/luoboduner/moo/info/ui/dialog/AboutDialog.java | 2 +- .../com/luoboduner/moo/info/ui/form/PowerSourceForm.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/luoboduner/moo/info/ui/dialog/AboutDialog.java b/src/main/java/com/luoboduner/moo/info/ui/dialog/AboutDialog.java index 04317a8..a3626b8 100644 --- a/src/main/java/com/luoboduner/moo/info/ui/dialog/AboutDialog.java +++ b/src/main/java/com/luoboduner/moo/info/ui/dialog/AboutDialog.java @@ -43,7 +43,7 @@ public class AboutDialog extends JDialog { public AboutDialog() { super(App.mainFrame, "About"); - ComponentUtil.setPreferSizeAndLocateToCenter(this, 0.4, 0.64); + ComponentUtil.setPreferSizeAndLocateToCenter(this, 0.5, 0.64); setContentPane(contentPane); setModal(true); diff --git a/src/main/java/com/luoboduner/moo/info/ui/form/PowerSourceForm.java b/src/main/java/com/luoboduner/moo/info/ui/form/PowerSourceForm.java index 440ba66..e81e8ad 100644 --- a/src/main/java/com/luoboduner/moo/info/ui/form/PowerSourceForm.java +++ b/src/main/java/com/luoboduner/moo/info/ui/form/PowerSourceForm.java @@ -79,7 +79,9 @@ public class PowerSourceForm { powerNameBuilder.append(powerSource.getName()); powerNameBuilder.append(" ").append(powerSource.getManufacturer()); powerNameBuilder.append(" ").append(powerSource.getDeviceName()); - powerNameBuilder.append(" ").append(powerSource.getChemistry()); + if (!"unknown".equals(powerSource.getChemistry())) { + powerNameBuilder.append(" ").append(powerSource.getChemistry()); + } powerNameLabel.setText(powerNameBuilder.toString()); powerPanel.add(powerNameLabel, new GridConstraints(0, 0, 1, 2, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); @@ -100,7 +102,8 @@ public class PowerSourceForm { capacityBuilder.append("Current ").append(powerSource.getCurrentCapacity()); capacityBuilder.append(" / ").append("Max ").append(powerSource.getMaxCapacity()); capacityBuilder.append(" / ").append("Design ").append(powerSource.getDesignCapacity()); - capacityBuilder.append(" (").append(powerSource.getCapacityUnits()).append(")"); + capacityBuilder.append(" (").append(powerSource.getCapacityUnits()).append(") "); + capacityBuilder.append((powerSource.getDesignCapacity() - powerSource.getMaxCapacity()) * 100 / powerSource.getDesignCapacity()).append("% wastage"); capacityLabel.setText(capacityBuilder.toString()); powerPanel.add(capacityLabel, new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));