floraachy
/
MooInfo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add battery wastage indicator

This commit is contained in:
rememberber 2022-01-08 09:32:49 +08:00
parent 2ba8aad195
commit e39fb9fd90
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/luoboduner/moo/info/ui/dialog/AboutDialog.java
View File

@ -43,7 +43,7 @@ public class AboutDialog extends JDialog {
public AboutDialog() { public AboutDialog() {
super(App.mainFrame, "About"); super(App.mainFrame, "About");
ComponentUtil.setPreferSizeAndLocateToCenter(this, 0.4, 0.64); ComponentUtil.setPreferSizeAndLocateToCenter(this, 0.5, 0.64);
setContentPane(contentPane); setContentPane(contentPane);
setModal(true); setModal(true);

7
src/main/java/com/luoboduner/moo/info/ui/form/PowerSourceForm.java
View File

@ -79,7 +79,9 @@ public class PowerSourceForm {
powerNameBuilder.append(powerSource.getName()); powerNameBuilder.append(powerSource.getName());
powerNameBuilder.append(" ").append(powerSource.getManufacturer()); powerNameBuilder.append(" ").append(powerSource.getManufacturer());
powerNameBuilder.append(" ").append(powerSource.getDeviceName()); powerNameBuilder.append(" ").append(powerSource.getDeviceName());
powerNameBuilder.append(" ").append(powerSource.getChemistry()); if (!"unknown".equals(powerSource.getChemistry())) {
powerNameBuilder.append(" ").append(powerSource.getChemistry());
}
powerNameLabel.setText(powerNameBuilder.toString()); 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)); 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("Current ").append(powerSource.getCurrentCapacity());
capacityBuilder.append(" / ").append("Max ").append(powerSource.getMaxCapacity()); capacityBuilder.append(" / ").append("Max ").append(powerSource.getMaxCapacity());
capacityBuilder.append(" / ").append("Design ").append(powerSource.getDesignCapacity()); 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()); 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)); 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));