10BC0 Merge branch 'dev' of https://gitee.com/xwintop/xJavaFxTool into dev · llyJava/xJavaFxTool@da571d9 · GitHub
[go: up one dir, main page]
Skip to content

Commit da571d9

Browse files
xwintopxwintop
committed
Merge branch 'dev' of https://gitee.com/xwintop/xJavaFxTool into dev
2 parents 5d6851c + a274d70 commit da571d9

File tree

8 files changed

+114
-92
lines changed

8 files changed

+114
-92
lines changed

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>com.xwintop</groupId>
66
<artifactId>xJavaFxTool</artifactId>
7-
<version>0.2.2</version>
7+
<version>0.2.2-SNAPSHOT</version>
88
<packaging>jar</packaging>
99
<name>xJavaFxTool</name>
1010
<description>基于JavaFx搭建的实用小工具集合</description>
@@ -47,7 +47,7 @@
4747
<dependency>
4848
<groupId>com.xwintop</groupId>
4949
<artifactId>xcore</artifactId>
50-
<version>0.0.5</version>
50+
<version>0.0.5-SNAPSHOT</version>
5151
</dependency>
5252
<dependency>
5353
<groupId>org.projectlombok</groupId>

‎src/main/java/com/xwintop/xJavaFxTool/Main.java‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.xwintop.xJavaFxTool.utils.XJavaFxSystemUtil;
99
import com.xwintop.xcore.javafx.FxApp;
1010
import com.xwintop.xcore.javafx.dialog.FxAlerts;
11-
import com.xwintop.xcore.javafx.helper.FxmlHelper;
1211
import com.xwintop.xcore.util.javafx.JavaFxViewUtil;
1312
import java.io.IOException;
1413
import java.util.ResourceBundle;
@@ -32,8 +31,7 @@ public class Main extends Application {
3231

3332
public static final String LOGO_PATH = "/images/icon.jpg";
3433

35-
public static final ResourceBundle RESOURCE_BUNDLE =
36-
ResourceBundle.getBundle("locale.Menu", Config.defaultLocale);
34+
public static ResourceBundle RESOURCE_BUNDLE;
3735

3836
private static Stage stage;
3937

@@ -69,8 +67,13 @@ public void start(Stage primaryStage) throws Exception {
6967
StageUtils.updateStageStyle(primaryStage);
7068
}
7169

72-
private void loadNewUI(Stage primaryStage) {
73-
FxmlHelper.loadIntoStage("/com/xwintop/xJavaFxTool/fxmlView/newui/main.fxml", primaryStage).show();
70+
private void loadNewUI(Stage primaryStage) throws IOException {
71+
FXMLLoader fxmlLoader = new FXMLLoader();
72+
fxmlLoader.setLocation(Main.class.getResource("/com/xwintop/xJavaFxTool/fxmlView/newui/main.fxml"));
73+
fxmlLoader.setResources(RESOURCE_BUNDLE);
74+
75+
Parent root = fxmlLoader.load();
76+
primaryStage.setScene(new Scene(root));
7477
}
7578

7679
private void loadClassicUI(Stage primaryStage) throws IOException {

‎src/main/java/com/xwintop/xJavaFxTool/controller/IndexController.java‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package com.xwintop.xJavaFxTool.controller;
22

3+
import static com.xwintop.xJavaFxTool.Main.RESOURCE_BUNDLE;
4+
import static com.xwintop.xJavaFxTool.utils.Config.Keys.NotepadEnabled;
5+
36
import com.xwintop.xJavaFxTool.controller.index.PluginManageController;
47
import com.xwintop.xJavaFxTool.model.ToolFxmlLoaderConfiguration;
58
import com.xwintop.xJavaFxTool.plugin.PluginManager;
@@ -13,6 +16,17 @@
1316
import com.xwintop.xcore.util.javafx.AlertUtil;
1417
import com.xwintop.xcore.util.javafx.JavaFxSystemUtil;
1518
import com.xwintop.xcore.util.javafx.JavaFxViewUtil;
19+
import java.io.File;
20+
import java.io.InputStream;
21+
import java.net.URL;
22+
import java.util.ArrayList;
23+
import java.util.Date;
24+
import java.util.HashMap;
25+
import java.util.List;
26+
import java.util.Map;
27+
import java.util.ResourceBundle;
28+
import java.util.jar.JarEntry;
29+
import java.util.jar.JarFile;
1630
import javafx.application.Platform;
1731
import javafx.event.ActionEvent;
1832
import javafx.fxml.FXML;
@@ -34,16 +48,6 @@
3448
import org.dom4j.Element;
3549
import org.dom4j.io.SAXReader;
3650

37-
import java.io.File;
38-
import java.io.InputStream;
39-
import java.net.URL;
40-
import java.util.*;
41-
import java.util.jar.JarEntry;
42-
import java.util.jar.JarFile;
43-
44-
import static com.xwintop.xJavaFxTool.Main.RESOURCE_BUNDLE;
45-
import static com.xwintop.xJavaFxTool.utils.Config.Keys.NotepadEnabled;
46-
4751
/**
4852
* @ClassName: IndexController
4953
* @Description: 主页
@@ -81,7 +85,7 @@ public void initialize(URL location, ResourceBundle resources) {
8185
initService();
8286
initNotepad();
8387

84-
this.indexService.addWebView("欢迎吐槽", QQ_URL, null);
88+
this.indexService.addWebView(RESOURCE_BUNDLE.getString("feedback"), QQ_URL, null);
8589
this.tongjiWebView.getEngine().load(STATISTICS_URL);
8690
}
8791

‎src/main/java/com/xwintop/xJavaFxTool/services/index/SystemSettingService.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.xwintop.xJavaFxTool.services.index;
22

3+
import com.xwintop.xJavaFxTool.Main;
34
import com.xwintop.xJavaFxTool.controller.index.SystemSettingController;
45
import com.xwintop.xcore.javafx.FxApp;
56
import com.xwintop.xcore.javafx.dialog.FxDialog;
@@ -23,6 +24,7 @@ public class SystemSettingService {
2324
public static void openSystemSettings(String title) {
2425

2526
FxDialog<SystemSettingController> dialog = new FxDialog<SystemSettingController>()
27+
.setResourceBundle(Main.RESOURCE_BUNDLE)
2628
.setTitle(title)
2729
.setBodyFxml("/com/xwintop/xJavaFxTool/fxmlView/index/SystemSetting.fxml")
2830
.setOwner(FxApp.primaryStage)

‎src/main/java/com/xwintop/xJavaFxTool/utils/XJavaFxSystemUtil.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
package com.xwintop.xJavaFxTool.utils;
22

3+
import com.xwintop.xJavaFxTool.Main;
34
import com.xwintop.xJavaFxTool.plugin.PluginManager;
45
import com.xwintop.xJavaFxTool.services.index.PluginManageService;
56
import java.io.File;
67
import java.lang.reflect.Method;
78
import java.net.URL;
89
import java.net.URLClassLoader;
910
import java.util.Locale;
11+
import java.util.ResourceBundle;
1012
import lombok.extern.slf4j.Slf4j;
1113
import org.apache.commons.lang3.StringUtils;
1214

@@ -26,10 +28,13 @@ public class XJavaFxSystemUtil {
2628
public static void initSystemLocal() {
2729
try {
2830
String localeString = Config.get(Config.Keys.Locale, "");
31+
2932
if (StringUtils.isNotEmpty(localeString)) {
3033
String[] locale1 = localeString.split("_");
3134
Config.defaultLocale = new Locale(locale1[0], locale1[1]);
3235
}
36+
37+
Main.RESOURCE_BUNDLE = ResourceBundle.getBundle("locale.Menu", Config.defaultLocale);
3338
} catch (Exception e) {
3439
log.error("初始化本地语言失败", e);
3540
}

‎src/main/resources/com/xwintop/xJavaFxTool/fxmlView/newui/main.fxml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,28 @@
2121
</padding>
2222

2323
<TabPane VBox.vgrow="ALWAYS" tabMinWidth="45" fx:id="tabPane" tabClosingPolicy="ALL_TABS">
24-
<Tab closable="false" text="开始">
24+
<Tab closable="false" text="%start">
2525
<ScrollPane fitToWidth="true" style="-fx-border-width: 0 1 1 1;-fx-border-color: #CCCCCC;-fx-background:#2a2a2a">
2626
<VBox>
2727
<padding>
2828
<Insets left="15"/>
2929
</padding>
3030
<HBox alignment="BASELINE_LEFT" style="-fx-padding: 10">
31-
<Label text="搜索："/>
31+
<Label text="%search"/>
3232
<TextField prefWidth="200" styleClass="search-text" fx:id="txtSearch"/>
3333
<Pane HBox.hgrow="ALWAYS"/>
3434
<Hyperlink onAction="#openProjectUrl" style="-fx-text-fill: #868686"
3535
text="https://gitee.com/xwintop/xJavaFxTool"/>
36-
<Hyperlink onAction="#openConfigDialog" text="设置"/>
37-
<Hyperlink onAction="#openPluginManager" text="插件管理"/>
38-
<Hyperlink onAction="#openPluginCreator" text="新建" fx:id="lnkCreatePlugin"/>
36+
<Hyperlink onAction="#openConfigDialog" text="%Setting"/>
37+
<Hyperlink onAction="#openPluginManager" text="%plugin_manage"/>
38+
<Hyperlink onAction="#openPluginCreator" text="%newPlugin" fx:id="lnkCreatePlugin"/>
3939
</HBox>
4040
<VBox fx:id="pluginCategories" alignment="TOP_CENTER">
4141
</VBox>
4242
</VBox>
4343
</ScrollPane>
4444
</Tab>
45-
<Tab text="欢迎吐槽">
45+
<Tab text="%feedback">
4646
<WebView fx:id="startWebView"/>
4747
</Tab>
4848
</TabPane>

‎src/main/resources/locale/Menu.properties‎

Lines changed: 38 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,44 @@
11
# Dorian.properties\u662F\u9ED8\u8BA4\u7684"Dorian"\u8D44\u6E90\u675F\u6587\u4EF6\u3002
22
# \u4F5C\u4E3A\u4E2D\u56FD\u4EBA,\u6211\u7528\u81EA\u5DF1\u7684\u5730\u533A\u4F5C\u4E3A\u9ED8\u8BA4
3-
Title=javaFx\u5DE5\u5177\u96C6\u5408
3+
Title = javaFx\u5DE5\u5177\u96C6\u5408
44
# MenuFiled
5-
File=\u83DC\u5355
6-
closeAllTab=\u5173\u95ED\u6240\u6709\u6807\u7B7E
7-
openAllTab=\u6253\u5F00\u6240\u6709\u6807\u7B7E
8-
addNodepad=\u4E34\u65F6\u8BB0\u4E8B\u672C
9-
addLogConsole=\u65E5\u5FD7\u63A7\u5236\u53F0
10-
Exit=\u9000\u51FA
11-
Tools=\u5DE5\u5177
12-
More_Tools=\u66F4\u591A\u5DE5\u5177
13-
plugin_manage=\u63D2\u4EF6\u7BA1\u7406
14-
NetWork_Tools=\u7F51\u9875\u5DE5\u5177
15-
Help=\u5E2E\u52A9
16-
About=\u5173\u4E8E
17-
SetLanguage=\u8BBE\u7F6E\u8BED\u8A00
18-
Setting=\u8BBE\u7F6E
19-
openLogFile=\u6253\u5F00\u65E5\u5FD7\u6587\u4EF6
20-
openLogFolder=\u6253\u5F00\u65E5\u5FD7\u76EE\u5F55
21-
openConfigFolder=\u6253\u5F00\u914D\u7F6E\u76EE\u5F55
22-
openPluginFolder=\u6253\u5F00\u63D2\u4EF6\u76EE\u5F55
23-
userSupport=\u7528\u6237\u8BBA\u575B
5+
File = \u83DC\u5355
6+
closeAllTab = \u5173\u95ED\u6240\u6709\u6807\u7B7E
7+
openAllTab = \u6253\u5F00\u6240\u6709\u6807\u7B7E
8+
addNodepad = \u4E34\u65F6\u8BB0\u4E8B\u672C
9+
addLogConsole = \u65E5\u5FD7\u63A7\u5236\u53F0
10+
Exit = \u9000\u51FA
11+
Tools = \u5DE5\u5177
12+
More_Tools = \u66F4\u591A\u5DE5\u5177
13+
plugin_manage = \u63D2\u4EF6\u7BA1\u7406
14+
NetWork_Tools = \u7F51\u9875\u5DE5\u5177
15+
Help = \u5E2E\u52A9
16+
About = \u5173\u4E8E
17+
SetLanguage = \u8BBE\u7F6E\u8BED\u8A00
18+
Setting = \u8BBE\u7F6E
19+
openLogFile = \u6253\u5F00\u65E5\u5FD7\u6587\u4EF6
20+
openLogFolder = \u6253\u5F00\u65E5\u5FD7\u76EE\u5F55
21+
openConfigFolder = \u6253\u5F00\u914D\u7F6E\u76EE\u5F55
22+
openPluginFolder = \u6253\u5F00\u63D2\u4EF6\u76EE\u5F55
23+
userSupport = \u7528\u6237\u8BBA\u575B
2424

25-
aboutText=\u6B22\u8FCE\u4F7F\u7528JavaFx\u5DE5\u5177\u96C6\u5408\u3002\ngit\u5730\u5740\uFF1Ahttps://gitee.com/xwintop/xJavaFxTool\n\u4F5C\u8005\uFF1A\u8FFD\u98CE\n\u535A\u5BA2\uFF1Awww.xwintop.com\n\u6B22\u8FCE\u524D\u6765\u63D0\u51FA\u610F\u89C1\uFF0C\u4E00\u8D77\u5B8C\u5584\u8BE5\u5DE5\u5177\uFF0C\u8C22\u8C22\uFF01\uFF01\n\u5F53\u524D\u7248\u672C\uFF1A
26-
SetLanguageText=\u8BED\u8A00\u9009\u62E9\u8BBE\u7F6E\u6210\u529F\uFF0C\u91CD\u542F\u540E\u751F\u6548\u3002
25+
aboutText = \u6B22\u8FCE\u4F7F\u7528JavaFx\u5DE5\u5177\u96C6\u5408\u3002\ngit\u5730\u5740\uFF1Ahttps://gitee.com/xwintop/xJavaFxTool\n\u4F5C\u8005\uFF1A\u8FFD\u98CE\n\u535A\u5BA2\uFF1Awww.xwintop.com\n\u6B22\u8FCE\u524D\u6765\u63D0\u51FA\u610F\u89C1\uFF0C\u4E00\u8D77\u5B8C\u5584\u8BE5\u5DE5\u5177\uFF0C\u8C22\u8C22\uFF01\uFF01\n\u5F53\u524D\u7248\u672C\uFF1A
26+
SetLanguageText = \u8BED\u8A00\u9009\u62E9\u8BBE\u7F6E\u6210\u529F\uFF0C\u91CD\u542F\u540E\u751F\u6548\u3002
27+
feedback = \u6B22\u8FCE\u5410\u69FD
2728

28-
selectTextField=\u8BF7\u8F93\u5165\u83DC\u5355\u540D
29-
selectButton=\u641C\u7D22
30-
singleWindowBootCheckBox=\u5728\u65B0\u7A97\u53E3\u4E2D\u6253\u5F00
29+
selectTextField = \u8BF7\u8F93\u5165\u83DC\u5355\u540D
30+
selectButton = \u641C\u7D22
31+
singleWindowBootCheckBox = \u5728\u65B0\u7A97\u53E3\u4E2D\u6253\u5F00
3132

32-
codeTools=Code\u5DE5\u5177
33-
debugTools=\u8C03\u8BD5\u5DE5\u5177
34-
epmsTools=epms\u5DE5\u5177
35-
javaFxTools=javaFx\u5DE5\u5177
36-
littleTools=\u5C0F\u5DE5\u5177
37-
webTools=html\u5DE5\u5177
38-
developTools=\u5F00\u53D1\u5DE5\u5177
39-
assistTools=\u8F85\u52A9\u5DE5\u5177
40-
games=\u6E38\u620F
33+
codeTools = Code\u5DE5\u5177
34+
debugTools = \u8C03\u8BD5\u5DE5\u5177
35+
epmsTools = epms\u5DE5\u5177
36+
javaFxTools = javaFx\u5DE5\u5177
37+
littleTools = \u5C0F\u5DE5\u5177
38+
webTools = html\u5DE5\u5177
39+
developTools = \u5F00\u53D1\u5DE5\u5177
40+
assistTools = \u8F85\u52A9\u5DE5\u5177
41+
games = \u6E38\u620F
42+
start = \u5F00\u59CB
43+
newPlugin = \u65B0\u5EFA
44+
search = \u641C\u7D22

‎src/main/resources/locale/Menu_en_US.properties‎

Lines changed: 38 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,44 @@
11
# \u6587\u4EF6Dorian_en_US.properties\uFF0C\u662F\u7F8E\u56FD\u5730\u533A\u7684\u8D44\u6E90\u675F
22
# \u5B83\u8986\u76D6\u4E86\u9ED8\u8BA4\u8D44\u6E90\u675F
3-
Title=JavaFxTool
3+
Title = JavaFxTool
44

5-
File=File
6-
closeAllTab=closeAllTab
7-
openAllTab=openAllTab
8-
addNodepad=Nodepad
9-
addLogConsole=LogConsole
10-
Exit=Exit
11-
Tools=Tools
12-
More_Tools=More Tools
13-
plugin_manage=Plugin manage
14-
NetWork_Tools=NetWork Tools
15-
Help=Help
16-
About=About
17-
SetLanguage=Set Language
18-
Setting=Setting
19-
openLogFile=open Log File
20-
openLogFolder=open Log Folder
21-
openConfigFolder=open Config Folder
22-
openPluginFolder=open Plugin Folder
23-
userSupport=user Support
5+
File = File
6+
closeAllTab = closeAllTab
7+
openAllTab = openAllTab
8+
addNodepad = Nodepad
9+
addLogConsole = LogConsole
10+
Exit = Exit
11+
Tools = Tools
12+
More_Tools = More Tools
13+
plugin_manage = Plugin manage
14+
NetWork_Tools = NetWork Tools
15+
Help = Help
16+
About = About
17+
SetLanguage = Set Language
18+
Setting = Setting
19+
openLogFile = open Log File
20+
openLogFolder = open Log Folder
21+
openConfigFolder = open Config Folder
22+
openPluginFolder = open Plugin Folder
23+
userSupport = user Support
2424

25-
aboutText=Welcome to the JavaFx tool set.\ngitUrl:https://gitee.com/xwintop/xJavaFxTool\nAuthor:xwintop\nblog:www.xwintop.com\nWelcome to make comments and improve the tool together. Thank you!!\ncurrent version:
26-
SetLanguageText=The language selection settings have been successful and will take effect after reboot.
25+
aboutText = Welcome to the JavaFx tool set.\ngitUrl:https://gitee.com/xwintop/xJavaFxTool\nAuthor:xwintop\nblog:www.xwintop.com\nWelcome to make comments and improve the tool together. Thank you!!\ncurrent version:
26+
SetLanguageText = The language selection settings have been successful and will take effect after reboot.
2727

28-
selectTextField=Please enter a menu name
29-
selectButton=select
30-
singleWindowBootCheckBox=isSingleWindowBoot
28+
selectTextField = Please enter a menu name
29+
selectButton = select
30+
singleWindowBootCheckBox = isSingleWindowBoot
31+
feedback = Feedback
32+
search = Search
3133

32-
codeTools=codeTools
33-
debugTools=debugTools
34-
epmsTools=epmsTools
35-
javaFxTools=javaFxTools
36-
littleTools=littleTools
37-
webTools=webTools
38-
developTools=developTools
39-
assistTools=assistTools
40-
games=games
34+
codeTools = codeTools
35+
debugTools = debugTools
36+
epmsTools = epmsTools
37+
javaFxTools = javaFxTools
38+
littleTools = littleTools
39+
webTools = webTools
40+
developTools = developTools
41+
assistTools = assistTools
42+
games = games
43+
start = Start
44+
newPlugin = New Plugin

0 commit comments

Comments
 (0)
0