From f1634d274e34e851b5cd36959e74071e29f5485a Mon Sep 17 00:00:00 2001 From: zhoubo58 Date: Tue, 13 Oct 2020 11:38:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=8A=A9=E6=89=8B?= =?UTF-8?q?=EF=BC=9A=E5=A2=9E=E5=8A=A0=E5=8F=8C=E5=87=BB=E6=89=93=E5=BC=80?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../moo/tool/ui/listener/func/ImageListener.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/com/luoboduner/moo/tool/ui/listener/func/ImageListener.java b/src/main/java/com/luoboduner/moo/tool/ui/listener/func/ImageListener.java index b66c0598..52a2fd77 100644 --- a/src/main/java/com/luoboduner/moo/tool/ui/listener/func/ImageListener.java +++ b/src/main/java/com/luoboduner/moo/tool/ui/listener/func/ImageListener.java @@ -129,6 +129,15 @@ public class ImageListener { @Override public void mouseClicked(MouseEvent e) { imageForm.getDeletePanel().setVisible(false); + // 双击打开图片 + int clickTimes = e.getClickCount(); + if (clickTimes == 2) { + try { + Desktop.getDesktop().open(FileUtil.file(IMAGE_PATH_PRE_FIX + selectedName + ".png")); + } catch (IOException ex) { + log.error(ExceptionUtils.getStackTrace(ex)); + } + } } @Override From 377300434a557d46bb03d9a20c37c01d49ceeec4 Mon Sep 17 00:00:00 2001 From: duoduo Date: Sun, 27 Dec 2020 17:51:57 +0800 Subject: [PATCH 2/4] release:v1.3.2 --- src/main/java/com/luoboduner/moo/tool/ui/Init.java | 5 ++++- src/main/java/com/luoboduner/moo/tool/ui/UiConsts.java | 2 +- src/main/resources/version_summary.json | 10 ++++++++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/luoboduner/moo/tool/ui/Init.java b/src/main/java/com/luoboduner/moo/tool/ui/Init.java index 8aa5ec07..fba0b936 100644 --- a/src/main/java/com/luoboduner/moo/tool/ui/Init.java +++ b/src/main/java/com/luoboduner/moo/tool/ui/Init.java @@ -37,6 +37,8 @@ import java.awt.*; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.Enumeration; +import java.util.concurrent.ScheduledThreadPoolExecutor; +import java.util.concurrent.TimeUnit; import static java.awt.GraphicsDevice.WindowTranslucency.TRANSLUCENT; @@ -149,7 +151,8 @@ public class Init { // 检查新版版 if (App.config.isAutoCheckUpdate()) { - ThreadUtil.execute(() -> UpgradeUtil.checkUpdate(true)); + ScheduledThreadPoolExecutor threadPoolExecutor = new ScheduledThreadPoolExecutor(1); + threadPoolExecutor.scheduleAtFixedRate(() -> UpgradeUtil.checkUpdate(true), 0, 24, TimeUnit.HOURS); } } diff --git a/src/main/java/com/luoboduner/moo/tool/ui/UiConsts.java b/src/main/java/com/luoboduner/moo/tool/ui/UiConsts.java index 7a70e08c..e890d4b2 100644 --- 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.3.1"; + public static final String APP_VERSION = "v1.3.2"; public static final int TABLE_ROW_HEIGHT = 36; diff --git a/src/main/resources/version_summary.json b/src/main/resources/version_summary.json index 38ebe8f9..d582287a 100644 --- a/src/main/resources/version_summary.json +++ b/src/main/resources/version_summary.json @@ -1,12 +1,13 @@ { - "currentVersion": "v1.3.1", + "currentVersion": "v1.3.2", "versionIndex": { "v0.0.0": "0", "v1.0.0": "1", "v1.1.0": "2", "v1.2.0": "3", "v1.3.0": "4", - "v1.3.1": "5" + "v1.3.1": "5", + "v1.3.2": "6" }, "versionDetailList": [ { @@ -38,6 +39,11 @@ "version": "v1.3.1", "title": "新增图片助手工具", "log": "● 调整随手记和json格式化操作菜单中按钮顺序\n● 优化随手记和json格式化选择和删除项目逻辑\n● 网络工具增加ping功能\n● host切换页签初始化打开卡死问题规避\n● 优化随手记和json格式化替换操作完成后默认从头部开始展示\n● 新增图片助手工具\n" + }, + { + "version": "v1.3.2", + "title": "常规优化", + "log": "● host逻辑优化,修复某些情况下host被覆盖丢失问题\n● 修复图片助手某些情况下文件错乱的问题\n● 全局:列表支持DELETE键盘事件\n● 当前host查看效果优化\n● 图片助手:双击可以打开图片\n" } ] } \ No newline at end of file From 0892994ea129ebacf7a122dc7e5b81cd5953dfee Mon Sep 17 00:00:00 2001 From: duoduo Date: Sun, 27 Dec 2020 18:03:00 +0800 Subject: [PATCH 3/4] release:v1.3.2 --- download.md | 3 +++ .../moo/tool/ui/dialog/FontSizeAdjustDialog.java | 8 +++++++- .../java/com/luoboduner/moo/tool/ui/form/AboutForm.java | 8 +++++++- .../java/com/luoboduner/moo/tool/ui/form/LoadingForm.java | 8 +++++++- .../java/com/luoboduner/moo/tool/ui/form/SettingForm.java | 8 +++++++- .../luoboduner/moo/tool/ui/form/func/CalculatorForm.java | 8 +++++++- .../luoboduner/moo/tool/ui/form/func/ColorBoardForm.java | 8 +++++++- .../luoboduner/moo/tool/ui/form/func/FindResultForm.java | 8 +++++++- .../com/luoboduner/moo/tool/ui/form/func/NetForm.java | 8 +++++++- .../luoboduner/moo/tool/ui/form/func/TimeConvertForm.java | 8 +++++++- 10 files changed, 66 insertions(+), 9 deletions(-) diff --git a/download.md b/download.md index c63bb697..f26758e3 100644 --- a/download.md +++ b/download.md @@ -3,6 +3,7 @@
Windows +[MooTool-v1.3.2-x64-Setup.exe](http://download.zhoubochina.com/moo/exe/MooTool-v1.3.2-x64-Setup.exe) [MooTool-v1.3.0-x64-Setup.exe](http://download.zhoubochina.com/moo/exe/MooTool-v1.3.0-x64-Setup.exe) [MooTool-v1.2.0-x64-Setup.exe](http://download.zhoubochina.com/moo/exe/MooTool-v1.2.0-x64-Setup.exe) [MooTool-v1.1.0-x64-Setup.exe](http://download.zhoubochina.com/moo/exe/MooTool-v1.1.0-x64-Setup.exe) @@ -13,6 +14,7 @@
MacOS +[MooToolWithJre-v1.3.2.zip](http://download.zhoubochina.com/moo/mac/MooToolWithJre-v1.3.2.zip) [MooToolWithJre-v1.2.0.zip](http://download.zhoubochina.com/moo/mac/MooToolWithJre-v1.2.0.zip) [v1.2.0.zip](http://download.zhoubochina.com/moo/mac/MooTool-v1.2.0.zip) [v1.1.0.zip](http://download.zhoubochina.com/moo/mac/MooTool-v1.1.0.zip) @@ -30,6 +32,7 @@
Portable(绿色便携版32/64位) +[v1.3.2.zip](http://download.zhoubochina.com/moo/linux/MooTool-1.3.2.zip) [v1.3.0.zip](http://download.zhoubochina.com/moo/linux/MooTool-1.3.0.zip) [v1.2.0.zip](http://download.zhoubochina.com/moo/linux/MooTool-1.2.0.zip) [v1.1.0.zip](http://download.zhoubochina.com/moo/linux/MooTool-1.1.0.zip) diff --git a/src/main/java/com/luoboduner/moo/tool/ui/dialog/FontSizeAdjustDialog.java b/src/main/java/com/luoboduner/moo/tool/ui/dialog/FontSizeAdjustDialog.java index e3106a26..dda7670e 100644 --- a/src/main/java/com/luoboduner/moo/tool/ui/dialog/FontSizeAdjustDialog.java +++ b/src/main/java/com/luoboduner/moo/tool/ui/dialog/FontSizeAdjustDialog.java @@ -10,10 +10,13 @@ import com.luoboduner.moo.tool.ui.form.SettingForm; import com.luoboduner.moo.tool.util.ComponentUtil; import javax.swing.*; +import javax.swing.plaf.FontUIResource; +import javax.swing.text.StyleContext; import java.awt.*; import java.awt.event.KeyEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.util.Locale; /** *
@@ -136,7 +139,10 @@ public class FontSizeAdjustDialog extends JDialog {
                 resultName = currentFont.getName();
             }
         }
-        return new Font(resultName, style >= 0 ? style : currentFont.getStyle(), size >= 0 ? size : currentFont.getSize());
+        Font font = new Font(resultName, style >= 0 ? style : currentFont.getStyle(), size >= 0 ? size : currentFont.getSize());
+        boolean isMac = System.getProperty("os.name", "").toLowerCase(Locale.ENGLISH).startsWith("mac");
+        Font fontWithFallback = isMac ? new Font(font.getFamily(), font.getStyle(), font.getSize()) : new StyleContext().getFont(font.getFamily(), font.getStyle(), font.getSize());
+        return fontWithFallback instanceof FontUIResource ? fontWithFallback : new FontUIResource(fontWithFallback);
     }
 
     /**
diff --git a/src/main/java/com/luoboduner/moo/tool/ui/form/AboutForm.java b/src/main/java/com/luoboduner/moo/tool/ui/form/AboutForm.java
index c80ac242..64163bdf 100644
--- a/src/main/java/com/luoboduner/moo/tool/ui/form/AboutForm.java
+++ b/src/main/java/com/luoboduner/moo/tool/ui/form/AboutForm.java
@@ -8,7 +8,10 @@ import lombok.Getter;
 
 import javax.swing.*;
 import javax.swing.border.TitledBorder;
+import javax.swing.plaf.FontUIResource;
+import javax.swing.text.StyleContext;
 import java.awt.*;
+import java.util.Locale;
 
 /**
  * 
@@ -202,7 +205,10 @@ public class AboutForm {
                 resultName = currentFont.getName();
             }
         }
-        return new Font(resultName, style >= 0 ? style : currentFont.getStyle(), size >= 0 ? size : currentFont.getSize());
+        Font font = new Font(resultName, style >= 0 ? style : currentFont.getStyle(), size >= 0 ? size : currentFont.getSize());
+        boolean isMac = System.getProperty("os.name", "").toLowerCase(Locale.ENGLISH).startsWith("mac");
+        Font fontWithFallback = isMac ? new Font(font.getFamily(), font.getStyle(), font.getSize()) : new StyleContext().getFont(font.getFamily(), font.getStyle(), font.getSize());
+        return fontWithFallback instanceof FontUIResource ? fontWithFallback : new FontUIResource(fontWithFallback);
     }
 
     /**
diff --git a/src/main/java/com/luoboduner/moo/tool/ui/form/LoadingForm.java b/src/main/java/com/luoboduner/moo/tool/ui/form/LoadingForm.java
index 9a7fbd76..b2cfc5d2 100644
--- a/src/main/java/com/luoboduner/moo/tool/ui/form/LoadingForm.java
+++ b/src/main/java/com/luoboduner/moo/tool/ui/form/LoadingForm.java
@@ -5,7 +5,10 @@ import com.intellij.uiDesigner.core.GridLayoutManager;
 import lombok.Getter;
 
 import javax.swing.*;
+import javax.swing.plaf.FontUIResource;
+import javax.swing.text.StyleContext;
 import java.awt.*;
+import java.util.Locale;
 
 /**
  * 
@@ -61,7 +64,10 @@ public class LoadingForm {
                 resultName = currentFont.getName();
             }
         }
-        return new Font(resultName, style >= 0 ? style : currentFont.getStyle(), size >= 0 ? size : currentFont.getSize());
+        Font font = new Font(resultName, style >= 0 ? style : currentFont.getStyle(), size >= 0 ? size : currentFont.getSize());
+        boolean isMac = System.getProperty("os.name", "").toLowerCase(Locale.ENGLISH).startsWith("mac");
+        Font fontWithFallback = isMac ? new Font(font.getFamily(), font.getStyle(), font.getSize()) : new StyleContext().getFont(font.getFamily(), font.getStyle(), font.getSize());
+        return fontWithFallback instanceof FontUIResource ? fontWithFallback : new FontUIResource(fontWithFallback);
     }
 
     /**
diff --git a/src/main/java/com/luoboduner/moo/tool/ui/form/SettingForm.java b/src/main/java/com/luoboduner/moo/tool/ui/form/SettingForm.java
index 7ee1e5c2..a7f90792 100644
--- a/src/main/java/com/luoboduner/moo/tool/ui/form/SettingForm.java
+++ b/src/main/java/com/luoboduner/moo/tool/ui/form/SettingForm.java
@@ -10,7 +10,10 @@ import org.apache.commons.lang3.StringUtils;
 
 import javax.swing.*;
 import javax.swing.border.TitledBorder;
+import javax.swing.plaf.FontUIResource;
+import javax.swing.text.StyleContext;
 import java.awt.*;
+import java.util.Locale;
 
 /**
  * 
@@ -363,7 +366,10 @@ public class SettingForm {
                 resultName = currentFont.getName();
             }
         }
-        return new Font(resultName, style >= 0 ? style : currentFont.getStyle(), size >= 0 ? size : currentFont.getSize());
+        Font font = new Font(resultName, style >= 0 ? style : currentFont.getStyle(), size >= 0 ? size : currentFont.getSize());
+        boolean isMac = System.getProperty("os.name", "").toLowerCase(Locale.ENGLISH).startsWith("mac");
+        Font fontWithFallback = isMac ? new Font(font.getFamily(), font.getStyle(), font.getSize()) : new StyleContext().getFont(font.getFamily(), font.getStyle(), font.getSize());
+        return fontWithFallback instanceof FontUIResource ? fontWithFallback : new FontUIResource(fontWithFallback);
     }
 
 }
diff --git a/src/main/java/com/luoboduner/moo/tool/ui/form/func/CalculatorForm.java b/src/main/java/com/luoboduner/moo/tool/ui/form/func/CalculatorForm.java
index 56591ef6..c7492490 100644
--- a/src/main/java/com/luoboduner/moo/tool/ui/form/func/CalculatorForm.java
+++ b/src/main/java/com/luoboduner/moo/tool/ui/form/func/CalculatorForm.java
@@ -14,7 +14,10 @@ import org.apache.commons.lang3.exception.ExceptionUtils;
 
 import javax.swing.*;
 import javax.swing.border.TitledBorder;
+import javax.swing.plaf.FontUIResource;
+import javax.swing.text.StyleContext;
 import java.awt.*;
+import java.util.Locale;
 
 /**
  * 
@@ -320,7 +323,10 @@ public class CalculatorForm {
                 resultName = currentFont.getName();
             }
         }
-        return new Font(resultName, style >= 0 ? style : currentFont.getStyle(), size >= 0 ? size : currentFont.getSize());
+        Font font = new Font(resultName, style >= 0 ? style : currentFont.getStyle(), size >= 0 ? size : currentFont.getSize());
+        boolean isMac = System.getProperty("os.name", "").toLowerCase(Locale.ENGLISH).startsWith("mac");
+        Font fontWithFallback = isMac ? new Font(font.getFamily(), font.getStyle(), font.getSize()) : new StyleContext().getFont(font.getFamily(), font.getStyle(), font.getSize());
+        return fontWithFallback instanceof FontUIResource ? fontWithFallback : new FontUIResource(fontWithFallback);
     }
 
     /**
diff --git a/src/main/java/com/luoboduner/moo/tool/ui/form/func/ColorBoardForm.java b/src/main/java/com/luoboduner/moo/tool/ui/form/func/ColorBoardForm.java
index 75b5306c..05c1ca02 100644
--- a/src/main/java/com/luoboduner/moo/tool/ui/form/func/ColorBoardForm.java
+++ b/src/main/java/com/luoboduner/moo/tool/ui/form/func/ColorBoardForm.java
@@ -12,9 +12,12 @@ import lombok.Getter;
 
 import javax.swing.*;
 import javax.swing.border.TitledBorder;
+import javax.swing.plaf.FontUIResource;
+import javax.swing.text.StyleContext;
 import java.awt.*;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.util.Locale;
 
 /**
  * 
@@ -294,7 +297,10 @@ public class ColorBoardForm {
                 resultName = currentFont.getName();
             }
         }
-        return new Font(resultName, style >= 0 ? style : currentFont.getStyle(), size >= 0 ? size : currentFont.getSize());
+        Font font = new Font(resultName, style >= 0 ? style : currentFont.getStyle(), size >= 0 ? size : currentFont.getSize());
+        boolean isMac = System.getProperty("os.name", "").toLowerCase(Locale.ENGLISH).startsWith("mac");
+        Font fontWithFallback = isMac ? new Font(font.getFamily(), font.getStyle(), font.getSize()) : new StyleContext().getFont(font.getFamily(), font.getStyle(), font.getSize());
+        return fontWithFallback instanceof FontUIResource ? fontWithFallback : new FontUIResource(fontWithFallback);
     }
 
     /**
diff --git a/src/main/java/com/luoboduner/moo/tool/ui/form/func/FindResultForm.java b/src/main/java/com/luoboduner/moo/tool/ui/form/func/FindResultForm.java
index 94a342f6..e206840d 100644
--- a/src/main/java/com/luoboduner/moo/tool/ui/form/func/FindResultForm.java
+++ b/src/main/java/com/luoboduner/moo/tool/ui/form/func/FindResultForm.java
@@ -9,10 +9,13 @@ import com.luoboduner.moo.tool.util.UndoUtil;
 import lombok.Getter;
 
 import javax.swing.*;
+import javax.swing.plaf.FontUIResource;
+import javax.swing.text.StyleContext;
 import javax.swing.text.html.HTMLEditorKit;
 import javax.swing.text.html.StyleSheet;
 import java.awt.*;
 import java.awt.event.KeyEvent;
+import java.util.Locale;
 
 /**
  * 
@@ -125,7 +128,10 @@ public class FindResultForm {
                 resultName = currentFont.getName();
             }
         }
-        return new Font(resultName, style >= 0 ? style : currentFont.getStyle(), size >= 0 ? size : currentFont.getSize());
+        Font font = new Font(resultName, style >= 0 ? style : currentFont.getStyle(), size >= 0 ? size : currentFont.getSize());
+        boolean isMac = System.getProperty("os.name", "").toLowerCase(Locale.ENGLISH).startsWith("mac");
+        Font fontWithFallback = isMac ? new Font(font.getFamily(), font.getStyle(), font.getSize()) : new StyleContext().getFont(font.getFamily(), font.getStyle(), font.getSize());
+        return fontWithFallback instanceof FontUIResource ? fontWithFallback : new FontUIResource(fontWithFallback);
     }
 
     /**
diff --git a/src/main/java/com/luoboduner/moo/tool/ui/form/func/NetForm.java b/src/main/java/com/luoboduner/moo/tool/ui/form/func/NetForm.java
index 67ea418a..1957210e 100644
--- a/src/main/java/com/luoboduner/moo/tool/ui/form/func/NetForm.java
+++ b/src/main/java/com/luoboduner/moo/tool/ui/form/func/NetForm.java
@@ -12,7 +12,10 @@ import lombok.Getter;
 
 import javax.swing.*;
 import javax.swing.border.TitledBorder;
+import javax.swing.plaf.FontUIResource;
+import javax.swing.text.StyleContext;
 import java.awt.*;
+import java.util.Locale;
 
 /**
  * 
@@ -242,7 +245,10 @@ public class NetForm {
                 resultName = currentFont.getName();
             }
         }
-        return new Font(resultName, style >= 0 ? style : currentFont.getStyle(), size >= 0 ? size : currentFont.getSize());
+        Font font = new Font(resultName, style >= 0 ? style : currentFont.getStyle(), size >= 0 ? size : currentFont.getSize());
+        boolean isMac = System.getProperty("os.name", "").toLowerCase(Locale.ENGLISH).startsWith("mac");
+        Font fontWithFallback = isMac ? new Font(font.getFamily(), font.getStyle(), font.getSize()) : new StyleContext().getFont(font.getFamily(), font.getStyle(), font.getSize());
+        return fontWithFallback instanceof FontUIResource ? fontWithFallback : new FontUIResource(fontWithFallback);
     }
 
     /**
diff --git a/src/main/java/com/luoboduner/moo/tool/ui/form/func/TimeConvertForm.java b/src/main/java/com/luoboduner/moo/tool/ui/form/func/TimeConvertForm.java
index 2e57eddc..95d26c28 100644
--- a/src/main/java/com/luoboduner/moo/tool/ui/form/func/TimeConvertForm.java
+++ b/src/main/java/com/luoboduner/moo/tool/ui/form/func/TimeConvertForm.java
@@ -11,8 +11,11 @@ import lombok.Getter;
 import org.apache.commons.lang3.time.DateFormatUtils;
 
 import javax.swing.*;
+import javax.swing.plaf.FontUIResource;
+import javax.swing.text.StyleContext;
 import java.awt.*;
 import java.util.Date;
+import java.util.Locale;
 
 /**
  * 
@@ -193,7 +196,10 @@ public class TimeConvertForm {
                 resultName = currentFont.getName();
             }
         }
-        return new Font(resultName, style >= 0 ? style : currentFont.getStyle(), size >= 0 ? size : currentFont.getSize());
+        Font font = new Font(resultName, style >= 0 ? style : currentFont.getStyle(), size >= 0 ? size : currentFont.getSize());
+        boolean isMac = System.getProperty("os.name", "").toLowerCase(Locale.ENGLISH).startsWith("mac");
+        Font fontWithFallback = isMac ? new Font(font.getFamily(), font.getStyle(), font.getSize()) : new StyleContext().getFont(font.getFamily(), font.getStyle(), font.getSize());
+        return fontWithFallback instanceof FontUIResource ? fontWithFallback : new FontUIResource(fontWithFallback);
     }
 
     /**

From b107023eb9245045791295fd91ea8aac013bbcf0 Mon Sep 17 00:00:00 2001
From: duoduo 
Date: Sun, 27 Dec 2020 18:11:55 +0800
Subject: [PATCH 4/4] release:v1.3.2

---
 download.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/download.md b/download.md
index f26758e3..516698f5 100644
--- a/download.md
+++ b/download.md
@@ -14,7 +14,7 @@
 
MacOS -[MooToolWithJre-v1.3.2.zip](http://download.zhoubochina.com/moo/mac/MooToolWithJre-v1.3.2.zip) +[MooToolWithJre-v1.3.2.zip](http://download.zhoubochina.com/moo/mac/MooTool-v1.3.2WithJre.zip) [MooToolWithJre-v1.2.0.zip](http://download.zhoubochina.com/moo/mac/MooToolWithJre-v1.2.0.zip) [v1.2.0.zip](http://download.zhoubochina.com/moo/mac/MooTool-v1.2.0.zip) [v1.1.0.zip](http://download.zhoubochina.com/moo/mac/MooTool-v1.1.0.zip)