floraachy
/
MooInfo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17 from rememberber/dev 

change default theme of linux
This commit is contained in:
周波 2022-03-25 22:49:13 +08:00 committed by GitHub
parent dc02e10866 69f20912d1
commit 696076e527
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
pom.xml
View File

@ -134,55 +134,55 @@
<plugin> <plugin>
<groupId>io.github.fvarrui</groupId> <groupId>io.github.fvarrui</groupId>
<artifactId>javapackager</artifactId> <artifactId>javapackager</artifactId>
<version>1.6.3</version> <version>1.6.5</version>
<configuration> <configuration>
<bundleJre>true</bundleJre> <bundleJre>true</bundleJre>
<mainClass>com.luoboduner.moo.info.App</mainClass> <mainClass>com.luoboduner.moo.info.App</mainClass>
<generateInstaller>true</generateInstaller> <generateInstaller>true</generateInstaller>
</configuration> </configuration>
<executions> <executions>
<execution> <!-- <execution>-->
<id>bundling-for-windows</id> <!-- <id>bundling-for-windows</id>-->
<phase>package</phase> <!-- <phase>package</phase>-->
<goals> <!-- <goals>-->
<goal>package</goal> <!-- <goal>package</goal>-->
</goals> <!-- </goals>-->
<configuration> <!-- <configuration>-->
<platform>windows</platform> <!-- <platform>windows</platform>-->
<createZipball>true</createZipball> <!-- <createZipball>true</createZipball>-->
<!-- <administratorRequired>true</administratorRequired>--> <!-- &lt;!&ndash; <administratorRequired>true</administratorRequired>&ndash;&gt;-->
<winConfig> <!-- <winConfig>-->
<!-- general properties --> <!-- &lt;!&ndash; general properties &ndash;&gt;-->
<generateSetup>true</generateSetup> <!-- <generateSetup>true</generateSetup>-->
<generateMsi>true</generateMsi> <!-- <generateMsi>true</generateMsi>-->
<generateMsm>true</generateMsm> <!-- <generateMsm>true</generateMsm>-->
<!-- setup generation properties --> <!-- &lt;!&ndash; setup generation properties &ndash;&gt;-->
<setupMode>installForAllUsers</setupMode> <!-- <setupMode>installForAllUsers</setupMode>-->
<createDesktopIconTask>true</createDesktopIconTask> <!-- <createDesktopIconTask>true</createDesktopIconTask>-->
<disableDirPage>false</disableDirPage> <!-- <disableDirPage>false</disableDirPage>-->
<disableFinishedPage>false</disableFinishedPage> <!-- <disableFinishedPage>false</disableFinishedPage>-->
<removeOldLibs>true</removeOldLibs> <!-- <removeOldLibs>true</removeOldLibs>-->
<setupLanguages> <!-- <setupLanguages>-->
<english>compiler:Default.isl</english> <!-- <english>compiler:Default.isl</english>-->
<!-- <spanish>compiler:Languages\Chinese.isl</spanish>--> <!-- &lt;!&ndash; <spanish>compiler:Languages\Chinese.isl</spanish>&ndash;&gt;-->
</setupLanguages> <!-- </setupLanguages>-->
</winConfig> <!-- </winConfig>-->
</configuration> <!-- </configuration>-->
</execution> <!-- </execution>-->
<!-- <execution>--> <execution>
<!-- <id>bundling-for-linux</id>--> <id>bundling-for-linux</id>
<!-- <phase>package</phase>--> <phase>package</phase>
<!-- <goals>--> <goals>
<!-- <goal>package</goal>--> <goal>package</goal>
<!-- </goals>--> </goals>
<!-- <configuration>--> <configuration>
<!-- <platform>linux</platform>--> <platform>linux</platform>
<!-- <createTarball>true</createTarball>--> <createTarball>true</createTarball>
<!--&lt;!&ndash; <jdkPath>X:\\path\to\linux\jdk</jdkPath>&ndash;&gt;--> <!-- <jdkPath>X:\\path\to\linux\jdk</jdkPath>-->
<!-- </configuration>--> </configuration>
<!-- </execution>--> </execution>
<!-- <execution>--> <!-- <execution>-->
<!-- <id>bundling-for-mac</id>--> <!-- <id>bundling-for-mac</id>-->
<!-- <phase>package</phase>--> <!-- <phase>package</phase>-->

6
src/main/java/com/luoboduner/moo/info/util/ConfigUtil.java
View File

@ -65,11 +65,7 @@ public class ConfigUtil extends ConfigBaseUtil {
} }
public String getTheme() { public String getTheme() {
if (SystemUtil.isLinuxOs()) { return setting.getStr("theme", "setting.appearance", "Dark purple");
return setting.getStr("theme", "setting.appearance", "System Default");
} else {
return setting.getStr("theme", "setting.appearance", "Dark purple");
}
} }
public void setTheme(String theme) { public void setTheme(String theme) {