hmcl.log in normal format

This commit is contained in:
huangyuhui 2018-02-15 01:29:19 +08:00
parent 8bd4f2b5b5
commit bfed651263
6 changed files with 34 additions and 3 deletions

View File

@ -19,10 +19,15 @@ package org.jackhuang.hmcl.ui.download;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.control.Label; import javafx.scene.control.Label;
import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
import javafx.scene.layout.HBox;
import javafx.scene.layout.StackPane; import javafx.scene.layout.StackPane;
import org.jackhuang.hmcl.Main; import org.jackhuang.hmcl.Main;
import org.jackhuang.hmcl.download.RemoteVersion; import org.jackhuang.hmcl.download.RemoteVersion;
import org.jackhuang.hmcl.download.game.GameRemoteVersionTag; import org.jackhuang.hmcl.download.game.GameRemoteVersionTag;
import org.jackhuang.hmcl.download.liteloader.LiteLoaderRemoteVersionTag;
import org.jackhuang.hmcl.download.optifine.OptiFineRemoteVersion;
import org.jackhuang.hmcl.ui.FXUtils; import org.jackhuang.hmcl.ui.FXUtils;
/** /**
@ -34,6 +39,12 @@ public final class VersionsPageItem extends StackPane {
private Label lblSelfVersion; private Label lblSelfVersion;
@FXML @FXML
private Label lblGameVersion; private Label lblGameVersion;
@FXML
private ImageView imageView;
@FXML
private HBox leftPane;
@FXML
private StackPane imageViewContainer;
public VersionsPageItem(RemoteVersion<?> remoteVersion) { public VersionsPageItem(RemoteVersion<?> remoteVersion) {
this.remoteVersion = remoteVersion; this.remoteVersion = remoteVersion;
@ -45,17 +56,29 @@ public final class VersionsPageItem extends StackPane {
switch (((GameRemoteVersionTag) remoteVersion.getTag()).getType()) { switch (((GameRemoteVersionTag) remoteVersion.getTag()).getType()) {
case RELEASE: case RELEASE:
lblGameVersion.setText(Main.i18n("version.game.release")); lblGameVersion.setText(Main.i18n("version.game.release"));
imageView.setImage(new Image("/assets/img/icon.png", 32, 32, false, true));
break; break;
case SNAPSHOT: case SNAPSHOT:
lblGameVersion.setText(Main.i18n("version.game.snapshot")); lblGameVersion.setText(Main.i18n("version.game.snapshot"));
imageView.setImage(new Image("/assets/img/command.png", 32, 32, false, true));
break; break;
default: default:
lblGameVersion.setText(Main.i18n("version.game.old")); lblGameVersion.setText(Main.i18n("version.game.old"));
imageView.setImage(new Image("/assets/img/grass.png", 32, 32, false, true));
break; break;
} }
} else { } else if (remoteVersion.getTag() instanceof LiteLoaderRemoteVersionTag) {
imageView.setImage(new Image("/assets/img/chicken.png", 32, 32, false, true));
lblGameVersion.setText(remoteVersion.getGameVersion());
} else if (remoteVersion instanceof OptiFineRemoteVersion) {
// optifine has no icon.
lblGameVersion.setText(remoteVersion.getGameVersion());
} else { // forge
imageView.setImage(new Image("/assets/img/forge.png", 32, 32, false, true));
lblGameVersion.setText(remoteVersion.getGameVersion()); lblGameVersion.setText(remoteVersion.getGameVersion());
} }
leftPane.getChildren().remove(imageViewContainer);
} }
public RemoteVersion<?> getRemoteVersion() { public RemoteVersion<?> getRemoteVersion() {

View File

@ -2,6 +2,9 @@
<?import javafx.scene.control.Label?> <?import javafx.scene.control.Label?>
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.image.Image?>
<?import org.jackhuang.hmcl.ui.FXUtils?>
<fx:root xmlns="http://javafx.com/javafx" <fx:root xmlns="http://javafx.com/javafx"
xmlns:fx="http://javafx.com/fxml" xmlns:fx="http://javafx.com/fxml"
type="StackPane" mouseTransparent="true"> type="StackPane" mouseTransparent="true">
@ -10,9 +13,14 @@
</VBox> </VBox>
<BorderPane> <BorderPane>
<left> <left>
<VBox alignment="CENTER_LEFT"> <HBox fx:id="leftPane" alignment="CENTER_LEFT">
<StackPane fx:id="imageViewContainer" FXUtils.limitWidth="32" FXUtils.limitHeight="32">
<ImageView preserveRatio="true" fx:id="imageView" smooth="false">
<Image url="/assets/img/icon.png" />
</ImageView>
</StackPane>
<Label fx:id="lblSelfVersion" style="-fx-font-size: 15;" /> <Label fx:id="lblSelfVersion" style="-fx-font-size: 15;" />
</VBox> </HBox>
</left> </left>
<right> <right>
<fx:include source="/assets/svg/arrow-right.fxml" /> <fx:include source="/assets/svg/arrow-right.fxml" />

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB