From 3abb96e5b956063819773ab4fa47fc574cb32781 Mon Sep 17 00:00:00 2001 From: huangyuhui Date: Mon, 5 Feb 2018 00:23:58 +0800 Subject: [PATCH] Temporarily fix spacing missing. Closes #264 --- .../org/jackhuang/hmcl/ui/Controllers.java | 6 ++-- .../java/org/jackhuang/hmcl/ui/Decorator.java | 1 - .../hmcl/ui/construct/MessageDialogPane.java | 10 ++---- .../assets/css/jfoenix-main-demo.css | 5 +++ .../resources/assets/fxml/message-dialog.fxml | 32 +++++++++++-------- .../resources/assets/fxml/task-dialog.fxml | 2 +- .../resources/assets/lang/I18N.properties | 2 +- .../jackhuang/hmcl/task/FileDownloadTask.java | 5 +++ 8 files changed, 36 insertions(+), 27 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java index 6e51b595c..0b436d871 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java @@ -107,6 +107,8 @@ public final class Controllers { } public static JFXDialog dialog(Region content) { + // TODO: temp fix + decorator.showDialog(new Region()); return decorator.showDialog(content); } @@ -126,8 +128,8 @@ public final class Controllers { dialog(new MessageDialogPane(text, title, decorator.getDialog(), type, onAccept)); } - public static void confirmDialog(String text, String title, Runnable onAccept, Runnable onCacnel) { - dialog(new MessageDialogPane(text, title, decorator.getDialog(), onAccept, onCacnel)); + public static void confirmDialog(String text, String title, Runnable onAccept, Runnable onCancel) { + dialog(new MessageDialogPane(text, title, decorator.getDialog(), onAccept, onCancel)); } public static void inputDialog(String text, Consumer onResult) { diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java index 2e6259660..c5e4f800f 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java @@ -149,7 +149,6 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza btnMax.fire(); }); - drawerWrapper.getChildren().remove(dialog); dialog.setDialogContainer(drawerWrapper); dialog.setOnDialogClosed(e -> dialogShown = false); dialog.setOnDialogOpened(e -> dialogShown = true); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MessageDialogPane.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MessageDialogPane.java index 843cd036c..b79357301 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MessageDialogPane.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MessageDialogPane.java @@ -30,9 +30,6 @@ import org.jackhuang.hmcl.ui.SVG; import java.util.Optional; public final class MessageDialogPane extends StackPane { - private final String text; - private final JFXDialog dialog; - private boolean closingDialog = true; @FXML @@ -49,9 +46,6 @@ public final class MessageDialogPane extends StackPane { private HBox actions; public MessageDialogPane(String text, String title, JFXDialog dialog, int type, Runnable onAccept) { - this.text = text; - this.dialog = dialog; - FXUtils.loadFXML(this, "/assets/fxml/message-dialog.fxml"); if (title != null) @@ -64,7 +58,7 @@ public final class MessageDialogPane extends StackPane { Optional.ofNullable(onAccept).ifPresent(Runnable::run); }); - //actions.getChildren().remove(cancelButton); + actions.getChildren().remove(cancelButton); switch (type) { case MessageBox.INFORMATION_MESSAGE: @@ -98,7 +92,7 @@ public final class MessageDialogPane extends StackPane { acceptButton.setText(Main.i18n("button.yes")); cancelButton.setText(Main.i18n("button.no")); - //actions.getChildren().add(cancelButton); + actions.getChildren().add(cancelButton); } public void disableClosingDialog() { diff --git a/HMCL/src/main/resources/assets/css/jfoenix-main-demo.css b/HMCL/src/main/resources/assets/css/jfoenix-main-demo.css index 095e5ab76..51a7a50c7 100644 --- a/HMCL/src/main/resources/assets/css/jfoenix-main-demo.css +++ b/HMCL/src/main/resources/assets/css/jfoenix-main-demo.css @@ -95,6 +95,11 @@ -fx-padding: 5.0 0.0 5.0 0.0; } +.jfx-layout-body { + -fx-pref-width: 400px; + -fx-wrap-text: true; +} + .jfx-layout-body .label { -fx-font-size: 14.0px; -fx-pref-width: 400.0px; diff --git a/HMCL/src/main/resources/assets/fxml/message-dialog.fxml b/HMCL/src/main/resources/assets/fxml/message-dialog.fxml index a10f2eb54..3da283090 100644 --- a/HMCL/src/main/resources/assets/fxml/message-dialog.fxml +++ b/HMCL/src/main/resources/assets/fxml/message-dialog.fxml @@ -5,24 +5,28 @@ + + - - diff --git a/HMCL/src/main/resources/assets/fxml/task-dialog.fxml b/HMCL/src/main/resources/assets/fxml/task-dialog.fxml index 1532422fd..a9c1a97a1 100644 --- a/HMCL/src/main/resources/assets/fxml/task-dialog.fxml +++ b/HMCL/src/main/resources/assets/fxml/task-dialog.fxml @@ -28,7 +28,7 @@ - + diff --git a/HMCL/src/main/resources/assets/lang/I18N.properties b/HMCL/src/main/resources/assets/lang/I18N.properties index 651e7b70d..ff35104ec 100644 --- a/HMCL/src/main/resources/assets/lang/I18N.properties +++ b/HMCL/src/main/resources/assets/lang/I18N.properties @@ -166,7 +166,7 @@ launcher.background_location=Background Location launcher.background_tooltip=The laucher uses a default background.\nIf you use custom background.png, link it and it will be used.\nIf there is "bg" subdirectory, this app will chooses one picture in "bgskin" randomly.\nIf you set the background setting, this app will use it. launcher.choose_bgpath=Choose background path. launcher.choose_commonpath=Choose common path. -launcher.common_location=Common Location +launcher.common_location=Common Directory launcher.contact=Contact Us launcher.crash=Hello Minecraft! Launcher has crashed! launcher.crash_out_dated=Hello Minecraft! Launcher has crashed! Your launcher is outdated. Update it! diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/task/FileDownloadTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/task/FileDownloadTask.java index 85d082346..4b0b78ac5 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/task/FileDownloadTask.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/task/FileDownloadTask.java @@ -99,6 +99,11 @@ public class FileDownloadTask extends Task { stream = null; } + @Override + public Scheduler getScheduler() { + return Schedulers.io(); + } + public EventManager> getOnFailed() { return onFailed; }