Skip to content

Commit

Permalink
perf: optimize client interface layout
Browse files Browse the repository at this point in the history
  • Loading branch information
@ZZHow1024
ZZHow1024 committed Feb 8, 2025
1 parent d670659 commit 692100a
Show file tree
Hide file tree
Showing 9 changed files with 45 additions and 43 deletions.
4 changes: 2 additions & 2 deletions backend/src/main/java/com/zzhow/magicshare/repository/LanguageRepository.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
* @date 2025/1/30
*/
public class LanguageRepository {
public static ResourceBundle bundle = ResourceBundle.getBundle("MessagesBundle", Locale.of("zh", "Hans"));
private static String language = "zh_Hans";
public static ResourceBundle bundle = ResourceBundle.getBundle("MessagesBundle", Locale.of("zh", "HANS"));
private static String language = "zh_HANS";

public static String getLanguage() {
return language;
Expand Down
21 changes: 10 additions & 11 deletions backend/src/main/java/com/zzhow/magicshare/ui/controller/MainController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,22 +107,21 @@ private void initialize() {

languageSelector.getItems().addAll("简体中文", "繁體中文", "English");
String language = Locale.getDefault().toLanguageTag();

if (language.contains("zh")) {
if (language.contains("Hans"))
language = "zh_Hans";
else if (language.contains("Hant"))
language = "zh_Hant";
else if (language.contains("CN"))
language = "zh_Hans";
if (language.contains("CN") || language.contains("cn"))
language = "zh_HANS";
else if (language.contains("HANS") || language.contains("Hans"))
language = "zh_HANS";
else
language = "zh_Hant";
language = "zh_HANT";
} else {
language = "en_US";
}

language = switch (language) {
case "zh_Hans" -> "简体中文";
case "zh_Hant" -> "繁體中文";
case "zh_HANS" -> "简体中文";
case "zh_HANT" -> "繁體中文";
case "en_US" -> "English";
default -> "简体中文";
};
Expand Down Expand Up @@ -255,8 +254,8 @@ private void onEnablePasswordClicked() {
private void switchLanguage() {
String selectorValue = languageSelector.getValue();
selectorValue = switch (selectorValue) {
case "简体中文" -> "zh_Hans";
case "繁體中文" -> "zh_Hant";
case "简体中文" -> "zh_HANS";
case "繁體中文" -> "zh_HANT";
case "English" -> "en_US";
default -> "zh_Hans";
};
Expand Down
12 changes: 5 additions & 7 deletions backend/src/main/java/com/zzhow/magicshare/ui/controller/PromptController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,12 @@ public class PromptController {
private void initialize() {
String language = Locale.getDefault().toLanguageTag();
if (language.contains("zh")) {
if (language.contains("Hans"))
language = "zh_Hans";
else if (language.contains("Hant"))
language = "zh_Hant";
else if (language.contains("CN"))
language = "zh_Hans";
if (language.contains("CN") || language.contains("cn"))
language = "zh_HANS";
else if (language.contains("HANS") || language.contains("Hans"))
language = "zh_HANS";
else
language = "zh_Hant";
language = "zh_HANT";
} else {
language = "en_US";
}
Expand Down
2 changes: 1 addition & 1 deletion backend/src/main/java/com/zzhow/magicshare/ui/window/PromptWindow.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class PromptWindow extends javafx.application.Application {
public void start(Stage stage) throws IOException {
PromptWindow.stage = stage;
FXMLLoader fxmlLoader = new FXMLLoader(MainWindow.class.getResource("prompt-window.fxml"));
Scene scene = new Scene(fxmlLoader.load(), 780, 450);
Scene scene = new Scene(fxmlLoader.load(), 780, 520);
stage.setTitle("MagicShare");
stage.setScene(scene);
Image icon = new Image(Objects.requireNonNull(MagicShareApplication.class.getResourceAsStream("/image/icon.png")));
Expand Down
4 changes: 3 additions & 1 deletion backend/src/main/resources/MessagesBundle_en_US.properties
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
magicShare=MagicShare

promptContent=\u0050\u006c\u0065\u0061\u0073\u0065\u0020\u0072\u0065\u0061\u0064\u0020\u0063\u0061\u0072\u0065\u0066\u0075\u006c\u006c\u0079\u0020\u0062\u0065\u0066\u006f\u0072\u0065\u0020\u0075\u0073\u0069\u006e\u0067\u0020\u0074\u0068\u0069\u0073\u0020\u0073\u006f\u0066\u0074\u0077\u0061\u0072\u0065\u003a\u000a\u000a\u004c\u0065\u0067\u0061\u006c\u0020\u0075\u0073\u0065\u003a\u0020\u0054\u0068\u0069\u0073\u0020\u0073\u006f\u0066\u0074\u0077\u0061\u0072\u0065\u0020\u0069\u0073\u0020\u006c\u0069\u006d\u0069\u0074\u0065\u0064\u0020\u0074\u006f\u0020\u006c\u0065\u0067\u0061\u006c\u0020\u0066\u0069\u006c\u0065\u0020\u0073\u0068\u0061\u0072\u0069\u006e\u0067\u002e\u0020\u0049\u0074\u0020\u0069\u0073\u0020\u0073\u0074\u0072\u0069\u0063\u0074\u006c\u0079\u0020\u0066\u006f\u0072\u0062\u0069\u0064\u0064\u0065\u006e\u0020\u0074\u006f\u0020\u0073\u0068\u0061\u0072\u0065\u0020\u0061\u006e\u0079\u0020\u0066\u0069\u006c\u0065\u0073\u0020\u0074\u0068\u0061\u0074\u0020\u0069\u006e\u0066\u0072\u0069\u006e\u0067\u0065\u0020\u0063\u006f\u0070\u0079\u0072\u0069\u0067\u0068\u0074\u002c\u0020\u0069\u006e\u0076\u006f\u006c\u0076\u0065\u0020\u0070\u006f\u0072\u006e\u006f\u0067\u0072\u0061\u0070\u0068\u0079\u002c\u0020\u0076\u0069\u006f\u006c\u0065\u006e\u0063\u0065\u002c\u0020\u0066\u0072\u0061\u0075\u0064\u002c\u0020\u0069\u006c\u006c\u0065\u0067\u0061\u006c\u0020\u006f\u0072\u0020\u006f\u0074\u0068\u0065\u0072\u0020\u0068\u0061\u0072\u006d\u0066\u0075\u006c\u0020\u0063\u006f\u006e\u0074\u0065\u006e\u0074\u002e\u000a\u0050\u0065\u0072\u0073\u006f\u006e\u0061\u006c\u0020\u0072\u0065\u0073\u0070\u006f\u006e\u0073\u0069\u0062\u0069\u006c\u0069\u0074\u0079\u003a\u0020\u0059\u006f\u0075\u0020\u0061\u0072\u0065\u0020\u0066\u0075\u006c\u006c\u0079\u0020\u0072\u0065\u0073\u0070\u006f\u006e\u0073\u0069\u0062\u006c\u0065\u0020\u0066\u006f\u0072\u0020\u0074\u0068\u0065\u0020\u006c\u0065\u0067\u0061\u006c\u0069\u0074\u0079\u0020\u006f\u0066\u0020\u0074\u0068\u0065\u0020\u0073\u0068\u0061\u0072\u0065\u0064\u0020\u0063\u006f\u006e\u0074\u0065\u006e\u0074\u002e\u0020\u0050\u006c\u0065\u0061\u0073\u0065\u0020\u006d\u0061\u006b\u0065\u0020\u0073\u0075\u0072\u0065\u0020\u0074\u0068\u0061\u0074\u0020\u0079\u006f\u0075\u0020\u0068\u0061\u0076\u0065\u0020\u0074\u0068\u0065\u0020\u006c\u0065\u0067\u0061\u006c\u0020\u0061\u0075\u0074\u0068\u006f\u0072\u0069\u007a\u0061\u0074\u0069\u006f\u006e\u0020\u0074\u006f\u0020\u0073\u0068\u0061\u0072\u0065\u0020\u0074\u0068\u0065\u0020\u0066\u0069\u006c\u0065\u002e\u000a\u0052\u0069\u0073\u006b\u0020\u0077\u0061\u0072\u006e\u0069\u006e\u0067\u003a\u0020\u0054\u0068\u0069\u0073\u0020\u0073\u006f\u0066\u0074\u0077\u0061\u0072\u0065\u0020\u0063\u0061\u006e\u006e\u006f\u0074\u0020\u0067\u0075\u0061\u0072\u0061\u006e\u0074\u0065\u0065\u0020\u0074\u0068\u0065\u0020\u0073\u0065\u0063\u0075\u0072\u0069\u0074\u0079\u0020\u006f\u0066\u0020\u0074\u0068\u0065\u0020\u0073\u0068\u0061\u0072\u0065\u0064\u0020\u0066\u0069\u006c\u0065\u0073\u002e\u0020\u0050\u006c\u0065\u0061\u0073\u0065\u0020\u0063\u0068\u0065\u0063\u006b\u0020\u0074\u0068\u0065\u0020\u0073\u0065\u0063\u0075\u0072\u0069\u0074\u0079\u0020\u006f\u0066\u0020\u0074\u0068\u0065\u0020\u0066\u0069\u006c\u0065\u0073\u0020\u0079\u006f\u0075\u0072\u0073\u0065\u006c\u0066\u002e\u000a\u0044\u0069\u0073\u0063\u006c\u0061\u0069\u006d\u0065\u0072\u003a\u0020\u0054\u0068\u0065\u0020\u0073\u006f\u0066\u0074\u0077\u0061\u0072\u0065\u0020\u0061\u0075\u0074\u0068\u006f\u0072\u0020\u0069\u0073\u0020\u006e\u006f\u0074\u0020\u0072\u0065\u0073\u0070\u006f\u006e\u0073\u0069\u0062\u006c\u0065\u0020\u0066\u006f\u0072\u0020\u0061\u006e\u0079\u0020\u0064\u0069\u0072\u0065\u0063\u0074\u0020\u006f\u0072\u0020\u0069\u006e\u0064\u0069\u0072\u0065\u0063\u0074\u0020\u006c\u006f\u0073\u0073\u0065\u0073\u0020\u0063\u0061\u0075\u0073\u0065\u0064\u0020\u0062\u0079\u0020\u0074\u0068\u0065\u0020\u0075\u0073\u0065\u0020\u006f\u0066\u0020\u0074\u0068\u0069\u0073\u0020\u0073\u006f\u0066\u0074\u0077\u0061\u0072\u0065\u002e
exit=Exit
accept=Accept

label1=Intranet IPv4 address:
label3=Port number:
label4=Shared file/folder:
label5=Number of shared files:
label5=Number of shared files
label7=Drag the file/folder to be shared here to get the path
label8=Connection password:
label9=Current number of connections
Expand Down
2 changes: 1 addition & 1 deletion ...sources/MessagesBundle_zh_Hans.properties → ...sources/MessagesBundle_zh_HANS.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ accept=\u63a5\u53d7
label1=\u5185\u7f51\u0049\u0050\u0076\u0034\u5730\u5740\uff1a
label3=\u7aef\u53e3\u53f7\uff1a
label4=\u5206\u4eab\u7684\u6587\u4ef6\u002f\u6587\u4ef6\u5939\uff1a
label5=\u5206\u4eab\u7684\u6587\u4ef6\u4e2a\u6570\uff1a
label5=\u5206\u4eab\u7684\u6587\u4ef6\u4e2a\u6570
label7=\u62d6\u62fd\u5f85\u5206\u4eab\u7684\u6587\u4ef6\u002f\u6587\u4ef6\u5939\u5230\u6b64\u5904\u4ee5\u83b7\u5f97\u8def\u5f84
label8=\u8fde\u63a5\u5bc6\u7801\uff1a
label9=\u5f53\u524d\u8fde\u63a5\u6570
Expand Down
2 changes: 1 addition & 1 deletion ...sources/MessagesBundle_zh_Hant.properties → ...sources/MessagesBundle_zh_HANT.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ accept=\u63a5\u53d7
label1=\u5167\u7db2\u0049\u0050\u0076\u0034\u4f4d\u5740\uff1a
label3=\u9023\u63a5\u57e0\u865f\u78bc\uff1a
label4=\u5206\u4eab\u7684\u6a94\u6848\u002f\u8cc7\u6599\u593e\uff1a
label5=\u5206\u4eab\u7684\u6a94\u6848\u500b\u6578\uff1a
label5=\u5206\u4eab\u7684\u6a94\u6848\u500b\u6578
label7=\u62d6\u66f3\u5f85\u5206\u4eab\u7684\u6a94\u6848\u002f\u8cc7\u6599\u593e\u5230\u6b64\u8655\u4ee5\u7372\u5f97\u8def\u5f91
label8=\u9023\u7dda\u5bc6\u78bc\uff1a
label9=\u76ee\u524d\u9023\u7dda\u6578
Expand Down
25 changes: 14 additions & 11 deletions backend/src/main/resources/com/zzhow/magicshare/ui/window/main-window.fxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,31 +18,34 @@
<Font size="25.0" />
</font>
</Label>
<Label fx:id="label1" alignment="CENTER_RIGHT" contentDisplay="RIGHT" layoutX="92.0" layoutY="56.0" prefHeight="16.0" prefWidth="130.0" text="内网IPv4地址：" textAlignment="RIGHT" />
<Label fx:id="label1" alignment="CENTER_RIGHT" contentDisplay="RIGHT" layoutX="32.0" layoutY="56.0" prefHeight="16.0" prefWidth="190.0" text="内网IPv4地址：" textAlignment="RIGHT" />
<Label fx:id="label2" layoutX="232.0" layoutY="55.0" prefHeight="16.0" prefWidth="235.0" text="---.---.---.---" />
<Label fx:id="label3" alignment="CENTER_RIGHT" contentDisplay="RIGHT" layoutX="141.0" layoutY="86.0" prefHeight="16.0" prefWidth="80.0" text="端口号：" />
<Label fx:id="label3" alignment="CENTER_RIGHT" contentDisplay="RIGHT" layoutX="31.0" layoutY="86.0" prefHeight="16.0" prefWidth="190.0" text="端口号：" />
<TextField fx:id="textField1" layoutX="232.0" layoutY="81.0" onKeyPressed="#onStartOrStopServiceKeyDown" prefHeight="24.0" prefWidth="112.0" promptText="1～65535" text="80" />
<Button fx:id="button1" layoutX="351.0" layoutY="81.0" mnemonicParsing="false" onAction="#onStartOrStopServiceClicked" text="启动服务" />
<Label fx:id="label4" alignment="CENTER_RIGHT" contentDisplay="RIGHT" layoutX="77.0" layoutY="116.0" prefHeight="16.0" prefWidth="145.0" text="分享的文件/文件夹：" />
<Label fx:id="label4" alignment="CENTER_RIGHT" contentDisplay="RIGHT" layoutX="32.0" layoutY="116.0" prefHeight="16.0" prefWidth="190.0" text="分享的文件/文件夹：" />
<TextField fx:id="textField2" layoutX="232.0" layoutY="111.0" onKeyPressed="#onSearchFileKeyDown" prefHeight="24.0" prefWidth="235.0" />
<Button fx:id="button2" layoutX="474.0" layoutY="110.0" mnemonicParsing="false" onAction="#onSelectFileClicked" text="选择文件夹" />
<Label fx:id="label8" alignment="CENTER_RIGHT" contentDisplay="RIGHT" layoutX="77.0" layoutY="146.0" prefHeight="17.0" prefWidth="145.0" text="连接密码：" />
<Label fx:id="label8" alignment="CENTER_RIGHT" contentDisplay="RIGHT" layoutX="32.0" layoutY="146.0" prefHeight="17.0" prefWidth="190.0" text="连接密码：" />
<TextField fx:id="textField3" layoutX="232.0" layoutY="141.0" onKeyPressed="#onStartOrStopServiceKeyDown" prefHeight="24.0" prefWidth="235.0" />
<CheckBox fx:id="checkBox1" layoutX="475.0" layoutY="146.0" mnemonicParsing="false" onAction="#onEnablePasswordClicked" prefHeight="18.0" prefWidth="170.0" selected="true" text="启用密码" />
<TableView fx:id="tableView1" layoutY="216.0" prefHeight="220.0" prefWidth="700.0" />
<Label fx:id="label9" alignment="CENTER" contentDisplay="CENTER" layoutX="425.0" layoutY="55.0" prefWidth="180.0" text="当前连接数" textAlignment="CENTER" />
<Label fx:id="label9" alignment="CENTER" contentDisplay="CENTER" layoutX="398.0" layoutY="56.0" prefHeight="16.0" prefWidth="235.0" text="当前连接数" textAlignment="CENTER" />
<Label fx:id="label10" alignment="CENTER" contentDisplay="CENTER" layoutX="481.0" layoutY="81.0" prefHeight="16.0" prefWidth="69.0" text="0" textAlignment="CENTER">
<font>
<Font size="20.0" />
</font>
</Label>
<Label fx:id="label5" layoutX="17.0" layoutY="194.0" text="分享的文件个数：" />
<Label fx:id="label6" layoutX="143.0" layoutY="194.0" prefHeight="16.0" prefWidth="69.0" text="0" />
<Label fx:id="label7" layoutX="228.0" layoutY="194.0" text="拖拽待分享的文件/文件夹到此处以获得路径" />
<Button fx:id="button3" layoutX="576.0" layoutY="190.0" mnemonicParsing="false" onAction="#onClearFileClicked" text="清空分享列表" />
<Label fx:id="label5" layoutX="14.0" layoutY="195.0" text="分享的文件个数" />
<Label fx:id="label6" alignment="CENTER" contentDisplay="CENTER" layoutX="34.0" layoutY="166.0" prefHeight="16.0" prefWidth="46.0" text="0" textAlignment="CENTER">
<font>
<Font size="20.0" />
</font></Label>
<Label fx:id="label7" alignment="CENTER" contentDisplay="CENTER" layoutX="176.0" layoutY="195.0" prefHeight="17.0" prefWidth="350.0" text="拖拽待分享的文件/文件夹到此处以获得路径" textAlignment="CENTER" textOverrun="CENTER_ELLIPSIS" />
<Button fx:id="button3" alignment="CENTER_RIGHT" contentDisplay="RIGHT" layoutX="591.0" layoutY="189.0" mnemonicParsing="false" onAction="#onClearFileClicked" text="清空分享列表" textAlignment="RIGHT" />
<Button fx:id="button4" layoutX="14.0" layoutY="460.0" mnemonicParsing="false" onAction="#onAboutClicked" text="关于" />
<Label layoutX="515.0" layoutY="465.0" text="Language:" />
<ChoiceBox fx:id="languageSelector" layoutX="580.0" layoutY="461.0" onAction="#switchLanguage" prefHeight="26.0" prefWidth="88.0" />
<Label layoutX="526.0" layoutY="465.0" text="Language:" />
<ChoiceBox fx:id="languageSelector" layoutX="598.0" layoutY="460.0" onAction="#switchLanguage" prefHeight="26.0" prefWidth="88.0" />
<Label layoutX="329.0" layoutY="465.0" text="ZZHow" />
</children>
</AnchorPane>
Expand Down
16 changes: 8 additions & 8 deletions backend/src/main/resources/com/zzhow/magicshare/ui/window/prompt-window.fxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,34 +5,34 @@
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.text.Font?>

<AnchorPane prefHeight="450.0" prefWidth="780.0" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.zzhow.magicshare.ui.controller.PromptController">
<AnchorPane prefHeight="520.0" prefWidth="780.0" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.zzhow.magicshare.ui.controller.PromptController">
<children>
<Label layoutX="319.0" layoutY="25.0" text="MagicShare">
<Label layoutX="319.0" layoutY="31.0" text="MagicShare">
<font>
<Font size="28.0" />
</font>
</Label>
<Label fx:id="title" layoutX="334.0" layoutY="60.0" text="神奇分享">
<Label fx:id="title" layoutX="335.0" layoutY="65.0" text="神奇分享">
<font>
<Font size="28.0" />
</font>
</Label>
<Label fx:id="content" layoutX="12.0" layoutY="137.0" prefWidth="755.0" text="使用本软件前，请仔细阅读：&#10;&#10;合法使用： 本软件仅限于合法文件分享，严禁分享任何侵犯版权、涉及色情、暴力、欺诈、违法或其他有害内容的文件。&#10;个人责任： 您对分享内容的合法性负全部责任，请确保您拥有分享文件的合法授权。&#10;风险提示： 本软件无法保证所分享文件的安全性，请您自行检查文件的安全性。&#10;免责声明： 软件作者不对因使用本软件造成的任何直接或间接损失承担责任。" wrapText="true">
<Label fx:id="content" layoutX="13.0" layoutY="137.0" prefWidth="755.0" text="使用本软件前，请仔细阅读：&#10;&#10;合法使用： 本软件仅限于合法文件分享，严禁分享任何侵犯版权、涉及色情、暴力、欺诈、违法或其他有害内容的文件。&#10;个人责任： 您对分享内容的合法性负全部责任，请确保您拥有分享文件的合法授权。&#10;风险提示： 本软件无法保证所分享文件的安全性，请您自行检查文件的安全性。&#10;免责声明： 软件作者不对因使用本软件造成的任何直接或间接损失承担责任。" wrapText="true">
<font>
<Font size="20.0" />
</font>
</Label>
<Label layoutX="350.0" layoutY="343.0" text="Version: 2.0.0" />
<Button fx:id="exit" layoutX="301.0" layoutY="370.0" mnemonicParsing="false" onAction="#onExitClicked" text="退出">
<Label layoutX="352.0" layoutY="415.0" text="Version: 2.0.0" />
<Button fx:id="exit" layoutX="301.0" layoutY="447.0" mnemonicParsing="false" onAction="#onExitClicked" text="退出">
<font>
<Font size="20.0" />
</font>
</Button>
<Button fx:id="accept" layoutX="413.0" layoutY="370.0" mnemonicParsing="false" onAction="#onAgreeClicked" text="接受">
<Button fx:id="accept" layoutX="413.0" layoutY="447.0" mnemonicParsing="false" onAction="#onAgreeClicked" text="接受">
<font>
<Font size="20.0" />
</font>
</Button>
<Label layoutX="369.0" layoutY="428.0" text="ZZHow" />
<Label layoutX="369.0" layoutY="498.0" text="ZZHow" />
</children>
</AnchorPane>

0 comments on commit 692100a

Please sign in to comment.