Merge pull request #48 from rememberber/develop

Develop
rememberber · Jan 18, 2022 · ffb9a9f · ffb9a9f
2 parents 6978f94 + 6e57499
commit ffb9a9f
Show file tree

Hide file tree

Showing 25 changed files with 924 additions and 229 deletions.
diff --git a/download_links.json b/download_links.json
@@ -0,0 +1,5 @@
+{
+  "windows": "https://gitee.com/zhoubochina/MooTool/attach_files/944394/download/MooTool-1.4.1-windows.exe",
+  "mac": "https://gitee.com/zhoubochina/MooTool/attach_files/944348/download/MooTool_1.4.1.dmg",
+  "linux": "https://gitee.com/zhoubochina/MooTool/attach_files/944310/download/MooTool_1.4.1.deb"
+}
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.luoboduner.moo.tool</groupId>
     <artifactId>MooTool</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2</version>
     <packaging>jar</packaging>
 
     <name>MooTool</name>
@@ -165,6 +165,12 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>com.jayway.jsonpath</groupId>
+            <artifactId>json-path</artifactId>
+            <version>2.6.0</version>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -187,38 +193,38 @@
                     <bundleJre>true</bundleJre>
                     <mainClass>com.luoboduner.moo.tool.App</mainClass>
                     <generateInstaller>true</generateInstaller>
-                    <vmArgs>"--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED","--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED","--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED","--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED","--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"</vmArgs>
+                    <vmArgs>--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</vmArgs>
                 </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>-->
-
-<!--                                &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>-->
-<!--                                <setupLanguages>-->
-<!--                                    <english>compiler:Default.isl</english>-->
-<!--                                    &lt;!&ndash;                                    <spanish>compiler:Languages\Chinese.isl</spanish>&ndash;&gt;-->
-<!--                                </setupLanguages>-->
-<!--                            </winConfig>-->
-<!--                        </configuration>-->
-<!--                    </execution>-->
+                    <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>
+                                <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>-->
@@ -230,18 +236,18 @@
                     <!--                                                <createTarball>true</createTarball>-->
                     <!--                                            </configuration>-->
                     <!--                                        </execution>-->
-                                                            <execution>
-                                                                <id>bundling-for-mac</id>
-                                                                <phase>package</phase>
-                                                                <goals>
-                                                                    <goal>package</goal>
-                                                                </goals>
-                                                                <configuration>
-                                                                    <platform>mac</platform>
-                                                                    <createTarball>true</createTarball>
-                    <!--                                                <jdkPath>X:\\path\to\mac\jdk</jdkPath>-->
-                                                                </configuration>
-                                                            </execution>
+<!--                                                            <execution>-->
+<!--                                                                <id>bundling-for-mac</id>-->
+<!--                                                                <phase>package</phase>-->
+<!--                                                                <goals>-->
+<!--                                                                    <goal>package</goal>-->
+<!--                                                                </goals>-->
+<!--                                                                <configuration>-->
+<!--                                                                    <platform>mac</platform>-->
+<!--                                                                    <createTarball>true</createTarball>-->
+<!--                    &lt;!&ndash;                                                <jdkPath>X:\\path\to\mac\jdk</jdkPath>&ndash;&gt;-->
+<!--                                                                </configuration>-->
+<!--                                                            </execution>-->
                 </executions>
             </plugin>
         </plugins>

diff --git a/screen_shoot/quick_note_mac.png b/screen_shoot/quick_note_mac.png
diff --git a/src/main/java/com/luoboduner/moo/tool/ui/UiConsts.java b/src/main/java/com/luoboduner/moo/tool/ui/UiConsts.java
@@ -16,7 +16,7 @@ public class UiConsts {
      * 软件名称,版本
      */
     public static final String APP_NAME = "MooTool";
-    public static final String APP_VERSION = "v1.4.1";
+    public static final String APP_VERSION = "v1.4.2";
 
     public static final int TABLE_ROW_HEIGHT = 36;
 
@@ -91,6 +91,11 @@ public class UiConsts {
      */
     public static final String CHECK_VERSION_URL = "https://gitee.com/zhoubochina/MooTool/raw/master/src/main/resources/version_summary.json";
 
+    /**
+     * 软件下载链接信息url
+     */
+    public static final String DOWNLOAD_LINK_INFO_URL = "https://gitee.com/zhoubochina/MooTool/raw/develop/download_links.json";
+
     /**
      * 二维码url
      */

diff --git a/src/main/java/com/luoboduner/moo/tool/ui/component/TopMenuBar.java b/src/main/java/com/luoboduner/moo/tool/ui/component/TopMenuBar.java
@@ -48,7 +48,7 @@ public class TopMenuBar extends JMenuBar {
             "IntelliJ Cyan",
             "IntelliJ Light"};
 
-    private static String[] fontNames = GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames();
+    public static String[] fontNames = GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames();
 
     private static String[] fontSizes = {
             "5",
@@ -188,6 +188,29 @@ public void init() {
         aboutMenu.add(aboutMenuItem);
 
         topMenuBar.add(aboutMenu);
+
+        // ---------鼓励和支持
+        JMenu supportMeMenu = new JMenu();
+        supportMeMenu.setText("鼓励和支持");
+
+        // 鼓励和支持
+        JMenuItem supportMeMenuItem = new JMenuItem();
+        supportMeMenuItem.setText("鼓励和支持");
+        supportMeMenuItem.addActionListener(e -> supportMeActionPerformed());
+        supportMeMenu.add(supportMeMenuItem);
+
+        topMenuBar.add(supportMeMenu);
+    }
+
+    private void supportMeActionPerformed() {
+        try {
+            SupportMeDialog dialog = new SupportMeDialog();
+
+            dialog.pack();
+            dialog.setVisible(true);
+        } catch (Exception e2) {
+            logger.error(e2);
+        }
     }
 
     private void syncAndBackupActionPerformed() {
@@ -286,7 +309,7 @@ private void fontSizeChanged(ActionEvent actionEvent) {
     }
 
 
-    private void fontFamilyChanged(ActionEvent actionEvent) {
+    public void fontFamilyChanged(ActionEvent actionEvent) {
         try {
             String selectedFamily = actionEvent.getActionCommand();
 

diff --git a/src/main/java/com/luoboduner/moo/tool/ui/dialog/CurrentHostDialog.form b/src/main/java/com/luoboduner/moo/tool/ui/dialog/CurrentHostDialog.form
@@ -21,7 +21,7 @@
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties/>
-            <border type="none"/>
+            <border type="empty"/>
             <children>
               <component id="a4f03" class="javax.swing.JTextArea" binding="textArea">
                 <constraints/>

diff --git a/src/main/java/com/luoboduner/moo/tool/ui/dialog/CurrentHostDialog.java b/src/main/java/com/luoboduner/moo/tool/ui/dialog/CurrentHostDialog.java
@@ -8,6 +8,7 @@
 import lombok.Getter;
 
 import javax.swing.*;
+import javax.swing.border.TitledBorder;
 import java.awt.*;
 import java.awt.event.KeyEvent;
 import java.awt.event.WindowAdapter;
@@ -83,6 +84,7 @@ public void setPlaneText(String planeText) {
         contentPane.add(panel1, 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();
         panel1.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));
+        scrollPane1.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEmptyBorder(), null, TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, null, null));
         textArea = new JTextArea();
         textArea.setEditable(false);
         scrollPane1.setViewportView(textArea);