Merge pull request #17 from rememberber/dev

change default theme of linux
rememberber · Mar 25, 2022 · 696076e · 696076e
2 parents dc02e10 + 69f2091
commit 696076e
Show file tree

Hide file tree

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

diff --git a/src/main/java/com/luoboduner/moo/info/util/ConfigUtil.java b/src/main/java/com/luoboduner/moo/info/util/ConfigUtil.java
@@ -65,11 +65,7 @@ public void setBeforeVersion(String beforeVersion) {
     }
 
     public String getTheme() {
-        if (SystemUtil.isLinuxOs()) {
-            return setting.getStr("theme", "setting.appearance", "System Default");
-        } else {
-            return setting.getStr("theme", "setting.appearance", "Dark purple");
-        }
+        return setting.getStr("theme", "setting.appearance", "Dark purple");
     }
 
     public void setTheme(String theme) {