opensource/MooTool
3
0
Fork 0
mirror of https://github.com/rememberber/MooTool.git synced 2026-08-30 18:02:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

!27 release:1.3.2

Browse Source 
Merge pull request !27 from RememBerBer/develop
This commit is contained in:
RememBerBer
2020-12-27 18:34:42 +08:00
committed by Gitee
parent 0e2c922745 b107023eb9
commit 4f6c538636
14 changed files with 88 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
download.md
+3
View File
@@ -3,6 +3,7 @@
<details>
<summary>Windows</summary>
[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 @@
<details>
<summary>MacOS</summary>
[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)
@@ -30,6 +32,7 @@
<details>
<summary>Portable(绿色便携版32/64位)</summary>
[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)
src/main/java/com/luoboduner/moo/tool/ui/Init.java
+4 -1
View File
@@ -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);
}
}
src/main/java/com/luoboduner/moo/tool/ui/UiConsts.java
+1 -1
View File
@@ -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;
src/main/java/com/luoboduner/moo/tool/ui/dialog/FontSizeAdjustDialog.java
+7 -1
View File
@@ -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;
/**
* <pre>
@@ -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);
}
/**
src/main/java/com/luoboduner/moo/tool/ui/form/AboutForm.java
+7 -1
View File
@@ -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;
/**
* <pre>
@@ -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);
}
/**
src/main/java/com/luoboduner/moo/tool/ui/form/LoadingForm.java
+7 -1
View File
@@ -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;
/**
* <pre>
@@ -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);
}
/**
src/main/java/com/luoboduner/moo/tool/ui/form/SettingForm.java
+7 -1
View File
@@ -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;
/**
* <pre>
@@ -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);
}
}
src/main/java/com/luoboduner/moo/tool/ui/form/func/CalculatorForm.java
+7 -1
View File
@@ -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;
/**
* <pre>
@@ -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);
}
/**
src/main/java/com/luoboduner/moo/tool/ui/form/func/ColorBoardForm.java
+7 -1
View File
@@ -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;
/**
* <pre>
@@ -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);
}
/**
src/main/java/com/luoboduner/moo/tool/ui/form/func/FindResultForm.java
+7 -1
View File
@@ -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;
/**
* <pre>
@@ -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);
}
/**
src/main/java/com/luoboduner/moo/tool/ui/form/func/NetForm.java
+7 -1
View File
@@ -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;
/**
* <pre>
@@ -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);
}
/**
src/main/java/com/luoboduner/moo/tool/ui/form/func/TimeConvertForm.java
+7 -1
View File
@@ -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;
/**
* <pre>
@@ -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);
}
/**
src/main/java/com/luoboduner/moo/tool/ui/listener/func/ImageListener.java
+9
View File
@@ -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
src/main/resources/version_summary.json
+8 -2
View File
@@ -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"
}
]
}