diff --git a/src/main/java/com/luoboduner/moo/info/ui/form/CpuForm.form b/src/main/java/com/luoboduner/moo/info/ui/form/CpuForm.form
index 58a27de..98cef46 100644
--- a/src/main/java/com/luoboduner/moo/info/ui/form/CpuForm.form
+++ b/src/main/java/com/luoboduner/moo/info/ui/form/CpuForm.form
@@ -125,7 +125,7 @@
-
+
diff --git a/src/main/java/com/luoboduner/moo/info/ui/form/CpuForm.java b/src/main/java/com/luoboduner/moo/info/ui/form/CpuForm.java
index 42f7d0c..848986d 100644
--- a/src/main/java/com/luoboduner/moo/info/ui/form/CpuForm.java
+++ b/src/main/java/com/luoboduner/moo/info/ui/form/CpuForm.java
@@ -7,7 +7,6 @@ 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.CentralProcessor;
@@ -99,9 +98,12 @@ public class CpuForm {
CpuForm cpuForm = getInstance();
JTextPane cpuInfoTextPane = cpuForm.getCpuInfoTextPane();
+ CentralProcessor cpu = App.si.getHardware().getProcessor();
StringBuilder sb = new StringBuilder();
- sb.append(App.si.getHardware().getProcessor());
+ sb.append(cpu);
+ sb.append(cpu.getProcessorIdentifier());
cpuInfoTextPane.setText(sb.toString());
+// cpu.getCurrentFreq()
}
private static void initInfo() {
@@ -231,7 +233,7 @@ public class CpuForm {
panel4.setLayout(new GridLayoutManager(1, 1, new Insets(10, 10, 10, 10), -1, -1));
panel3.add(panel4, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
cpuInfoTextPane = new JTextPane();
- cpuInfoTextPane.setEditable(false);
+ cpuInfoTextPane.setEditable(true);
panel4.add(cpuInfoTextPane, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false));
final Spacer spacer2 = new Spacer();
panel3.add(spacer2, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_VERTICAL, 1, GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false));
diff --git a/src/main/java/com/luoboduner/moo/info/ui/frame/MainFrame.java b/src/main/java/com/luoboduner/moo/info/ui/frame/MainFrame.java
index cd2ee92..8823764 100644
--- a/src/main/java/com/luoboduner/moo/info/ui/frame/MainFrame.java
+++ b/src/main/java/com/luoboduner/moo/info/ui/frame/MainFrame.java
@@ -1,11 +1,11 @@
package com.luoboduner.moo.info.ui.frame;
import cn.hutool.core.thread.ThreadUtil;
+import com.formdev.flatlaf.extras.FlatSVGUtils;
import com.luoboduner.moo.info.ui.UiConsts;
import com.luoboduner.moo.info.ui.component.TopMenuBar;
import com.luoboduner.moo.info.ui.listener.FrameListener;
import com.luoboduner.moo.info.util.ComponentUtil;
-import com.luoboduner.moo.info.util.FrameUtil;
import javax.swing.*;
@@ -20,7 +20,8 @@ public class MainFrame extends JFrame {
public void init() {
this.setName(UiConsts.APP_NAME);
this.setTitle(UiConsts.APP_NAME);
- FrameUtil.setFrameIcon(this);
+// FrameUtil.setFrameIcon(this);
+ setIconImages(FlatSVGUtils.createWindowIconImages("/icons/MooInfo.svg"));
TopMenuBar topMenuBar = TopMenuBar.getInstance();
topMenuBar.init();
setJMenuBar(topMenuBar);
diff --git a/src/main/resources/icons/MooInfo.svg b/src/main/resources/icons/MooInfo.svg
new file mode 100644
index 0000000..64500f0
--- /dev/null
+++ b/src/main/resources/icons/MooInfo.svg
@@ -0,0 +1 @@
+
\ No newline at end of file