Skip to content

Commit 176d49e

Browse files
ZZHow1024ZZHow1024
authored
Merge pull request #5 from ZZHow1024/develop
MagicEncoding3.0.0
2 parents 1466e61 + b064ce5 commit 176d49e

20 files changed

+1176
-159
lines changed

Diff for: ‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
/.idea
33
.DS_Store
44
/target
5+
MagicEncoding.conf

Diff for: ‎LICENSE

+674
Large diffs are not rendered by default.

Diff for: ‎README.md

+44-28
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# [JavaFX 项目]神奇编码_**MagicEncoding**（中文说明）
1+
# [JavaFX Project]**MagicEncoding**(English)
22

3-
[**English**](README_EN.md)
3+
[**中文说明**](README_ZH.md)
44

55
---
66

77
Website:
88

9-
[[JavaFX 项目]神奇编码_MagicEncoding | ZZHow](https://www.zzhow.com/MagicEncoding)
9+
[[JavaFX Project]MagicEncoding_EN | ZZHow](https://www.zzhow.com/MagicEncodingEN)
1010

1111
Source Code:
1212

@@ -18,43 +18,59 @@ https://github.com/ZZHow1024/MagicEncoding/releases
1818

1919
---
2020

21-
## 使用说明
22-
23-
- 确定您使用的操作系统。
24-
- Linux：
25-
- 选择 .deb安装包 / .rpm安装包。
26-
- macOS：
27-
- 确定您使用的 Mac 的芯片(Apple Silicon / Intel)。
28-
- 选择 .dmg磁盘镜像 / .pkg安装包。
29-
- Windows：
30-
- 选择 .zip压缩包 / .exe安装包 / .msi安装包。
31-
- 下载对应的文件。
32-
- Linux 和 macOS 需要执行安装操作后再运行，Windows 可直接运行 .zip 压缩包中的 .exe 可执行程序或选择 .exe 安装包与 .msi 安装包执行安装操作。
33-
- 启动 MagicEncoding。
34-
- 拖拽文件夹获取路径，填入需要筛选的后缀名（多种后缀名用“&”分隔），单击“查找文件”。
35-
- 选择原始编码与目标编码，单击“开始转换”。
21+
## License
22+
23+
This project is licensed under the GNU General Public License v3.0 - see the [LICENSE](LICENSE) file for details.
24+
25+
## **Instructions for use**
26+
27+
- Determine the operating system you are using.
28+
- Linux:
29+
- Select .deb installation package/ .rpm installation package.
30+
- macOS:
31+
- Determine the chipset of your Mac (Apple Silicon / Intel).
32+
- Select .dmg disk image/ .pkg installation package.
33+
- Windows:
34+
- Select .zip package/.exe installation package/.msi installation package.
35+
- Download the corresponding file.
36+
- Linux and macOS users need to perform the installation operation before running. Windows users can directly run the .exe executable program in the .zip compressed package or select the .exe installation package and .msi installation package to perform the installation operation.
37+
- Start MagicEncoding.
38+
- You can select the language in the lower right corner of MagicEncoding's main interface.
39+
- Currently supports Chinese (Simplified / Traditional) and English.
40+
- Drag the folder or file to obtain the path, enter the suffix name to be filtered (separate multiple suffix names with "&"), and click Find File.
41+
- Select the original encoding and target encoding, and click "Start Conversion".
3642

3743
---
3844

39-
## 功能介绍
45+
## Function Introduction
4046

47+
- MagicEncoding3.0.0
48+
- Automatic encoding recognition.
49+
- Single file conversion.
50+
- Support multiple languages.
51+
- Chinese (Simplified/Traditional)
52+
- English
4153
- MagicEncoding2.0.0
42-
- 拖拽文件夹获取路径。
43-
- 查找多种后缀名。
44-
- 支持覆盖原文件。
54+
- Drag the folder to get the path.
55+
- Search for multiple suffixes.
56+
- Support overwriting original files.
4557
- MagicEncoding1.0.0
46-
- "GBK" 与 "UTF-8" 之间的编码转换。
47-
- 根据路径查找文件。
48-
- 支持根据文件后缀名筛选文件。
58+
- Encoding conversion between "GBK" and "UTF-8”.
59+
- Find files by path.
60+
- Support filtering files based on file extensions.
4961

5062
---
5163

52-
## **效果图**
64+
## **Renderings**
65+
66+
![MagicEncoding3.0.0_EN](https://www.notion.so/image/https%3A%2F%2Fprod-files-secure.s3.us-west-2.amazonaws.com%2F4b165318-6383-451c-8845-110b786c9f0a%2Fa48f9fb0-5ca9-4b3e-aa65-5c0b9b8f53a4%2FMagicEncoding3.0.0_EN.png?table=block&id=e473a771-1ea7-42ab-9cc2-b124f8610072&t=e473a771-1ea7-42ab-9cc2-b124f8610072&width=1624&cache=v2)
67+
68+
MagicEncoding3.0.0_EN
5369

54-
![MagicEncoding2.0.0](https://www.notion.so/image/https%3A%2F%2Fprod-files-secure.s3.us-west-2.amazonaws.com%2F4b165318-6383-451c-8845-110b786c9f0a%2Fcea3d468-2198-4819-a5c3-cb4f3f287dfa%2FMagicEncoding2.0.0.png?table=block&id=34817b71-f9d4-42b9-91e9-a477ad85b262&t=34817b71-f9d4-42b9-91e9-a477ad85b262&width=1624&cache=v2)
70+
![MagicEncoding2.0.0](https://www.notion.so/image/https%3A%2F%2Fprod-files-secure.s3.us-west-2.amazonaws.com%2F4b165318-6383-451c-8845-110b786c9f0a%2Fbf42de01-57d9-4f5d-bb7c-3490b0db7ee1%2FMagicEncoding2.0.0.png?table=block&id=7ce8da63-3633-47ff-848c-94492101089c&t=7ce8da63-3633-47ff-848c-94492101089c&width=1624&cache=v2)
5571

5672
MagicEncoding2.0.0
5773

58-
![MagicEncoding1.0.0](https://www.notion.so/image/https%3A%2F%2Fprod-files-secure.s3.us-west-2.amazonaws.com%2F4b165318-6383-451c-8845-110b786c9f0a%2F94657332-79a5-4e54-b697-8979784a6da3%2FMagicEncoding1.0.0.png?table=block&id=c8dd391f-0e31-455c-8dc3-2b154b44605f&t=c8dd391f-0e31-455c-8dc3-2b154b44605f&width=529&cache=v2)
74+
![MagicEncoding1.0.0](https://www.notion.so/image/https%3A%2F%2Fprod-files-secure.s3.us-west-2.amazonaws.com%2F4b165318-6383-451c-8845-110b786c9f0a%2Fa91b3a7d-672f-4ea2-b167-4657fef038dc%2FMagicEncoding1.0.0.png?table=block&id=ed5e4ef9-7816-4961-9740-d423c5681168&t=ed5e4ef9-7816-4961-9740-d423c5681168&width=1624&cache=v2)
5975

6076
MagicEncoding1.0.0

Diff for: ‎README_EN.md

-60
This file was deleted.

Diff for: ‎README_ZH.md

+76
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# [JavaFX 项目]神奇编码_**MagicEncoding**（中文说明）
2+
3+
[**English**](README.md)
4+
5+
---
6+
7+
Website:
8+
9+
[[JavaFX 项目]神奇编码_MagicEncoding | ZZHow](https://www.zzhow.com/MagicEncoding)
10+
11+
Source Code:
12+
13+
https://github.com/ZZHow1024/MagicEncoding
14+
15+
Releases:
16+
17+
https://github.com/ZZHow1024/MagicEncoding/releases
18+
19+
---
20+
21+
## License
22+
23+
This project is licensed under the GNU General Public License v3.0 - see the [LICENSE](LICENSE) file for details.
24+
25+
## 使用说明
26+
27+
- 确定您使用的操作系统。
28+
- Linux：
29+
- 选择 .deb安装包 / .rpm安装包。
30+
- macOS：
31+
- 确定您使用的 Mac 的芯片(Apple Silicon / Intel)。
32+
- 选择 .dmg磁盘镜像 / .pkg安装包。
33+
- Windows：
34+
- 选择 .zip压缩包 / .exe安装包 / .msi安装包。
35+
- 下载对应的文件。
36+
- Linux 和 macOS 需要执行安装操作后再运行，Windows 可直接运行 .zip 压缩包中的 .exe 可执行程序或选择 .exe 安装包与 .msi 安装包执行安装操作。
37+
- 启动 MagicEncoding。
38+
- 在 MagicEncoding 的主界面右下方可以选择语言。
39+
- 当前支持中文（简体 / 繁体）与英文。
40+
- 拖拽文件夹或文件获取路径，填入需要筛选的后缀名（多种后缀名用“&”分隔），单击“查找文件”。
41+
- 选择原始编码与目标编码，单击“开始转换”。
42+
43+
---
44+
45+
## 功能介绍
46+
47+
- MagicEncoding3.0.0
48+
- 自动识别编码。
49+
- 单文件转换。
50+
- 支持多语言。
51+
- 中文（简体/繁体）
52+
- 英文
53+
- MagicEncoding2.0.0
54+
- 拖拽文件夹获取路径。
55+
- 查找多种后缀名。
56+
- 支持覆盖原文件。
57+
- MagicEncoding1.0.0
58+
- "GBK" 与 "UTF-8" 之间的编码转换。
59+
- 根据路径查找文件。
60+
- 支持根据文件后缀名筛选文件。
61+
62+
---
63+
64+
## **效果图**
65+
66+
![MagicEncoding3.0.0_ZH](https://www.notion.so/image/https%3A%2F%2Fprod-files-secure.s3.us-west-2.amazonaws.com%2F4b165318-6383-451c-8845-110b786c9f0a%2F59e24efe-e112-48a3-8ca6-fa721270fca0%2FMagicEncoding3.0.0_ZH.png?table=block&id=63c5eb8e-9288-4418-a76b-627ee422a9c5&t=63c5eb8e-9288-4418-a76b-627ee422a9c5&width=1624&cache=v2)
67+
68+
MagicEncoding3.0.0_ZH
69+
70+
![MagicEncoding2.0.0](https://www.notion.so/image/https%3A%2F%2Fprod-files-secure.s3.us-west-2.amazonaws.com%2F4b165318-6383-451c-8845-110b786c9f0a%2Fcea3d468-2198-4819-a5c3-cb4f3f287dfa%2FMagicEncoding2.0.0.png?table=block&id=34817b71-f9d4-42b9-91e9-a477ad85b262&t=34817b71-f9d4-42b9-91e9-a477ad85b262&width=1624&cache=v2)
71+
72+
MagicEncoding2.0.0
73+
74+
![MagicEncoding1.0.0](https://www.notion.so/image/https%3A%2F%2Fprod-files-secure.s3.us-west-2.amazonaws.com%2F4b165318-6383-451c-8845-110b786c9f0a%2F94657332-79a5-4e54-b697-8979784a6da3%2FMagicEncoding1.0.0.png?table=block&id=c8dd391f-0e31-455c-8dc3-2b154b44605f&t=c8dd391f-0e31-455c-8dc3-2b154b44605f&width=1624&cache=v2)
75+
76+
MagicEncoding1.0.0

Diff for: ‎pom.xml

+7
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@
1515
</properties>
1616

1717
<dependencies>
18+
<!-- https://mvnrepository.com/artifact/com.github.albfernandez/juniversalchardet -->
19+
<dependency>
20+
<groupId>com.github.albfernandez</groupId>
21+
<artifactId>juniversalchardet</artifactId>
22+
<version>2.5.0</version>
23+
</dependency>
24+
1825
<dependency>
1926
<groupId>org.openjfx</groupId>
2027
<artifactId>javafx-controls</artifactId>

Diff for: ‎src/main/java/com/zzhow/magicencoding/controller/AboutController.java

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
package com.zzhow.magicencoding.controller;
2+
3+
import com.zzhow.magicencoding.ui.Application;
4+
import javafx.fxml.FXML;
5+
import javafx.scene.control.Label;
6+
7+
import java.util.ResourceBundle;
8+
9+
/**
10+
* @author ZZHow
11+
* @date 2024/9/8
12+
*/
13+
public class AboutController {
14+
15+
@FXML
16+
private Label Label1;
17+
@FXML
18+
private Label Label2;
19+
@FXML
20+
private Label Label3;
21+
22+
@FXML
23+
public void initialize() {
24+
switchLanguage();
25+
}
26+
27+
private void switchLanguage() {
28+
ResourceBundle bundle = Application.bundle;
29+
30+
Label1.setText(bundle.getString("MagicEncoding"));
31+
Label2.setText(bundle.getString("features"));
32+
Label3.setText(bundle.getString("features_content"));
33+
}
34+
}

0 commit comments

Comments
 (0)