Skip to content

优化实例图标设置操作按钮 #6816

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CiiLu wants to merge 2 commits into
base: main
Choose a base branch
from
Open

优化实例图标设置操作按钮 #6816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81da219
<1> 马蹄破春寒 朝霞满笔端 诗中人归来款款
CiiLu Sep 5, 2026
f4c7ccb
<2> 平地风乍起 韵脚都吹乱 两泓秋水 也起波澜
CiiLu Sep 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/DialogPane.java
View file
Open in desktop

@Glavo Glavo Sep 6, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

要改布局就不要复用 DialogPane 了，直接使用 JFXDialogLayout 就好了。

Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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() {
Expand Down
2 changes: 2 additions & 0 deletions HMCL/src/main/java/org/jackhuang/hmcl/ui/instances/GameInstanceIconDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
1 change: 1 addition & 0 deletions HMCL/src/main/resources/assets/lang/I18N.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions HMCL/src/main/resources/assets/lang/I18N_zh.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ assets.index.malformed=資源檔案的索引檔案損壞。你可以在相應實
button.cancel=取消
button.change_source=切換下載源
button.clear=清除
button.close=關閉
button.copy=複製
button.copy_and_exit=複製並退出
button.delete=刪除
Expand Down
1 change: 1 addition & 0 deletions HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ assets.index.malformed=资源文件的索引文件损坏。你可以在相应实
button.cancel=取消
button.change_source=切换下载源
button.clear=清除
button.close=关闭
button.copy=复制
button.copy_and_exit=复制并退出
button.delete=删除
Expand Down