diff --git a/src/main/java/com/luoboduner/moo/info/ui/dialog/AboutDialog.form b/src/main/java/com/luoboduner/moo/info/ui/dialog/AboutDialog.form
index 9172b7f..a042495 100644
--- a/src/main/java/com/luoboduner/moo/info/ui/dialog/AboutDialog.form
+++ b/src/main/java/com/luoboduner/moo/info/ui/dialog/AboutDialog.form
@@ -218,7 +218,7 @@
-
+
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 a074fdb..f07c0de 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
@@ -436,7 +436,7 @@ public class AboutDialog extends JDialog {
iconFontLabel.setText("iconfont");
panel6.add(iconFontLabel, new GridConstraints(3, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
final JLabel label6 = new JLabel();
- label6.setText("Some codes and feature were copied from oshi's demo project.");
+ label6.setText("Some codes and feature were copied from the demo project of oshi.");
panel6.add(label6, new GridConstraints(4, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
final JPanel panel7 = new JPanel();
panel7.setLayout(new GridLayoutManager(1, 1, new Insets(5, 3, 20, 0), -1, -1));
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 04a49e3..d3c643e 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
@@ -112,11 +112,15 @@ public class PowerSourceForm {
powerPanel.add(spacer2, new GridConstraints(2, 1, 1, 2, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false));
JLabel label1 = new JLabel();
+ label1.setHorizontalAlignment(SwingConstants.RIGHT);
+ label1.setHorizontalTextPosition(SwingConstants.RIGHT);
+
if (powerSource.isCharging()) {
- label1.setHorizontalAlignment(SwingConstants.RIGHT);
- label1.setHorizontalTextPosition(SwingConstants.RIGHT);
label1.setIcon(new FlatSVGIcon("icons/Charging.svg"));
label1.setText("Charging");
+ } else {
+ label1.setIcon(new FlatSVGIcon("icons/indicator_light.svg"));
+ label1.setText("Remaining Time: " + formatTimeRemaining(powerSource.getTimeRemainingEstimated()));
}
powerPanel.add(label1, new GridConstraints(0, 3, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
diff --git a/src/main/resources/icons/indicator_light.svg b/src/main/resources/icons/indicator_light.svg
new file mode 100644
index 0000000..7f887cc
--- /dev/null
+++ b/src/main/resources/icons/indicator_light.svg
@@ -0,0 +1 @@
+
\ No newline at end of file