Skip to content

Commit a5c7fe0

Browse files
authored
Feat: No results found tip for ModDownloadListPage (HMCL-dev#6368)
1 parent a6e0acc commit a5c7fe0

4 files changed

Lines changed: 19 additions & 8 deletions

File tree

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadListPage.java

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -514,15 +514,23 @@ protected ModDownloadListPageSkin(DownloadListPage control) {
514514
pane.setCenter(spinnerPane);
515515
{
516516
spinnerPane.loadingProperty().bind(getSkinnable().loadingProperty());
517-
spinnerPane.failedReasonProperty().bind(Bindings.createStringBinding(() -> {
518-
if (getSkinnable().isFailed()) {
519-
return i18n("download.failed.refresh");
520-
} else {
521-
return null;
522-
}
523-
}, getSkinnable().failedProperty()));
517+
spinnerPane.failedReasonProperty().bind(
518+
Bindings.createStringBinding(() -> {
519+
if (getSkinnable().isFailed()) {
520+
return i18n("download.failed.refresh");
521+
} else if (!getSkinnable().isLoading() && getSkinnable().pageCount.get() >= 0 && getSkinnable().items.isEmpty()) {
522+
return i18n("download.failed.no_results_found");
523+
} else {
524+
return null;
525+
}
526+
},
527+
getSkinnable().failedProperty(),
528+
getSkinnable().loadingProperty(),
529+
getSkinnable().pageCount,
530+
getSkinnable().items)
531+
);
524532
spinnerPane.setOnFailedAction(e -> {
525-
if (getSkinnable().retrySearch != null) {
533+
if (getSkinnable().isFailed() && getSkinnable().retrySearch != null) {
526534
getSkinnable().retrySearch.run();
527535
}
528536
});

HMCL/src/main/resources/assets/lang/I18N.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,7 @@ download.external_link=Visit Download Website
399399
download.failed=Failed to download "%1$s", response code: %2$d.
400400
download.failed.empty=No versions are available. Please click here to go back.
401401
download.failed.no_code=Failed to download
402+
download.failed.no_results_found=No results found
402403
download.failed.refresh=Failed to fetch version list. Please click here to retry.
403404
download.game=New Game
404405
download.provider.bmclapi=BMCLAPI & MCIM

HMCL/src/main/resources/assets/lang/I18N_zh.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,7 @@ download.external_link=開啟下載網站
397397
download.failed=下載失敗:%1$s\n錯誤碼:%2$d
398398
download.failed.empty=沒有可供安裝的版本,按一下此處返回。
399399
download.failed.no_code=下載失敗
400+
download.failed.no_results_found=搜尋無結果
400401
download.failed.refresh=載入版本清單失敗,按一下此處重試。
401402
download.game=新遊戲
402403
download.provider.bmclapi=BMCLAPI & MCIM

HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,7 @@ download.external_link=打开下载网站
399399
download.failed=下载失败: %1$s,\n错误码:%2$d\n你可以点击右上角帮助按钮进行求助。
400400
download.failed.empty=[没有可供安装的版本,点击此处返回]\n(你可以点击右上角帮助按钮进行求助)
401401
download.failed.no_code=下载失败
402+
download.failed.no_results_found=搜索无结果
402403
download.failed.refresh=[加载版本列表失败,点击此处重试]\n(你可以点击右上角帮助按钮进行求助)
403404
download.game=新游戏
404405
download.provider.bmclapi=BMCLAPI & MCIM

0 commit comments

Comments
 (0)