From c7035f87ee61be13404e2d96e367cc4076897195 Mon Sep 17 00:00:00 2001 From: RememBerBer Date: Tue, 23 Nov 2021 14:57:39 +0800 Subject: [PATCH] detail form first step --- .../moo/info/ui/form/DetailForm.java | 68 ++++++++++++++++++- .../moo/info/ui/form/MainWindow.form | 2 +- .../moo/info/ui/form/MainWindow.java | 2 +- 3 files changed, 69 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/luoboduner/moo/info/ui/form/DetailForm.java b/src/main/java/com/luoboduner/moo/info/ui/form/DetailForm.java index 1e00aa6..10e2f44 100644 --- a/src/main/java/com/luoboduner/moo/info/ui/form/DetailForm.java +++ b/src/main/java/com/luoboduner/moo/info/ui/form/DetailForm.java @@ -9,6 +9,7 @@ import com.luoboduner.moo.info.App; import com.luoboduner.moo.info.ui.Style; import com.luoboduner.moo.info.util.ScrollUtil; import lombok.Getter; +import oshi.hardware.Baseboard; import oshi.hardware.ComputerSystem; import oshi.hardware.HardwareAbstractionLayer; import oshi.software.os.OperatingSystem; @@ -76,21 +77,86 @@ public class DetailForm { ScrollUtil.smoothPane(detailForm.scrollPane); Style.emphaticTitleFont(detailForm.getOsLabel()); + Style.emphaticTitleFont(detailForm.getComputerLabel()); + Style.emphaticTitleFont(detailForm.getBaseBoardLabel()); + Style.emphaticTitleFont(detailForm.getCpuLabel()); + Style.emphaticTitleFont(detailForm.getMemoryLabel()); + Style.emphaticTitleFont(detailForm.getStorageLabel()); + Style.emphaticTitleFont(detailForm.getGraphicsCardLabel()); + Style.emphaticTitleFont(detailForm.getDisplayLabel()); + Style.emphaticTitleFont(detailForm.getSoundCardLabel()); + Style.emphaticTitleFont(detailForm.getNetworkLabel()); Style.emphaticTitleFont(detailForm.getPowerSourceLabel()); + Style.emphaticTitleFont(detailForm.getSensorsLabel()); + detailForm.getOsTextPane().setContentType("text/html; charset=utf-8"); + detailForm.getComputerTextPane().setContentType("text/html; charset=utf-8"); + detailForm.getBaseBoardTextPane().setContentType("text/html; charset=utf-8"); + detailForm.getCpuTextPane().setContentType("text/html; charset=utf-8"); + detailForm.getMemoryTextPane().setContentType("text/html; charset=utf-8"); + detailForm.getStorageTextPane().setContentType("text/html; charset=utf-8"); + detailForm.getGraphicsCardTextPane().setContentType("text/html; charset=utf-8"); + detailForm.getDisplayTextPane().setContentType("text/html; charset=utf-8"); + detailForm.getSoundCardTextPane().setContentType("text/html; charset=utf-8"); + detailForm.getNetworkTextPane().setContentType("text/html; charset=utf-8"); detailForm.getPowerSourceTextPane().setContentType("text/html; charset=utf-8"); + detailForm.getSensorsTextPane().setContentType("text/html; charset=utf-8"); } private static void initInfo() { DetailForm detailForm = getInstance(); - OperatingSystem operatingSystem = App.si.getOperatingSystem(); HardwareAbstractionLayer hardware = App.si.getHardware(); ComputerSystem computerSystem = hardware.getComputerSystem(); + detailForm.getOsTextPane().setText(getOsInfo()); + detailForm.getComputerTextPane().setText(getComputerInfo()); detailForm.getPowerSourceTextPane().setText(PowerSourceForm.getPowerInfoText(hardware.getPowerSources())); } + private static String getOsInfo() { + StringBuilder builder = new StringBuilder(); + OperatingSystem operatingSystem = App.si.getOperatingSystem(); + + builder.append("Manufacturer: ").append(operatingSystem.getManufacturer()); + builder.append("
Family: ").append(operatingSystem.getFamily()); + builder.append("
Version: ").append(operatingSystem.getVersionInfo()); + builder.append("
Bitness: ").append(operatingSystem.getBitness()); + builder.append("
Max File Descriptors: ").append(operatingSystem.getFileSystem().getMaxFileDescriptors()); + builder.append("
Open File Descriptors: ").append(operatingSystem.getFileSystem().getOpenFileDescriptors()); + builder.append("
Thread Count: ").append(operatingSystem.getThreadCount()); + builder.append("
Process Count: ").append(operatingSystem.getProcessCount()); + builder.append("
System Boot Time: ").append(operatingSystem.getSystemBootTime()); + builder.append("
System Uptime: ").append(operatingSystem.getSystemUptime()); + + return builder.toString(); + } + + private static String getComputerInfo() { + StringBuilder builder = new StringBuilder(); + ComputerSystem computerSystem = App.si.getHardware().getComputerSystem(); + + builder.append("Manufacturer: ").append(computerSystem.getManufacturer()); + builder.append("
Model: ").append(computerSystem.getModel()); + builder.append("
Serial Number: ").append(computerSystem.getSerialNumber()); + builder.append("
Hardware UUID: ").append(computerSystem.getHardwareUUID()); + builder.append("
Firmware Manufacturer: ").append(computerSystem.getFirmware().getManufacturer()); + builder.append("
Firmware Name: ").append(computerSystem.getFirmware().getName()); + builder.append("
Firmware Description: ").append(computerSystem.getFirmware().getDescription()); + builder.append("
Firmware Version: ").append(computerSystem.getFirmware().getVersion()); + builder.append("
Firmware Release Date: ").append(computerSystem.getFirmware().getReleaseDate()); + + return builder.toString(); + } + + private static String getBaseBoardInfo() { + StringBuilder builder = new StringBuilder(); + Baseboard baseboard = App.si.getHardware().getComputerSystem().getBaseboard(); + + + return builder.toString(); + } + { // GUI initializer generated by IntelliJ IDEA GUI Designer // >>> IMPORTANT!! <<< diff --git a/src/main/java/com/luoboduner/moo/info/ui/form/MainWindow.form b/src/main/java/com/luoboduner/moo/info/ui/form/MainWindow.form index a8283fa..1a6744a 100644 --- a/src/main/java/com/luoboduner/moo/info/ui/form/MainWindow.form +++ b/src/main/java/com/luoboduner/moo/info/ui/form/MainWindow.form @@ -58,7 +58,7 @@ - + diff --git a/src/main/java/com/luoboduner/moo/info/ui/form/MainWindow.java b/src/main/java/com/luoboduner/moo/info/ui/form/MainWindow.java index 9b84c70..98e1ac7 100644 --- a/src/main/java/com/luoboduner/moo/info/ui/form/MainWindow.java +++ b/src/main/java/com/luoboduner/moo/info/ui/form/MainWindow.java @@ -91,7 +91,7 @@ public class MainWindow { tabbedPane.addTab("CPU", cpuPanel); diskPanel = new JPanel(); diskPanel.setLayout(new GridLayoutManager(1, 1, new Insets(0, 0, 0, 0), -1, -1)); - tabbedPane.addTab("Disk", diskPanel); + tabbedPane.addTab("Storage", diskPanel); networkPanel = new JPanel(); networkPanel.setLayout(new GridLayoutManager(1, 1, new Insets(0, 0, 0, 0), -1, -1)); tabbedPane.addTab("Network", networkPanel);