diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/DialogPane.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/DialogPane.java index 0a2e9228d8..0891b39a33 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/DialogPane.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/DialogPane.java @@ -41,6 +41,10 @@ public class DialogPane extends JFXDialogLayout { private final JFXProgressBar progressBar = new JFXProgressBar(); public DialogPane() { + this(false); + } + + public DialogPane(boolean closeOnly) { Label titleLabel = new Label(); titleLabel.textProperty().bind(title); setHeading(titleLabel); @@ -58,12 +62,17 @@ public DialogPane() { acceptPane.getStyleClass().add("small-spinner-pane"); acceptPane.setContent(acceptButton); - cancelButton.setText(i18n("button.cancel")); + cancelButton.setText(closeOnly ? i18n("button.close") : i18n("button.cancel")); cancelButton.setOnAction(e -> onCancel()); cancelButton.getStyleClass().add("dialog-cancel"); onEscPressed(this, cancelButton::fire); - setActions(warningLabel, acceptPane, cancelButton); + if (closeOnly) { + setActions(warningLabel, cancelButton); + } else { + setActions(warningLabel, acceptPane, cancelButton); + } + } protected JFXProgressBar getProgressBar() { diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/instances/GameInstanceIconDialog.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/instances/GameInstanceIconDialog.java index 77fda7e3d6..17d2228601 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/instances/GameInstanceIconDialog.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/instances/GameInstanceIconDialog.java @@ -43,6 +43,8 @@ public class GameInstanceIconDialog extends DialogPane { private final GameSettings.@Nullable Instance setting; public GameInstanceIconDialog(HMCLGameInstance gameInstance, Runnable onFinish) { + super(true); + this.gameInstance = gameInstance; this.onFinish = onFinish; this.setting = gameInstance.getSettingsOrCreate(); diff --git a/HMCL/src/main/resources/assets/lang/I18N.properties b/HMCL/src/main/resources/assets/lang/I18N.properties index 672b254bb3..a54c28cc70 100644 --- a/HMCL/src/main/resources/assets/lang/I18N.properties +++ b/HMCL/src/main/resources/assets/lang/I18N.properties @@ -203,6 +203,7 @@ assets.index.malformed=Index files of downloaded assets are corrupted. You can r button.cancel=Cancel button.change_source=Change Download Source button.clear=Clear +button.close=Close button.copy=Copy button.copy_and_exit=Copy and Exit button.delete=Delete diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh.properties b/HMCL/src/main/resources/assets/lang/I18N_zh.properties index 48e4524a3d..6012b2b88a 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh.properties @@ -201,6 +201,7 @@ assets.index.malformed=資源檔案的索引檔案損壞。你可以在相應實 button.cancel=取消 button.change_source=切換下載源 button.clear=清除 +button.close=關閉 button.copy=複製 button.copy_and_exit=複製並退出 button.delete=刪除 diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties index cc1c47a2dc..5e0a90e0da 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties @@ -203,6 +203,7 @@ assets.index.malformed=资源文件的索引文件损坏。你可以在相应实 button.cancel=取消 button.change_source=切换下载源 button.clear=清除 +button.close=关闭 button.copy=复制 button.copy_and_exit=复制并退出 button.delete=删除