lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add: show asset and mod download progress

Browse Source
This commit is contained in:
huanghongxun
2020-03-03 00:59:15 +08:00
parent 4f51ab00a1
commit 3efec78732
8 changed files with 109 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TaskListPane.java
View File

@@ -57,6 +57,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import static org.jackhuang.hmcl.util.Lang.tryCast;
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
public final class TaskListPane extends StackPane {
@@ -172,12 +173,24 @@ public final class TaskListPane extends StackPane {
node.setThrowable(throwable);
});
}
@Override
public void onPropertiesUpdate(Map<String, Map<String, Object>> stageProperties) {
stageProperties.forEach((stage, properties) -> {
int count = tryCast(properties.get("count"), Integer.class).orElse(0),
total = tryCast(properties.get("total"), Integer.class).orElse(0);
if (total > 0)
Platform.runLater(() ->
stageNodes.stream().filter(x -> x.stage.equals(stage)).findAny().ifPresent(stageNode -> stageNode.updateCounter(count, total)));
});
}
});
}
private class StageNode extends BorderPane {
private static class StageNode extends BorderPane {
private final String stage;
private final Label title = new Label();
private final String message;
private boolean started = false;
public StageNode(String stage) {
@@ -185,7 +198,6 @@ public final class TaskListPane extends StackPane {
String stageKey = StringUtils.substringBefore(stage, ':');
String stageValue = StringUtils.substringAfter(stage, ':');
String message;
// @formatter:off
switch (stageKey) {
@@ -222,6 +234,13 @@ public final class TaskListPane extends StackPane {
public void succeed() {
setLeft(FXUtils.limitingSize(SVG.check(Theme.blackFillBinding(), 14, 14), 14, 14));
}
public void updateCounter(int count, int total) {
if (total > 0)
title.setText(String.format("%s - %d/%d", message, count, total));
else
title.setText(message);
}
}
private class ProgressListNode extends BorderPane {

3
HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionPage.java
View File

@@ -78,7 +78,8 @@ public class VersionPage extends Control implements DecoratorPage {
Profiles.registerVersionsListener(this::loadVersions);
listView.getSelectionModel().selectedItemProperty().addListener((a, b, newValue) -> {
loadVersion(newValue, profile);
if (newValue != null)
loadVersion(newValue, profile);
});
versionSettingsTab.setNode(versionSettingsPage);