From d5724409d9e211a86662fe82c23b0647d5430569 Mon Sep 17 00:00:00 2001 From: zhoubo58 Date: Tue, 26 Apr 2022 11:19:13 +0800 Subject: [PATCH 01/13] update flatlaf to 2.2 and added theme "Xcode-Dark","Vuesion" --- pom.xml | 6 +++--- .../java/com/luoboduner/moo/info/ui/Init.java | 15 +++++++++++---- .../moo/info/ui/component/TopMenuBar.java | 4 +++- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 2bee1d1..12d42de 100644 --- a/pom.xml +++ b/pom.xml @@ -25,9 +25,9 @@ 3.12.0 31.0.1-jre 4.9.3 - 2.1 - 2.1 - 2.1 + 2.2 + 2.2 + 2.2 5.7.21 1.2.79 6.1.5 diff --git a/src/main/java/com/luoboduner/moo/info/ui/Init.java b/src/main/java/com/luoboduner/moo/info/ui/Init.java index bb665e8..50f8e43 100644 --- a/src/main/java/com/luoboduner/moo/info/ui/Init.java +++ b/src/main/java/com/luoboduner/moo/info/ui/Init.java @@ -3,11 +3,12 @@ package com.luoboduner.moo.info.ui; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.log.Log; import cn.hutool.log.LogFactory; -import com.formdev.flatlaf.*; +import com.formdev.flatlaf.FlatDarculaLaf; +import com.formdev.flatlaf.FlatDarkLaf; +import com.formdev.flatlaf.FlatIntelliJLaf; +import com.formdev.flatlaf.FlatLightLaf; import com.formdev.flatlaf.extras.FlatSVGIcon; -import com.formdev.flatlaf.intellijthemes.FlatCyanLightIJTheme; -import com.formdev.flatlaf.intellijthemes.FlatDarkPurpleIJTheme; -import com.formdev.flatlaf.intellijthemes.FlatLightFlatIJTheme; +import com.formdev.flatlaf.intellijthemes.*; import com.luoboduner.moo.info.App; import com.luoboduner.moo.info.ui.component.TopMenuBar; import com.luoboduner.moo.info.ui.form.*; @@ -111,6 +112,12 @@ public class Init { case "IntelliJ Light": FlatLightFlatIJTheme.setup(); break; + case "Xcode-Dark": + FlatXcodeDarkIJTheme.setup(); + break; + case "Vuesion": + FlatVuesionIJTheme.setup(); + break; default: FlatDarculaLaf.setup(); diff --git a/src/main/java/com/luoboduner/moo/info/ui/component/TopMenuBar.java b/src/main/java/com/luoboduner/moo/info/ui/component/TopMenuBar.java index 82abc33..9bf06b0 100644 --- a/src/main/java/com/luoboduner/moo/info/ui/component/TopMenuBar.java +++ b/src/main/java/com/luoboduner/moo/info/ui/component/TopMenuBar.java @@ -53,7 +53,9 @@ public class TopMenuBar extends JMenuBar { "Flat Darcula(Recommended)", "Dark purple", "IntelliJ Cyan", - "IntelliJ Light"}; + "IntelliJ Light", + "Xcode-Dark", + "Vuesion"}; private static String[] fontNames = GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames(); -- Gitee From 9c776a11498ed5a98ec6eedea6fe3021ae178613 Mon Sep 17 00:00:00 2001 From: RememBerBer Date: Mon, 30 May 2022 11:08:08 +0800 Subject: [PATCH 02/13] upgrade flatlaf to 2.3 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 12d42de..fcabe9e 100644 --- a/pom.xml +++ b/pom.xml @@ -25,9 +25,9 @@ 3.12.0 31.0.1-jre 4.9.3 - 2.2 - 2.2 - 2.2 + 2.3 + 2.3 + 2.3 5.7.21 1.2.79 6.1.5 -- Gitee From b496e1963a198b89511206a90ef30572921ec3c7 Mon Sep 17 00:00:00 2001 From: RememBerBer Date: Tue, 28 Jun 2022 09:41:52 +0800 Subject: [PATCH 03/13] upgrade oshi to 6.2.0 --- pom.xml | 86 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/pom.xml b/pom.xml index fcabe9e..3a104c1 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ 2.3 5.7.21 1.2.79 - 6.1.5 + 6.2.0 1.5.3 @@ -141,48 +141,48 @@ true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bundling-for-linux - package - - package - - - linux - true - - - + + bundling-for-windows + package + + package + + + windows + true + + + + + true + true + true + + + installForAllUsers + true + false + false + true + + compiler:Default.isl + + + + + + + + + + + + + + + + + -- Gitee From 5e590d2c5ac64c26069648b77aa0cbf9cee63771 Mon Sep 17 00:00:00 2001 From: RememBerBer Date: Thu, 30 Jun 2022 14:12:54 +0800 Subject: [PATCH 04/13] upgrade oshi to 6.2.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3a104c1..463b0af 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ 2.3 5.7.21 1.2.79 - 6.2.0 + 6.2.1 1.5.3 -- Gitee From 7d8a242c2b82d6a0cdf38320bf3119d930c17cec Mon Sep 17 00:00:00 2001 From: RememBerBer Date: Mon, 2 Jan 2023 17:39:43 +0800 Subject: [PATCH 05/13] upgrade dependencies --- pom.xml | 22 +++++++++---------- .../moo/info/ui/dialog/UpdateDialog.java | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 463b0af..595c35b 100644 --- a/pom.xml +++ b/pom.xml @@ -18,19 +18,19 @@ 1.8 1.8 - 1.2.10 + 1.4.5 7.0.3 - 1.18.22 - 5.8.2 + 1.18.24 + 5.9.1 3.12.0 - 31.0.1-jre - 4.9.3 - 2.3 - 2.3 - 2.3 - 5.7.21 - 1.2.79 - 6.2.1 + 31.1-jre + 4.10.0 + 3.0 + 3.0 + 3.0 + 5.8.11 + 2.0.22 + 6.4.0 1.5.3 diff --git a/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateDialog.java b/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateDialog.java index 9a7dfb6..38a026e 100644 --- a/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateDialog.java +++ b/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateDialog.java @@ -102,7 +102,7 @@ public class UpdateDialog extends JDialog { } @Override - public void progress(long progressSize) { + public void progress(long progressSize, long totalSize) { progressBarDownload.setValue((int) progressSize); statusLabel.setText("Already download：" + FileUtil.readableFileSize(progressSize)); } -- Gitee From f6bafbbba663e4f187eae9e7ff0566d4b660be3c Mon Sep 17 00:00:00 2001 From: RememBerBer Date: Mon, 2 Jan 2023 17:48:13 +0800 Subject: [PATCH 06/13] upgrade dependencies --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 595c35b..851551d 100644 --- a/pom.xml +++ b/pom.xml @@ -78,12 +78,12 @@ com.squareup.okhttp3 okhttp ${okhttp.version} - - - kotlin-stdlib - org.jetbrains.kotlin - - + + + + + + -- Gitee From b26510d044a4693e3705635445b91b8e168a537c Mon Sep 17 00:00:00 2001 From: zhoubo58 Date: Fri, 14 Apr 2023 18:30:11 +0800 Subject: [PATCH 07/13] fix ssl problem --- pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pom.xml b/pom.xml index 851551d..ff00b52 100644 --- a/pom.xml +++ b/pom.xml @@ -150,6 +150,7 @@ windows true + jdk.crypto.ec @@ -180,6 +181,7 @@ + @@ -192,6 +194,7 @@ + -- Gitee From 1dc528803f8ca9a2e8a83a078724f27d0ca83c5f Mon Sep 17 00:00:00 2001 From: rememberber Date: Mon, 24 Jul 2023 21:45:32 +0800 Subject: [PATCH 08/13] update oshi to 6.4.4 new theme:Flat macOS --- pom.xml | 10 +++++----- src/main/java/com/luoboduner/moo/info/App.java | 8 +++----- src/main/java/com/luoboduner/moo/info/ui/Init.java | 7 ++++++- .../luoboduner/moo/info/ui/component/TopMenuBar.java | 4 +++- .../com/luoboduner/moo/info/ui/form/MainWindow.java | 7 +++++++ .../com/luoboduner/moo/info/ui/frame/MainFrame.java | 9 +++++++++ 6 files changed, 33 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index ff00b52..d5b8230 100644 --- a/pom.xml +++ b/pom.xml @@ -25,12 +25,12 @@ 3.12.0 31.1-jre 4.10.0 - 3.0 - 3.0 - 3.0 + 3.1.1 + 3.1.1 + 3.1.1 5.8.11 2.0.22 - 6.4.0 + 6.4.4 1.5.3 @@ -134,7 +134,7 @@ io.github.fvarrui javapackager - 1.6.5 + 1.7.2 true com.luoboduner.moo.info.App diff --git a/src/main/java/com/luoboduner/moo/info/App.java b/src/main/java/com/luoboduner/moo/info/App.java index 0dfb849..6101c4a 100644 --- a/src/main/java/com/luoboduner/moo/info/App.java +++ b/src/main/java/com/luoboduner/moo/info/App.java @@ -42,9 +42,7 @@ public class App { System.setProperty("apple.laf.useScreenMenuBar", "true"); System.setProperty("apple.awt.application.name", "MooInfo"); System.setProperty("com.apple.mrj.application.apple.menu.about.name", "MooInfo"); - if (UIUtil.isDarkLaf()) { - System.setProperty("apple.awt.application.appearance", "system"); - } + System.setProperty("apple.awt.application.appearance", "system"); FlatDesktop.setAboutHandler(() -> { try { @@ -73,8 +71,8 @@ public class App { Init.initTheme(); // install inspectors - FlatInspector.install( "ctrl shift alt X" ); - FlatUIDefaultsInspector.install( "ctrl shift alt Y" ); + FlatInspector.install("ctrl shift alt X"); + FlatUIDefaultsInspector.install("ctrl shift alt Y"); mainFrame = new MainFrame(); mainFrame.init(); diff --git a/src/main/java/com/luoboduner/moo/info/ui/Init.java b/src/main/java/com/luoboduner/moo/info/ui/Init.java index 50f8e43..3b8b26e 100644 --- a/src/main/java/com/luoboduner/moo/info/ui/Init.java +++ b/src/main/java/com/luoboduner/moo/info/ui/Init.java @@ -118,7 +118,12 @@ public class Init { case "Vuesion": FlatVuesionIJTheme.setup(); break; - + case "Flat macOS Light": + FlatMacLightLaf.setup(); + break; + case "Flat macOS Dark": + FlatMacDarkLaf.setup(); + break; default: FlatDarculaLaf.setup(); } diff --git a/src/main/java/com/luoboduner/moo/info/ui/component/TopMenuBar.java b/src/main/java/com/luoboduner/moo/info/ui/component/TopMenuBar.java index 9bf06b0..8ab0e09 100644 --- a/src/main/java/com/luoboduner/moo/info/ui/component/TopMenuBar.java +++ b/src/main/java/com/luoboduner/moo/info/ui/component/TopMenuBar.java @@ -55,7 +55,9 @@ public class TopMenuBar extends JMenuBar { "IntelliJ Cyan", "IntelliJ Light", "Xcode-Dark", - "Vuesion"}; + "Vuesion", + "Flat macOS Light", + "Flat macOS Dark"}; private static String[] fontNames = GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames(); 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 98e1ac7..a87d253 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 @@ -1,7 +1,9 @@ package com.luoboduner.moo.info.ui.form; +import com.formdev.flatlaf.util.SystemInfo; import com.intellij.uiDesigner.core.GridConstraints; import com.intellij.uiDesigner.core.GridLayoutManager; +import com.luoboduner.moo.info.util.SystemUtil; import lombok.Getter; import javax.swing.*; @@ -44,6 +46,11 @@ public class MainWindow { public void init() { mainWindow = getInstance(); + if (SystemUtil.isMacOs() && SystemInfo.isMacFullWindowContentSupported) { + GridLayoutManager gridLayoutManager = (GridLayoutManager) mainPanel.getLayout(); + gridLayoutManager.setMargin(new Insets(20, 0, 0, 0)); + } + mainWindow.getOverviewPanel().add(OverviewForm.getInstance().getMainPanel(), gridConstraints); mainWindow.getDetailPanel().add(DetailForm.getInstance().getMainPanel(), gridConstraints); mainWindow.getMemoryPanel().add(MemoryForm.getInstance().getMainPanel(), gridConstraints); 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 1ff4afb..fb06a93 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,10 +1,12 @@ package com.luoboduner.moo.info.ui.frame; import com.formdev.flatlaf.extras.FlatSVGUtils; +import com.formdev.flatlaf.util.SystemInfo; 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.SystemUtil; import javax.swing.*; @@ -26,6 +28,13 @@ public class MainFrame extends JFrame { setJMenuBar(topMenuBar); ComponentUtil.setPreferSizeAndLocateToCenter(this, 0.6, 0.8); + if (SystemUtil.isMacOs() && SystemInfo.isMacFullWindowContentSupported) { + this.getRootPane().putClientProperty("apple.awt.fullWindowContent", true); + this.getRootPane().putClientProperty("apple.awt.transparentTitleBar", true); + this.getRootPane().putClientProperty("apple.awt.fullscreenable", true); + this.getRootPane().putClientProperty("apple.awt.windowTitleVisible", false); + } + FrameListener.addListeners(); } -- Gitee From bae9442614fc7a842d19dcc7cf63fcbc91ca881a Mon Sep 17 00:00:00 2001 From: rememberber Date: Mon, 24 Jul 2023 21:50:40 +0800 Subject: [PATCH 09/13] Optimize performance under macOS --- .../luoboduner/moo/info/ui/dialog/AboutDialog.java | 11 +++++++++++ .../luoboduner/moo/info/ui/dialog/SettingDialog.java | 11 +++++++++++ .../moo/info/ui/dialog/SystemEnvResultDialog.java | 11 +++++++++++ .../moo/info/ui/dialog/SystemInfoTestDialog.java | 10 ++++++++++ .../luoboduner/moo/info/ui/dialog/UpdateDialog.form | 2 +- .../luoboduner/moo/info/ui/dialog/UpdateDialog.java | 11 +++++++++++ .../moo/info/ui/dialog/UpdateInfoDialog.form | 4 ++-- .../moo/info/ui/dialog/UpdateInfoDialog.java | 10 ++++++++++ 8 files changed, 67 insertions(+), 3 deletions(-) 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 876a558..25ea0ad 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 @@ -2,6 +2,7 @@ package com.luoboduner.moo.info.ui.dialog; import cn.hutool.core.thread.ThreadUtil; import com.formdev.flatlaf.extras.FlatSVGIcon; +import com.formdev.flatlaf.util.SystemInfo; import com.intellij.uiDesigner.core.GridConstraints; import com.intellij.uiDesigner.core.GridLayoutManager; import com.intellij.uiDesigner.core.Spacer; @@ -9,6 +10,7 @@ import com.luoboduner.moo.info.App; import com.luoboduner.moo.info.ui.UiConsts; import com.luoboduner.moo.info.util.ComponentUtil; import com.luoboduner.moo.info.util.ScrollUtil; +import com.luoboduner.moo.info.util.SystemUtil; import com.luoboduner.moo.info.util.UpgradeUtil; import javax.swing.*; @@ -47,6 +49,15 @@ public class AboutDialog extends JDialog { setContentPane(contentPane); setModal(true); + if (SystemUtil.isMacOs() && SystemInfo.isMacFullWindowContentSupported) { + this.getRootPane().putClientProperty("apple.awt.fullWindowContent", true); + this.getRootPane().putClientProperty("apple.awt.transparentTitleBar", true); + this.getRootPane().putClientProperty("apple.awt.fullscreenable", true); + this.getRootPane().putClientProperty("apple.awt.windowTitleVisible", false); + GridLayoutManager gridLayoutManager = (GridLayoutManager) contentPane.getLayout(); + gridLayoutManager.setMargin(new Insets(28, 0, 0, 0)); + } + setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); addWindowListener(new WindowAdapter() { @Override diff --git a/src/main/java/com/luoboduner/moo/info/ui/dialog/SettingDialog.java b/src/main/java/com/luoboduner/moo/info/ui/dialog/SettingDialog.java index 1e5a0c2..abaafe5 100644 --- a/src/main/java/com/luoboduner/moo/info/ui/dialog/SettingDialog.java +++ b/src/main/java/com/luoboduner/moo/info/ui/dialog/SettingDialog.java @@ -2,12 +2,14 @@ package com.luoboduner.moo.info.ui.dialog; import cn.hutool.log.Log; import cn.hutool.log.LogFactory; +import com.formdev.flatlaf.util.SystemInfo; 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.util.ComponentUtil; import com.luoboduner.moo.info.util.ScrollUtil; +import com.luoboduner.moo.info.util.SystemUtil; import javax.swing.*; import javax.swing.border.TitledBorder; @@ -35,6 +37,15 @@ public class SettingDialog extends JDialog { setContentPane(contentPane); setModal(true); + if (SystemUtil.isMacOs() && SystemInfo.isMacFullWindowContentSupported) { + this.getRootPane().putClientProperty("apple.awt.fullWindowContent", true); + this.getRootPane().putClientProperty("apple.awt.transparentTitleBar", true); + this.getRootPane().putClientProperty("apple.awt.fullscreenable", true); + this.getRootPane().putClientProperty("apple.awt.windowTitleVisible", false); + GridLayoutManager gridLayoutManager = (GridLayoutManager) contentPane.getLayout(); + gridLayoutManager.setMargin(new Insets(28, 0, 0, 0)); + } + setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); addWindowListener(new WindowAdapter() { @Override diff --git a/src/main/java/com/luoboduner/moo/info/ui/dialog/SystemEnvResultDialog.java b/src/main/java/com/luoboduner/moo/info/ui/dialog/SystemEnvResultDialog.java index 1c8fcd4..d577bec 100644 --- a/src/main/java/com/luoboduner/moo/info/ui/dialog/SystemEnvResultDialog.java +++ b/src/main/java/com/luoboduner/moo/info/ui/dialog/SystemEnvResultDialog.java @@ -1,10 +1,12 @@ package com.luoboduner.moo.info.ui.dialog; +import com.formdev.flatlaf.util.SystemInfo; 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.util.ComponentUtil; +import com.luoboduner.moo.info.util.SystemUtil; import javax.swing.*; import javax.swing.border.TitledBorder; @@ -26,6 +28,15 @@ public class SystemEnvResultDialog extends JDialog { setModal(true); getRootPane().setDefaultButton(buttonOK); + if (SystemUtil.isMacOs() && SystemInfo.isMacFullWindowContentSupported) { + this.getRootPane().putClientProperty("apple.awt.fullWindowContent", true); + this.getRootPane().putClientProperty("apple.awt.transparentTitleBar", true); + this.getRootPane().putClientProperty("apple.awt.fullscreenable", true); + this.getRootPane().putClientProperty("apple.awt.windowTitleVisible", false); + GridLayoutManager gridLayoutManager = (GridLayoutManager) contentPane.getLayout(); + gridLayoutManager.setMargin(new Insets(28, 0, 0, 0)); + } + buttonOK.addActionListener(e -> onOK()); setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); diff --git a/src/main/java/com/luoboduner/moo/info/ui/dialog/SystemInfoTestDialog.java b/src/main/java/com/luoboduner/moo/info/ui/dialog/SystemInfoTestDialog.java index 1b83ea5..fb54295 100644 --- a/src/main/java/com/luoboduner/moo/info/ui/dialog/SystemInfoTestDialog.java +++ b/src/main/java/com/luoboduner/moo/info/ui/dialog/SystemInfoTestDialog.java @@ -9,6 +9,7 @@ import com.intellij.uiDesigner.core.Spacer; import com.luoboduner.moo.info.App; import com.luoboduner.moo.info.util.ComponentUtil; import com.luoboduner.moo.info.util.ConsoleUtil; +import com.luoboduner.moo.info.util.SystemUtil; import oshi.SystemInfo; import oshi.hardware.*; import oshi.software.os.*; @@ -38,6 +39,15 @@ public class SystemInfoTestDialog extends JDialog { setModal(true); getRootPane().setDefaultButton(buttonOK); + if (SystemUtil.isMacOs() && com.formdev.flatlaf.util.SystemInfo.isMacFullWindowContentSupported) { + this.getRootPane().putClientProperty("apple.awt.fullWindowContent", true); + this.getRootPane().putClientProperty("apple.awt.transparentTitleBar", true); + this.getRootPane().putClientProperty("apple.awt.fullscreenable", true); + this.getRootPane().putClientProperty("apple.awt.windowTitleVisible", false); + GridLayoutManager gridLayoutManager = (GridLayoutManager) contentPane.getLayout(); + gridLayoutManager.setMargin(new Insets(28, 0, 0, 0)); + } + buttonOK.addActionListener(e -> onOK()); buttonCancel.addActionListener(e -> onCancel()); diff --git a/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateDialog.form b/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateDialog.form index 6180000..0f7220f 100644 --- a/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateDialog.form +++ b/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateDialog.form @@ -9,7 +9,7 @@ - + diff --git a/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateDialog.java b/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateDialog.java index 38a026e..0c328fc 100644 --- a/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateDialog.java +++ b/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateDialog.java @@ -4,11 +4,13 @@ import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.StreamProgress; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.http.HttpUtil; +import com.formdev.flatlaf.util.SystemInfo; 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.util.ComponentUtil; +import com.luoboduner.moo.info.util.SystemUtil; import javax.swing.*; import java.awt.*; @@ -44,6 +46,15 @@ public class UpdateDialog extends JDialog { setModal(true); getRootPane().setDefaultButton(buttonOK); + if (SystemUtil.isMacOs() && SystemInfo.isMacFullWindowContentSupported) { + this.getRootPane().putClientProperty("apple.awt.fullWindowContent", true); + this.getRootPane().putClientProperty("apple.awt.transparentTitleBar", true); + this.getRootPane().putClientProperty("apple.awt.fullscreenable", true); + this.getRootPane().putClientProperty("apple.awt.windowTitleVisible", false); + GridLayoutManager gridLayoutManager = (GridLayoutManager) contentPane.getLayout(); + gridLayoutManager.setMargin(new Insets(28, 0, 0, 0)); + } + ComponentUtil.setPreferSizeAndLocateToCenter(this, 600, 200); buttonOK.addActionListener(e -> onOK()); diff --git a/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateInfoDialog.form b/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateInfoDialog.form index f0bbc7a..1a1df6a 100644 --- a/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateInfoDialog.form +++ b/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateInfoDialog.form @@ -9,7 +9,7 @@ - + @@ -55,7 +55,7 @@ - + diff --git a/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateInfoDialog.java b/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateInfoDialog.java index d3cdd68..2388150 100644 --- a/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateInfoDialog.java +++ b/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateInfoDialog.java @@ -1,5 +1,6 @@ package com.luoboduner.moo.info.ui.dialog; +import com.formdev.flatlaf.util.SystemInfo; import com.intellij.uiDesigner.core.GridConstraints; import com.intellij.uiDesigner.core.GridLayoutManager; import com.intellij.uiDesigner.core.Spacer; @@ -46,6 +47,15 @@ public class UpdateInfoDialog extends JDialog { setModal(true); getRootPane().setDefaultButton(buttonOK); + if (SystemUtil.isMacOs() && SystemInfo.isMacFullWindowContentSupported) { + this.getRootPane().putClientProperty("apple.awt.fullWindowContent", true); + this.getRootPane().putClientProperty("apple.awt.transparentTitleBar", true); + this.getRootPane().putClientProperty("apple.awt.fullscreenable", true); + this.getRootPane().putClientProperty("apple.awt.windowTitleVisible", false); + GridLayoutManager gridLayoutManager = (GridLayoutManager) contentPane.getLayout(); + gridLayoutManager.setMargin(new Insets(28, 0, 0, 0)); + } + ComponentUtil.setPreferSizeAndLocateToCenter(this, 0.4, 0.64); buttonOK.addActionListener(e -> onOK()); -- Gitee From 697fe101cdffad9c9033d1ea2ff2e68ac611de88 Mon Sep 17 00:00:00 2001 From: rememberber Date: Mon, 24 Jul 2023 21:51:44 +0800 Subject: [PATCH 10/13] Optimize performance under macOS --- src/main/java/com/luoboduner/moo/info/ui/Init.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/luoboduner/moo/info/ui/Init.java b/src/main/java/com/luoboduner/moo/info/ui/Init.java index 3b8b26e..755c947 100644 --- a/src/main/java/com/luoboduner/moo/info/ui/Init.java +++ b/src/main/java/com/luoboduner/moo/info/ui/Init.java @@ -9,6 +9,8 @@ import com.formdev.flatlaf.FlatIntelliJLaf; import com.formdev.flatlaf.FlatLightLaf; import com.formdev.flatlaf.extras.FlatSVGIcon; import com.formdev.flatlaf.intellijthemes.*; +import com.formdev.flatlaf.themes.FlatMacDarkLaf; +import com.formdev.flatlaf.themes.FlatMacLightLaf; import com.luoboduner.moo.info.App; import com.luoboduner.moo.info.ui.component.TopMenuBar; import com.luoboduner.moo.info.ui.form.*; -- Gitee From 4e7bbe148008c090d5c93f5c959af6cd619818da Mon Sep 17 00:00:00 2001 From: rememberber Date: Mon, 24 Jul 2023 21:58:25 +0800 Subject: [PATCH 11/13] Optimize performance under macOS --- .../java/com/luoboduner/moo/info/ui/dialog/AboutDialog.form | 2 +- .../java/com/luoboduner/moo/info/ui/dialog/AboutDialog.java | 2 +- .../luoboduner/moo/info/ui/dialog/SystemEnvResultDialog.form | 2 +- .../luoboduner/moo/info/ui/dialog/SystemEnvResultDialog.java | 2 +- .../luoboduner/moo/info/ui/dialog/SystemInfoTestDialog.form | 2 +- .../luoboduner/moo/info/ui/dialog/SystemInfoTestDialog.java | 2 +- .../java/com/luoboduner/moo/info/ui/dialog/UpdateDialog.java | 2 +- .../com/luoboduner/moo/info/ui/dialog/UpdateInfoDialog.java | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) 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 5643344..8d0dd79 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 @@ -16,7 +16,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 25ea0ad..57ea3ba 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 @@ -370,7 +370,7 @@ public class AboutDialog extends JDialog { contentPane.add(scrollPane, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false)); scrollPane.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEmptyBorder(), null, TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, null, null)); final JPanel panel1 = new JPanel(); - panel1.setLayout(new GridLayoutManager(9, 2, new Insets(0, 0, 0, 0), -1, -1)); + panel1.setLayout(new GridLayoutManager(9, 2, new Insets(10, 10, 0, 0), -1, -1)); scrollPane.setViewportView(panel1); panel1.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEmptyBorder(), null, TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, null, null)); logoLabel = new JLabel(); diff --git a/src/main/java/com/luoboduner/moo/info/ui/dialog/SystemEnvResultDialog.form b/src/main/java/com/luoboduner/moo/info/ui/dialog/SystemEnvResultDialog.form index bba7a4c..bd60337 100644 --- a/src/main/java/com/luoboduner/moo/info/ui/dialog/SystemEnvResultDialog.form +++ b/src/main/java/com/luoboduner/moo/info/ui/dialog/SystemEnvResultDialog.form @@ -9,7 +9,7 @@ - + diff --git a/src/main/java/com/luoboduner/moo/info/ui/dialog/SystemEnvResultDialog.java b/src/main/java/com/luoboduner/moo/info/ui/dialog/SystemEnvResultDialog.java index d577bec..713d277 100644 --- a/src/main/java/com/luoboduner/moo/info/ui/dialog/SystemEnvResultDialog.java +++ b/src/main/java/com/luoboduner/moo/info/ui/dialog/SystemEnvResultDialog.java @@ -84,7 +84,7 @@ public class SystemEnvResultDialog extends JDialog { contentPane = new JPanel(); contentPane.setLayout(new GridLayoutManager(2, 1, new Insets(10, 10, 10, 10), -1, -1)); final JPanel panel1 = new JPanel(); - panel1.setLayout(new GridLayoutManager(1, 2, new Insets(0, 0, 0, 0), -1, -1)); + panel1.setLayout(new GridLayoutManager(1, 2, new Insets(0, 0, 10, 10), -1, -1)); contentPane.add(panel1, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, 1, null, null, null, 0, false)); final Spacer spacer1 = new Spacer(); panel1.add(spacer1, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false)); diff --git a/src/main/java/com/luoboduner/moo/info/ui/dialog/SystemInfoTestDialog.form b/src/main/java/com/luoboduner/moo/info/ui/dialog/SystemInfoTestDialog.form index 367eb42..5834343 100644 --- a/src/main/java/com/luoboduner/moo/info/ui/dialog/SystemInfoTestDialog.form +++ b/src/main/java/com/luoboduner/moo/info/ui/dialog/SystemInfoTestDialog.form @@ -9,7 +9,7 @@ - + diff --git a/src/main/java/com/luoboduner/moo/info/ui/dialog/SystemInfoTestDialog.java b/src/main/java/com/luoboduner/moo/info/ui/dialog/SystemInfoTestDialog.java index fb54295..23a028f 100644 --- a/src/main/java/com/luoboduner/moo/info/ui/dialog/SystemInfoTestDialog.java +++ b/src/main/java/com/luoboduner/moo/info/ui/dialog/SystemInfoTestDialog.java @@ -430,7 +430,7 @@ public class SystemInfoTestDialog extends JDialog { contentPane = new JPanel(); contentPane.setLayout(new GridLayoutManager(2, 1, new Insets(10, 10, 10, 10), -1, -1)); final JPanel panel1 = new JPanel(); - panel1.setLayout(new GridLayoutManager(1, 2, new Insets(0, 0, 0, 0), -1, -1)); + panel1.setLayout(new GridLayoutManager(1, 2, new Insets(0, 0, 10, 10), -1, -1)); contentPane.add(panel1, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, 1, null, null, null, 0, false)); final Spacer spacer1 = new Spacer(); panel1.add(spacer1, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false)); diff --git a/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateDialog.java b/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateDialog.java index 0c328fc..e800a14 100644 --- a/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateDialog.java +++ b/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateDialog.java @@ -161,7 +161,7 @@ public class UpdateDialog extends JDialog { contentPane = new JPanel(); contentPane.setLayout(new GridLayoutManager(2, 1, new Insets(10, 10, 10, 10), -1, -1)); final JPanel panel1 = new JPanel(); - panel1.setLayout(new GridLayoutManager(1, 2, new Insets(0, 0, 0, 0), -1, -1)); + panel1.setLayout(new GridLayoutManager(1, 2, new Insets(0, 0, 10, 10), -1, -1)); contentPane.add(panel1, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, 1, null, null, null, 0, false)); final Spacer spacer1 = new Spacer(); panel1.add(spacer1, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false)); diff --git a/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateInfoDialog.java b/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateInfoDialog.java index 2388150..23ed190 100644 --- a/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateInfoDialog.java +++ b/src/main/java/com/luoboduner/moo/info/ui/dialog/UpdateInfoDialog.java @@ -131,7 +131,7 @@ public class UpdateInfoDialog extends JDialog { contentPane = new JPanel(); contentPane.setLayout(new GridLayoutManager(2, 1, new Insets(0, 0, 10, 0), -1, -1)); final JPanel panel1 = new JPanel(); - panel1.setLayout(new GridLayoutManager(1, 3, new Insets(0, 0, 0, 0), -1, -1)); + panel1.setLayout(new GridLayoutManager(1, 3, new Insets(0, 0, 10, 0), -1, -1)); contentPane.add(panel1, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, 1, null, null, null, 0, false)); final Spacer spacer1 = new Spacer(); panel1.add(spacer1, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false)); @@ -147,7 +147,7 @@ public class UpdateInfoDialog extends JDialog { final Spacer spacer2 = new Spacer(); panel1.add(spacer2, new GridConstraints(0, 2, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false)); final JPanel panel3 = new JPanel(); - panel3.setLayout(new GridLayoutManager(1, 1, new Insets(0, 0, 0, 0), -1, -1)); + panel3.setLayout(new GridLayoutManager(1, 1, new Insets(10, 0, 0, 0), -1, -1)); contentPane.add(panel3, 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)); final JScrollPane scrollPane1 = new JScrollPane(); panel3.add(scrollPane1, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false)); -- Gitee From a737e8094b52bb9225311ee8c43a5e43855ba705 Mon Sep 17 00:00:00 2001 From: rememberber Date: Mon, 24 Jul 2023 22:05:24 +0800 Subject: [PATCH 12/13] Optimize performance under macOS --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d5b8230..56e8114 100644 --- a/pom.xml +++ b/pom.xml @@ -15,8 +15,8 @@ UTF-8 UTF-8 - 1.8 - 1.8 + 17 + 17 1.4.5 7.0.3 -- Gitee From 8178acb1d207b7628eeb46dfbe93e3c3832a512a Mon Sep 17 00:00:00 2001 From: rememberber Date: Mon, 24 Jul 2023 22:11:13 +0800 Subject: [PATCH 13/13] 1.1.3 --- pom.xml | 2 +- src/main/java/com/luoboduner/moo/info/ui/UiConsts.java | 2 +- src/main/resources/version_summary.json | 10 ++++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 56e8114..f771a58 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.luoboduner.moo.info MooInfo - 1.1.2 + 1.1.3 jar MooInfo diff --git a/src/main/java/com/luoboduner/moo/info/ui/UiConsts.java b/src/main/java/com/luoboduner/moo/info/ui/UiConsts.java index 38aa068..d365e66 100644 --- a/src/main/java/com/luoboduner/moo/info/ui/UiConsts.java +++ b/src/main/java/com/luoboduner/moo/info/ui/UiConsts.java @@ -11,7 +11,7 @@ import java.awt.*; public class UiConsts { public static final String APP_NAME = "MooInfo"; - public static final String APP_VERSION = "1.1.2"; + public static final String APP_VERSION = "1.1.3"; public static final int TABLE_ROW_HEIGHT = 36; diff --git a/src/main/resources/version_summary.json b/src/main/resources/version_summary.json index 92c1e97..5a32b57 100644 --- a/src/main/resources/version_summary.json +++ b/src/main/resources/version_summary.json @@ -1,11 +1,12 @@ { - "currentVersion": "1.1.2", + "currentVersion": "1.1.3", "versionIndex": { "0.0.0": "0", "1.0.0": "1", "1.1.0": "2", "1.1.1": "3", - "1.1.2": "4" + "1.1.2": "4", + "1.1.3": "5" }, "versionDetailList": [ { @@ -32,6 +33,11 @@ "version": "1.1.2", "title": "update flatlaf to 2.1", "log": "● update flatlaf to 2.1\n● update oshi-core to 6.1.5\n● optimization of cpu indicator\n● update dependencies\n" + }, + { + "version": "1.1.3", + "title": "Optimize performance under macOS", + "log": "● Optimize performance under macOS\n● update oshi to 6.4.4\n● new theme:Flat macOS,Xcode-Dark,Vuesion\n● update dependencies\n" } ] } \ No newline at end of file -- Gitee