Skip to content

Commit d6f3638

Browse files
rememberberrememberber
authored
Merge pull request #19 from rememberber/dev
Dev
2 parents 696076e + 8178acb commit d6f3638

19 files changed

+195
-90
lines changed

‎pom.xml‎

Lines changed: 66 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.luoboduner.moo.info</groupId>
88
<artifactId>MooInfo</artifactId>
9-
<version>1.1.2</version>
9+
<version>1.1.3</version>
1010
<packaging>jar</packaging>
1111

1212
<name>MooInfo</name>
@@ -15,22 +15,22 @@
1515
<properties>
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
18-
<maven.compiler.source>1.8</maven.compiler.source>
19-
<maven.compiler.target>1.8</maven.compiler.target>
18+
<maven.compiler.source>17</maven.compiler.source>
19+
<maven.compiler.target>17</maven.compiler.target>
2020

21-
<logback.version>1.2.10</logback.version>
21+
<logback.version>1.4.5</logback.version>
2222
<forms_rt.version>7.0.3</forms_rt.version>
23-
<lombok.version>1.18.22</lombok.version>
24-
<junit-jupiter-api.version>5.8.2</junit-jupiter-api.version>
23+
<lombok.version>1.18.24</lombok.version>
24+
<junit-jupiter-api.version>5.9.1</junit-jupiter-api.version>
2525
<commons-lang3.version>3.12.0</commons-lang3.version>
26-
<guava.version>31.0.1-jre</guava.version>
27-
<okhttp.version>4.9.3</okhttp.version>
28-
<flatlaf.version>2.1</flatlaf.version>
29-
<flatlaf-extras.version>2.1</flatlaf-extras.version>
30-
<flatlaf-intellij-themes.version>2.1</flatlaf-intellij-themes.version>
31-
<hutool-all.version>5.7.21</hutool-all.version>
32-
<fastjson.version>1.2.79</fastjson.version>
33-
<oshi-core.version>6.1.5</oshi-core.version>
26+
<guava.version>31.1-jre</guava.version>
27+
<okhttp.version>4.10.0</okhttp.version>
28+
<flatlaf.version>3.1.1</flatlaf.version>
29+
<flatlaf-extras.version>3.1.1</flatlaf-extras.version>
30+
<flatlaf-intellij-themes.version>3.1.1</flatlaf-intellij-themes.version>
31+
<hutool-all.version>5.8.11</hutool-all.version>
32+
<fastjson.version>2.0.22</fastjson.version>
33+
<oshi-core.version>6.4.4</oshi-core.version>
3434
<jfreechart.version>1.5.3</jfreechart.version>
3535
</properties>
3636

@@ -78,12 +78,12 @@
7878
<groupId>com.squareup.okhttp3</groupId>
7979
<artifactId>okhttp</artifactId>
8080
<version>${okhttp.version}</version>
81-
<exclusions>
82-
<exclusion>
83-
<artifactId>kotlin-stdlib</artifactId>
84-
<groupId>org.jetbrains.kotlin</groupId>
85-
</exclusion>
86-
</exclusions>
81+
<!-- <exclusions>-->
82+
<!-- <exclusion>-->
83+
<!-- <artifactId>kotlin-stdlib</artifactId>-->
84+
<!-- <groupId>org.jetbrains.kotlin</groupId>-->
85+
<!-- </exclusion>-->
86+
<!-- </exclusions>-->
8787
</dependency>
8888

8989
<dependency>
@@ -134,55 +134,57 @@
134134
<plugin>
135135
<groupId>io.github.fvarrui</groupId>
136136
<artifactId>javapackager</artifactId>
137-
<version>1.6.5</version>
137+
<version>1.7.2</version>
138138
<configuration>
139139
<bundleJre>true</bundleJre>
140140
<mainClass>com.luoboduner.moo.info.App</mainClass>
141141
<generateInstaller>true</generateInstaller>
142142
</configuration>
143143
<executions>
144-
<!-- <execution>-->
145-
<!-- <id>bundling-for-windows</id>-->
146-
<!-- <phase>package</phase>-->
147-
<!-- <goals>-->
148-
<!-- <goal>package</goal>-->
149-
<!-- </goals>-->
150-
<!-- <configuration>-->
151-
<!-- <platform>windows</platform>-->
152-
<!-- <createZipball>true</createZipball>-->
153-
<!-- &lt;!&ndash; <administratorRequired>true</administratorRequired>&ndash;&gt;-->
154-
<!-- <winConfig>-->
155-
156-
<!-- &lt;!&ndash; general properties &ndash;&gt;-->
157-
<!-- <generateSetup>true</generateSetup>-->
158-
<!-- <generateMsi>true</generateMsi>-->
159-
<!-- <generateMsm>true</generateMsm>-->
160-
161-
<!-- &lt;!&ndash; setup generation properties &ndash;&gt;-->
162-
<!-- <setupMode>installForAllUsers</setupMode>-->
163-
<!-- <createDesktopIconTask>true</createDesktopIconTask>-->
164-
<!-- <disableDirPage>false</disableDirPage>-->
165-
<!-- <disableFinishedPage>false</disableFinishedPage>-->
166-
<!-- <removeOldLibs>true</removeOldLibs>-->
167-
<!-- <setupLanguages>-->
168-
<!-- <english>compiler:Default.isl</english>-->
169-
<!-- &lt;!&ndash; <spanish>compiler:Languages\Chinese.isl</spanish>&ndash;&gt;-->
170-
<!-- </setupLanguages>-->
171-
<!-- </winConfig>-->
172-
<!-- </configuration>-->
173-
<!-- </execution>-->
174-
<execution>
175-
<id>bundling-for-linux</id>
176-
<phase>package</phase>
177-
<goals>
178-
<goal>package</goal>
179-
</goals>
180-
<configuration>
181-
<platform>linux</platform>
182-
<createTarball>true</createTarball>
183-
<!-- <jdkPath>X:\\path\to\linux\jdk</jdkPath>-->
184-
</configuration>
185-
</execution>
144+
<execution>
145+
<id>bundling-for-windows</id>
146+
<phase>package</phase>
147+
<goals>
148+
<goal>package</goal>
149+
</goals>
150+
<configuration>
151+
<platform>windows</platform>
152+
<createZipball>true</createZipball>
153+
<additionalModules>jdk.crypto.ec</additionalModules>
154+
<!-- <administratorRequired>true</administratorRequired>-->
155+
<winConfig>
156+
157+
<!-- general properties -->
158+
<generateSetup>true</generateSetup>
159+
<generateMsi>true</generateMsi>
160+
<generateMsm>true</generateMsm>
161+
162+
<!-- setup generation properties -->
163+
<setupMode>installForAllUsers</setupMode>
164+
<createDesktopIconTask>true</createDesktopIconTask>
165+
<disableDirPage>false</disableDirPage>
166+
<disableFinishedPage>false</disableFinishedPage>
167+
<removeOldLibs>true</removeOldLibs>
168+
<setupLanguages>
169+
<english>compiler:Default.isl</english>
170+
<!-- <spanish>compiler:Languages\Chinese.isl</spanish>-->
171+
</setupLanguages>
172+
</winConfig>
173+
</configuration>
174+
</execution>
175+
<!-- <execution>-->
176+
<!-- <id>bundling-for-linux</id>-->
177+
<!-- <phase>package</phase>-->
178+
<!-- <goals>-->
179+
<!-- <goal>package</goal>-->
180+
<!-- </goals>-->
181+
<!-- <configuration>-->
182+
<!-- <platform>linux</platform>-->
183+
<!-- <createTarball>true</createTarball>-->
184+
<!-- <additionalModules>jdk.crypto.ec</additionalModules>-->
185+
<!-- &lt;!&ndash; <jdkPath>X:\\path\to\linux\jdk</jdkPath>&ndash;&gt;-->
186+
<!-- </configuration>-->
187+
<!-- </execution>-->
186188
<!-- <execution>-->
187189
<!-- <id>bundling-for-mac</id>-->
188190
<!-- <phase>package</phase>-->
@@ -192,6 +194,7 @@
192194
<!-- <configuration>-->
193195
<!-- <platform>mac</platform>-->
194196
<!-- <createTarball>true</createTarball>-->
197+
<!-- <additionalModules>jdk.crypto.ec</additionalModules>-->
195198
<!-- &lt;!&ndash; <jdkPath>X:\\path\to\mac\jdk</jdkPath>&ndash;&gt;-->
196199
<!-- </configuration>-->
197200
<!-- </execution>-->

‎src/main/java/com/luoboduner/moo/info/App.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,7 @@ public static void main(String[] args) {
4242
System.setProperty("apple.laf.useScreenMenuBar", "true");
4343
System.setProperty("apple.awt.application.name", "MooInfo");
4444
System.setProperty("com.apple.mrj.application.apple.menu.about.name", "MooInfo");
45-
if (UIUtil.isDarkLaf()) {
46-
System.setProperty("apple.awt.application.appearance", "system");
47-
}
45+
System.setProperty("apple.awt.application.appearance", "system");
4846

4947
FlatDesktop.setAboutHandler(() -> {
5048
try {
@@ -73,8 +71,8 @@ public static void main(String[] args) {
7371
Init.initTheme();
7472

7573
// install inspectors
76-
FlatInspector.install( "ctrl shift alt X" );
77-
FlatUIDefaultsInspector.install( "ctrl shift alt Y" );
74+
FlatInspector.install("ctrl shift alt X");
75+
FlatUIDefaultsInspector.install("ctrl shift alt Y");
7876

7977
mainFrame = new MainFrame();
8078
mainFrame.init();

‎src/main/java/com/luoboduner/moo/info/ui/Init.java‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,14 @@
33
import cn.hutool.core.thread.ThreadUtil;
44
import cn.hutool.log.Log;
55
import cn.hutool.log.LogFactory;
6-
import com.formdev.flatlaf.*;
6+
import com.formdev.flatlaf.FlatDarculaLaf;
7+
import com.formdev.flatlaf.FlatDarkLaf;
8+
import com.formdev.flatlaf.FlatIntelliJLaf;
9+
import com.formdev.flatlaf.FlatLightLaf;
710
import com.formdev.flatlaf.extras.FlatSVGIcon;
8-
import com.formdev.flatlaf.intellijthemes.FlatCyanLightIJTheme;
9-
import com.formdev.flatlaf.intellijthemes.FlatDarkPurpleIJTheme;
10-
import com.formdev.flatlaf.intellijthemes.FlatLightFlatIJTheme;
11+
import com.formdev.flatlaf.intellijthemes.*;
12+
import com.formdev.flatlaf.themes.FlatMacDarkLaf;
13+
import com.formdev.flatlaf.themes.FlatMacLightLaf;
1114
import com.luoboduner.moo.info.App;
1215
import com.luoboduner.moo.info.ui.component.TopMenuBar;
1316
import com.luoboduner.moo.info.ui.form.*;
@@ -111,7 +114,18 @@ public static void initTheme() {
111114
case "IntelliJ Light":
112115
FlatLightFlatIJTheme.setup();
113116
break;
114-
117+
case "Xcode-Dark":
118+
FlatXcodeDarkIJTheme.setup();
119+
break;
120+
case "Vuesion":
121+
FlatVuesionIJTheme.setup();
122+
break;
123+
case "Flat macOS Light":
124+
FlatMacLightLaf.setup();
125+
break;
126+
case "Flat macOS Dark":
127+
FlatMacDarkLaf.setup();
128+
break;
115129
default:
116130
FlatDarculaLaf.setup();
117131
}

‎src/main/java/com/luoboduner/moo/info/ui/UiConsts.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
public class UiConsts {
1212

1313
public static final String APP_NAME = "MooInfo";
14-
public static final String APP_VERSION = "1.1.2";
14+
public static final String APP_VERSION = "1.1.3";
1515

1616
public static final int TABLE_ROW_HEIGHT = 36;
1717

‎src/main/java/com/luoboduner/moo/info/ui/component/TopMenuBar.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,11 @@ public class TopMenuBar extends JMenuBar {
5353
"Flat Darcula(Recommended)",
5454
"Dark purple",
5555
"IntelliJ Cyan",
56-
"IntelliJ Light"};
56+
"IntelliJ Light",
57+
"Xcode-Dark",
58+
"Vuesion",
59+
"Flat macOS Light",
60+
"Flat macOS Dark"};
5761

5862
private static String[] fontNames = GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames();
5963

‎src/main/java/com/luoboduner/moo/info/ui/dialog/AboutDialog.form‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<border type="empty"/>
1717
<children>
1818
<grid id="3215c" layout-manager="GridLayoutManager" row-count="9" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
19-
<margin top="0" left="0" bottom="0" right="0"/>
19+
<margin top="10" left="10" bottom="0" right="0"/>
2020
<constraints/>
2121
<properties/>
2222
<border type="empty"/>

‎src/main/java/com/luoboduner/moo/info/ui/dialog/AboutDialog.java‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@
22

33
import cn.hutool.core.thread.ThreadUtil;
44
import com.formdev.flatlaf.extras.FlatSVGIcon;
5+
import com.formdev.flatlaf.util.SystemInfo;
56
import com.intellij.uiDesigner.core.GridConstraints;
67
import com.intellij.uiDesigner.core.GridLayoutManager;
78
import com.intellij.uiDesigner.core.Spacer;
89
import com.luoboduner.moo.info.App;
910
import com.luoboduner.moo.info.ui.UiConsts;
1011
import com.luoboduner.moo.info.util.ComponentUtil;
1112
import com.luoboduner.moo.info.util.ScrollUtil;
13+
import com.luoboduner.moo.info.util.SystemUtil;
1214
import com.luoboduner.moo.info.util.UpgradeUtil;
1315

1416
import javax.swing.*;
@@ -47,6 +49,15 @@ public AboutDialog() {
4749
setContentPane(contentPane);
4850
setModal(true);
4951

52+
if (SystemUtil.isMacOs() && SystemInfo.isMacFullWindowContentSupported) {
53+
this.getRootPane().putClientProperty("apple.awt.fullWindowContent", true);
54+
this.getRootPane().putClientProperty("apple.awt.transparentTitleBar", true);
55+
this.getRootPane().putClientProperty("apple.awt.fullscreenable", true);
56+
this.getRootPane().putClientProperty("apple.awt.windowTitleVisible", false);
57+
GridLayoutManager gridLayoutManager = (GridLayoutManager) contentPane.getLayout();
58+
gridLayoutManager.setMargin(new Insets(28, 0, 0, 0));
59+
}
60+
5061
setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
5162
addWindowListener(new WindowAdapter() {
5263
@Override
@@ -359,7 +370,7 @@ private void onOK() {
359370
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));
360371
scrollPane.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEmptyBorder(), null, TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, null, null));
361372
final JPanel panel1 = new JPanel();
362-
panel1.setLayout(new GridLayoutManager(9, 2, new Insets(0, 0, 0, 0), -1, -1));
373+
panel1.setLayout(new GridLayoutManager(9, 2, new Insets(10, 10, 0, 0), -1, -1));
363374
scrollPane.setViewportView(panel1);
364375
panel1.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEmptyBorder(), null, TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, null, null));
365376
logoLabel = new JLabel();

‎src/main/java/com/luoboduner/moo/info/ui/dialog/SettingDialog.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22

33
import cn.hutool.log.Log;
44
import cn.hutool.log.LogFactory;
5+
import com.formdev.flatlaf.util.SystemInfo;
56
import com.intellij.uiDesigner.core.GridConstraints;
67
import com.intellij.uiDesigner.core.GridLayoutManager;
78
import com.intellij.uiDesigner.core.Spacer;
89
import com.luoboduner.moo.info.App;
910
import com.luoboduner.moo.info.util.ComponentUtil;
1011
import com.luoboduner.moo.info.util.ScrollUtil;
12+
import com.luoboduner.moo.info.util.SystemUtil;
1113

1214
import javax.swing.*;
1315
import javax.swing.border.TitledBorder;
@@ -35,6 +37,15 @@ public SettingDialog() {
3537
setContentPane(contentPane);
3638
setModal(true);
3739

40+
if (SystemUtil.isMacOs() && SystemInfo.isMacFullWindowContentSupported) {
41+
this.getRootPane().putClientProperty("apple.awt.fullWindowContent", true);
42+
this.getRootPane().putClientProperty("apple.awt.transparentTitleBar", true);
43+
this.getRootPane().putClientProperty("apple.awt.fullscreenable", true);
44+
this.getRootPane().putClientProperty("apple.awt.windowTitleVisible", false);
45+
GridLayoutManager gridLayoutManager = (GridLayoutManager) contentPane.getLayout();
46+
gridLayoutManager.setMargin(new Insets(28, 0, 0, 0));
47+
}
48+
3849
setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
3950
addWindowListener(new WindowAdapter() {
4051
@Override

‎src/main/java/com/luoboduner/moo/info/ui/dialog/SystemEnvResultDialog.form‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<border type="none"/>
1010
<children>
1111
<grid id="94766" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
12-
<margin top="0" left="0" bottom="0" right="0"/>
12+
<margin top="0" left="0" bottom="10" right="10"/>
1313
<constraints>
1414
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
1515
</constraints>

0 commit comments

Comments
 (0)