From 33cef522307d3e0d046ed5d7b48f06f2aa9ed62a Mon Sep 17 00:00:00 2001
From: RememBerBer <rememberber@163.com>
Date: Mon, 22 Nov 2021 21:52:53 +0800
Subject: [PATCH] power form opt

---
 .../moo/info/ui/form/NetworkForm.java         | 12 +++----
 .../moo/info/ui/form/PowerSourceForm.java     | 36 ++++++++++++++++---
 2 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/luoboduner/moo/info/ui/form/NetworkForm.java b/src/main/java/com/luoboduner/moo/info/ui/form/NetworkForm.java
index e91c282..de981cc 100644
--- a/src/main/java/com/luoboduner/moo/info/ui/form/NetworkForm.java
+++ b/src/main/java/com/luoboduner/moo/info/ui/form/NetworkForm.java
@@ -8,19 +8,14 @@ import com.intellij.uiDesigner.core.GridLayoutManager;
 import com.intellij.uiDesigner.core.Spacer;
 import com.luoboduner.moo.info.App;
 import com.luoboduner.moo.info.ui.Style;
-import com.luoboduner.moo.info.ui.UiConsts;
 import lombok.Getter;
 import oshi.hardware.NetworkIF;
 import oshi.software.os.NetworkParams;
 import oshi.software.os.OperatingSystem;
 import oshi.util.Constants;
 
-import javax.swing.Timer;
 import javax.swing.*;
-import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableColumn;
-import javax.swing.table.TableColumnModel;
-import javax.swing.table.TableModel;
+import javax.swing.table.*;
 import java.awt.*;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
@@ -94,6 +89,11 @@ public class NetworkForm {
         TableModel model = new DefaultTableModel(parseInterfaces(networkIfList), COLUMNS);
         interfacesTable.setModel(model);
         resizeColumns(interfacesTable.getColumnModel());
+
+        DefaultTableCellRenderer hr = (DefaultTableCellRenderer) interfacesTable.getTableHeader()
+                .getDefaultRenderer();
+        // The name of header column turn to left
+        hr.setHorizontalAlignment(DefaultTableCellRenderer.LEFT);
         interfacesTable.setShowGrid(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 d8f2a8c..b7ac39d 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
@@ -7,6 +7,7 @@ import com.intellij.uiDesigner.core.GridConstraints;
 import com.intellij.uiDesigner.core.GridLayoutManager;
 import com.intellij.uiDesigner.core.Spacer;
 import com.luoboduner.moo.info.App;
+import com.luoboduner.moo.info.ui.Style;
 import lombok.Getter;
 import oshi.hardware.PowerSource;
 
@@ -63,18 +64,15 @@ public class PowerSourceForm {
 
         powerBasePanel.setLayout(new GridLayoutManager(powerSources.size(), 1, new Insets(0, 0, 0, 0), -1, -1));
 
-        StringBuilder powerSourceInfoTextBuilder = new StringBuilder();
         for (int i = 0; i < powerSources.size(); i++) {
 
             PowerSource powerSource = powerSources.get(i);
 
-            powerSourceInfoTextBuilder.append(powerSource.toString());
-            powerSourceInfoTextBuilder.append("\n");
-
             JPanel powerPanel = new JPanel();
             powerPanel.setLayout(new GridLayoutManager(3, 4, new Insets(10, 10, 10, 10), -1, -1));
 
             JLabel powerNameLabel = new JLabel();
+            Style.emphaticTitleFont(powerNameLabel);
             StringBuilder powerNameBuilder = new StringBuilder();
             powerNameBuilder.append(powerSource.getName());
             powerNameBuilder.append(" ").append(powerSource.getManufacturer());
@@ -127,10 +125,38 @@ public class PowerSourceForm {
         }
 
         // info textPane
-        powerSourceForm.getPowerInfoTextPane().setText(powerSourceInfoTextBuilder.toString());
+        powerSourceForm.getPowerInfoTextPane().setContentType("text/html; charset=utf-8");
+        powerSourceForm.getPowerInfoTextPane().setText(getPowerInfoText(powerSources));
 
     }
 
+    private static String getPowerInfoText(List<PowerSource> powerSources) {
+        StringBuilder powerInfoBuilder = new StringBuilder();
+
+        for (PowerSource powerSource : powerSources) {
+            powerInfoBuilder.append("<b>Name: </b>").append(powerSource.getName());
+            powerInfoBuilder.append("<br/><b>Device Name: </b>").append(powerSource.getDeviceName());
+            powerInfoBuilder.append("<br/><b>Remaining Capacity Percent: </b>").append(powerSource.getRemainingCapacityPercent() * 100).append("%");
+            powerInfoBuilder.append("<br/><b>Time Remaining: </b>").append(powerSource.getTimeRemainingEstimated());
+            powerInfoBuilder.append("<br/><b>Time Remaining Instant: </b>").append(powerSource.getTimeRemainingInstant());
+            powerInfoBuilder.append("<br/><b>Power Usage Rate: </b>").append(powerSource.getPowerUsageRate());
+            powerInfoBuilder.append("<br/><b>Voltage: </b>").append(powerSource.getVoltage());
+            powerInfoBuilder.append("<br/><b>Amperage: </b>").append(powerSource.getAmperage());
+            powerInfoBuilder.append("<br/><b>Power OnLine: </b>").append(powerSource.isPowerOnLine());
+            powerInfoBuilder.append("<br/><b>Charging: </b>").append(powerSource.isCharging());
+            powerInfoBuilder.append("<br/><b>Discharging: </b>").append(powerSource.isDischarging());
+            powerInfoBuilder.append("<br/><b>Cycle Count: </b>").append(powerSource.getCycleCount());
+            powerInfoBuilder.append("<br/><b>Chemistry: </b>").append(powerSource.getChemistry());
+            powerInfoBuilder.append("<br/><b>Manufacturer: </b>").append(powerSource.getManufacturer());
+            powerInfoBuilder.append("<br/><b>Manufacture Date: </b>").append(powerSource.getManufactureDate());
+            powerInfoBuilder.append("<br/><b>Serial Number: </b>").append(powerSource.getSerialNumber());
+
+            powerInfoBuilder.append("<br/");
+        }
+
+        return powerInfoBuilder.toString();
+    }
+
     {
 // GUI initializer generated by IntelliJ IDEA GUI Designer
 // >>> IMPORTANT!! <<<