Skip to content

Commit

Permalink
Merge pull request #76 from rememberber/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@rememberber
rememberber authored Aug 25, 2023
2 parents e329826 + 6b95b73 commit 567456c
Show file tree
Hide file tree
Showing 51 changed files with 1,147 additions and 450 deletions.
55 changes: 41 additions & 14 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.luoboduner.moo.tool</groupId>
<artifactId>MooTool</artifactId>
<version>1.4.8</version>
<version>1.5.0</version>
<packaging>jar</packaging>

<name>MooTool</name>
Expand Down Expand Up @@ -39,8 +39,20 @@
<rsyntaxtextarea.version>3.3.4</rsyntaxtextarea.version>
<sql-formatter.version>2.0.3</sql-formatter.version>
<google-java-format.version>1.16.0</google-java-format.version>
<jSystemThemeDetector.version>3.8</jSystemThemeDetector.version>
</properties>

<repositories>
<repository>
<id>mvnrepository.com</id>
<url>https://mvnrepository.com</url>
</repository>
<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>junit</groupId>
Expand Down Expand Up @@ -202,6 +214,18 @@
</exclusions>
</dependency>

<dependency>
<groupId>com.github.Dansoftowner</groupId>
<artifactId>jSystemThemeDetector</artifactId>
<version>${jSystemThemeDetector.version}</version>
</dependency>

<dependency>
<groupId>com.sun.jna</groupId>
<artifactId>jna</artifactId>
<version>3.0.9</version>
</dependency>

</dependencies>

<build>
Expand Down Expand Up @@ -237,7 +261,8 @@
<configuration>
<platform>windows</platform>
<createZipball>true</createZipball>
<additionalModules>jdk.crypto.ec,jdk.charsets</additionalModules>
<customizedJre>false</customizedJre>
<additionalModules>jdk.crypto.ec,jdk.charsets,com.jthemedetector</additionalModules>
<administratorRequired>true</administratorRequired>
<winConfig>

Expand Down Expand Up @@ -268,21 +293,23 @@
<!-- <configuration>-->
<!-- <platform>linux</platform>-->
<!-- <createTarball>true</createTarball>-->
<!-- <customizedJre>false</customizedJre>-->
<!-- <additionalModules>jdk.crypto.ec,jdk.charsets</additionalModules>-->
<!-- </configuration>-->
<!-- </execution>-->
<!-- <execution>-->
<!-- <id>bundling-for-mac</id>-->
<!-- <phase>package</phase>-->
<!-- <goals>-->
<!-- <goal>package</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <platform>mac</platform>-->
<!-- <createTarball>true</createTarball>-->
<!-- <additionalModules>jdk.crypto.ec,jdk.charsets</additionalModules>-->
<!-- </configuration>-->
<!-- </execution>-->
<!-- <execution>-->
<!-- <id>bundling-for-mac</id>-->
<!-- <phase>package</phase>-->
<!-- <goals>-->
<!-- <goal>package</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <platform>mac</platform>-->
<!-- <customizedJre>false</customizedJre>-->
<!-- <createTarball>true</createTarball>-->
<!-- <additionalModules>jdk.crypto.ec,jdk.charsets</additionalModules>-->
<!-- </configuration>-->
<!-- </execution>-->
</executions>
</plugin>
</plugins>
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/luoboduner/moo/tool/App.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.formdev.flatlaf.extras.FlatDesktop;
import com.formdev.flatlaf.extras.FlatInspector;
import com.formdev.flatlaf.extras.FlatUIDefaultsInspector;
import com.formdev.flatlaf.fonts.jetbrains_mono.FlatJetBrainsMonoFont;
import com.formdev.flatlaf.util.SystemInfo;
import com.luoboduner.moo.tool.ui.Init;
import com.luoboduner.moo.tool.ui.dialog.AboutDialog;
Expand Down Expand Up @@ -79,6 +80,8 @@ public static void main(String[] args) {
}

FlatLaf.registerCustomDefaultsSource("themes");
SwingUtilities.invokeLater(FlatJetBrainsMonoFont::install);

Init.initTheme();

// install inspectors
Expand Down
128 changes: 69 additions & 59 deletions src/main/java/com/luoboduner/moo/tool/ui/Init.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import com.formdev.flatlaf.intellijthemes.materialthemeuilite.FlatMonokaiProIJTheme;
import com.formdev.flatlaf.themes.FlatMacDarkLaf;
import com.formdev.flatlaf.themes.FlatMacLightLaf;
import com.jthemedetecor.OsThemeDetector;
import com.luoboduner.moo.tool.App;
import com.luoboduner.moo.tool.ui.dialog.FontSizeAdjustDialog;
import com.luoboduner.moo.tool.ui.dialog.SettingDialog;
Expand Down Expand Up @@ -97,66 +98,75 @@ public static void initOthers() {
public static void initTheme() {
try {


switch (App.config.getTheme()) {
case "系统默认":
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
break;
case "Flat Light":
setAccentColor();
FlatLightLaf.setup();
break;
case "Flat IntelliJ":
setAccentColor();
FlatIntelliJLaf.setup();
break;
case "Flat Dark":
setAccentColor();
FlatDarkLaf.setup();
break;
case "Dark purple":
FlatDarkPurpleIJTheme.setup();
break;
case "IntelliJ Cyan":
FlatCyanLightIJTheme.setup();
break;
case "IntelliJ Light":
FlatLightFlatIJTheme.setup();
break;
case "Monocai":
FlatMonocaiIJTheme.setup();
break;
case "Monokai Pro":
FlatMonokaiProIJTheme.setup();
UIManager.put("Button.arc", 5);
break;
case "One Dark":
FlatOneDarkIJTheme.setup();
break;
case "Gray":
FlatGrayIJTheme.setup();
break;
case "High contrast":
FlatHighContrastIJTheme.setup();
break;
case "GitHub Dark":
FlatGitHubDarkIJTheme.setup();
break;
case "Xcode-Dark":
FlatXcodeDarkIJTheme.setup();
break;
case "Vuesion":
FlatVuesionIJTheme.setup();
break;
case "Flat macOS Light":
FlatMacLightLaf.setup();
break;
case "Flat macOS Dark":
if (App.config.isThemeColorFollowSystem()) {
final OsThemeDetector detector = OsThemeDetector.getDetector();
final boolean isDarkThemeUsed = detector.isDark();
if (isDarkThemeUsed) {
FlatMacDarkLaf.setup();
break;
default:
setAccentColor();
FlatDarculaLaf.setup();
} else {
FlatMacLightLaf.setup();
}
} else {
switch (App.config.getTheme()) {
case "系统默认":
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
break;
case "Flat Light":
setAccentColor();
FlatLightLaf.setup();
break;
case "Flat IntelliJ":
setAccentColor();
FlatIntelliJLaf.setup();
break;
case "Flat Dark":
setAccentColor();
FlatDarkLaf.setup();
break;
case "Dark purple":
FlatDarkPurpleIJTheme.setup();
break;
case "IntelliJ Cyan":
FlatCyanLightIJTheme.setup();
break;
case "IntelliJ Light":
FlatLightFlatIJTheme.setup();
break;
case "Monocai":
FlatMonocaiIJTheme.setup();
break;
case "Monokai Pro":
FlatMonokaiProIJTheme.setup();
UIManager.put("Button.arc", 5);
break;
case "One Dark":
FlatOneDarkIJTheme.setup();
break;
case "Gray":
FlatGrayIJTheme.setup();
break;
case "High contrast":
FlatHighContrastIJTheme.setup();
break;
case "GitHub Dark":
FlatGitHubDarkIJTheme.setup();
break;
case "Xcode-Dark":
FlatXcodeDarkIJTheme.setup();
break;
case "Vuesion":
FlatVuesionIJTheme.setup();
break;
case "Flat macOS Light":
FlatMacLightLaf.setup();
break;
case "Flat macOS Dark":
FlatMacDarkLaf.setup();
break;
default:
setAccentColor();
FlatDarculaLaf.setup();
}
}

if (FlatLaf.isLafDark()) {
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/com/luoboduner/moo/tool/ui/Style.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.luoboduner.moo.tool.ui;


import com.formdev.flatlaf.FlatLaf;
import com.luoboduner.moo.tool.ui.form.MainWindow;

import javax.swing.*;
Expand Down Expand Up @@ -48,9 +47,9 @@ public static void emphaticIndicatorFont(JComponent component) {
}

public static void blackTextArea(JComponent component) {
if (FlatLaf.isLafDark()) {
component.setBackground(component.getBackground().darker());
}
// if (FlatLaf.isLafDark()) {
// component.setBackground(component.getBackground().darker());
// }
}

}
11 changes: 6 additions & 5 deletions src/main/java/com/luoboduner/moo/tool/ui/UiConsts.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package com.luoboduner.moo.tool.ui;

import com.formdev.flatlaf.extras.FlatSVGIcon;

import javax.swing.*;
import java.awt.*;

/**
Expand All @@ -16,7 +19,7 @@ public class UiConsts {
* 软件名称,版本
*/
public static final String APP_NAME = "MooTool";
public static final String APP_VERSION = "v1.4.8";
public static final String APP_VERSION = "v1.5.0";

public static final int TABLE_ROW_HEIGHT = 30;

Expand Down Expand Up @@ -77,14 +80,12 @@ public class UiConsts {
/**
* 帮助图标
*/
public static final Image HELP_ICON = Toolkit.getDefaultToolkit()
.getImage(UiConsts.class.getResource("/icon/helpButton.png"));
public final static Icon HELP_ICON = new FlatSVGIcon("icon/help.svg");

/**
* 帮助图标-focused
*/
public static final Image HELP_FOCUSED_ICON = Toolkit.getDefaultToolkit()
.getImage(UiConsts.class.getResource("/icon/helpButtonFocused.png"));
public final static Icon HELP_FOCUSED_ICON = new FlatSVGIcon("icon/help-filling.svg");

/**
* 软件版本检查url
Expand Down
Loading

0 comments on commit 567456c

Please sign in to comment.